diff --git a/src/Map.js b/src/Map.js
index df3f685..1382c3d 100644
--- a/src/Map.js
+++ b/src/Map.js
@@ -46,7 +46,7 @@ function min_max(request)
return [minX, maxX, minY, maxY];
}
-function list_polygons(request, center, ratio, ind, cb, selectedRoom)
+function list_polygons(request, center, ratio,/* ind,*/ cb, selectedRoom)
{
let polygons = [];
//let tarace = 0;
@@ -54,25 +54,25 @@ function list_polygons(request, center, ratio, ind, cb, selectedRoom)
{
polygons = [...polygons, ((request[k]).map((y) => {
return y.map((z) => {
- if (ind === 2)
+ /*if (ind === 2)
{
return [-(z[0]-center[0])/25, (z[1]-center[1])/25]; //Centre en (0,0) + inverse verticalement car nord en bas sur map d'étage 4 + divise pour faire entrer dans l'espace dessinable (jsp pk on ne peut pas dessiner partout)
}
- else if (ind === 1)
+ /*else if (ind === 1)
{
return [-(z[1]-center[1])/25, (z[0]-center[0])/25];
}
else
{
- return [(z[1]-center[1])/25, (z[0]-center[0])/25];
- }
+ */return [(z[1]-center[1])/25, (z[0]-center[0])/25];
+ //}
})
})).map((x) => {return cb(k)}>{k}})];
// })).map((x) => {tarace = tarace+1; return {k}Popup})];
}
return polygons;
}
-
+/*
function containsRoom(request, selectedRoom)
{
for (const k in request)
@@ -83,13 +83,13 @@ function containsRoom(request, selectedRoom)
}
}
return 0;
-}
+}*/
-function layers_list(requestList, cb, selectedRoom)
+function layers_list(/*requestList*/request, cb, selectedRoom)
{
- let layers = [];
- requestList.forEach( (request, ind) =>
- {
+// let layers = [];
+// requestList.forEach( (request, ind) =>
+// {
const minMaxXY = min_max(request);
const minX = minMaxXY[0];
const maxX = minMaxXY[1];
@@ -97,30 +97,28 @@ function layers_list(requestList, cb, selectedRoom)
const maxY = minMaxXY[3];
const center = [(maxX + minX)/2, (maxY + minY)/2];
const ratio = Math.ceil(Math.max((maxY-minY)/2284, (maxX-minX)/135)); //A priori ca devrait être convenable mais là ca ne fonctionne pas, je pense que c'est pck le SVG n'utilise pas des coordonnées et ducoup y'a des trucs bizarre (notamment les étages 3 et 4 n'ont pas du tout la même longueur ni même largeur)
-// console.log((maxY-minY)/2284);
-// console.log((maxX-minX)/135);
-// console.log(ratio);
- const polygons = list_polygons(request, center, ratio, ind, cb, selectedRoom);
- const floorContainsSelectedRoom = containsRoom(request, selectedRoom);
- layers = [...layers, {polygons} ];
- })
- return layers;
+ const polygons = list_polygons(request, center, ratio,/* ind,*/ cb, selectedRoom);
+ return polygons;
+// const floorContainsSelectedRoom = containsRoom(request, selectedRoom);
+// layers = [...layers, {polygons} ];
+// })
+// return layers;
}
function Map({callbackRoomSelected, selectedRoom})
-{
+{
// When the user selects a room on the map, call callbackRoomSelected.
// The room that is currently selected is selectedRoom. It is null if no room
// is selected
- const buildLayers = React.useCallback((request2, request3, request4, callbackRoomSelected, selectedRoom) => {
- return layers_list([request2, request3, request4], callbackRoomSelected, selectedRoom);
- }, [request2, request3, request4, callbackRoomSelected, selectedRoom]);
+ const buildLayers = React.useCallback((/*request2, request3, request4,*/request, callbackRoomSelected, selectedRoom) => {
+ return layers_list(/*[request2, request3, request4]*/request, callbackRoomSelected, selectedRoom);
+ }, [/*request2, request3, request4,*/request3, callbackRoomSelected, selectedRoom]);
- const layers = buildLayers(request2, request3, request4);
+ const layers = buildLayers(request3);
return
-
+ //
{layers}
-
+ //
/*
return