Skip to content
Snippets Groups Projects

Résolution bug/modif UX mineurs (nom des composants renommé si besoin, l'écran...

Merged Axel Carayon requested to merge GenericiteCartes into main
Files
9
@@ -2,16 +2,13 @@ package com.irit.mapsender.controller;
import com.irit.mapsender.model.components.ComponentsManager;
import com.irit.mapsender.model.beans.Position;
import com.irit.mapsender.model.components.cartes.MapSupervisor;
import com.irit.mapsender.model.exceptions.ErrorWhileCreatingComponentException;
import com.irit.mapsender.model.exceptions.MissingConstructorForParametrableComponentException;
import com.irit.mapsender.model.exceptions.NoParametrableComponentFoundException;
import com.irit.mapsender.model.tools.ComponentDiagramDrawer;
import com.irit.mapsender.model.exceptions.NoParametrableComponentFoundException;import com.irit.mapsender.model.tools.ComponentDiagramDrawer;
import com.irit.mapsender.model.tools.Pair;
import com.irit.mapsender.model.tools.ParametrableComponentsScanner;
import org.apache.commons.io.IOUtils;
import org.json.JSONObject;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
@@ -23,8 +20,6 @@ import java.util.Map;
@Controller
public class MainController {
private MapSupervisor mapSupervisor;
private ComponentsManager componentsManager;
private ParametrableComponentsScanner scanner;
@@ -32,7 +27,6 @@ public class MainController {
public MainController(){
componentsManager = new ComponentsManager();
scanner = new ParametrableComponentsScanner();
mapSupervisor = new MapSupervisor();
}
@GetMapping("/")
@@ -76,34 +70,22 @@ public class MainController {
return new JSONObject(scanner.getAllAnnotations()).toMap();
}
@GetMapping("/activeMaps")
@ResponseBody
public List<String> activeMaps() {
return mapSupervisor.getAllMaps();
}
@PutMapping("/map")
@ResponseBody
public void addAMap(@RequestBody String body) {
JSONObject json = new JSONObject(body);
mapSupervisor.addMap(json.getString("name"));
}
@PostMapping("/map")
@ResponseBody
public void updateMap(@RequestBody String body) {
JSONObject json = new JSONObject(body);
Position pos = new Position(json.getDouble("lat"),json.getDouble("lng"), null);
mapSupervisor.updatePosition(json.getString("name"), pos);
componentsManager.updatePosition(json.getString("name"), pos);
}
@DeleteMapping("/map")
@GetMapping("/activeMaps")
@ResponseBody
public void deleteMap(@RequestBody String body) {
JSONObject json = new JSONObject(body);
mapSupervisor.removeMap(json.getString("name"));
public List<String> activeMaps() {
return componentsManager.getAllMaps();
}
@GetMapping("/components")
@ResponseBody
public Map<String,List<Pair<String,Boolean>>> getAllComponents() {
Loading