diff --git a/src/Map.js b/src/Map.js
index 45b3da5..00f400a 100644
--- a/src/Map.js
+++ b/src/Map.js
@@ -2,9 +2,7 @@ import { MapContainer } from 'react-leaflet/MapContainer';
import { Marker } from 'react-leaflet/Marker';
import { Popup } from 'react-leaflet/Popup';
import { Polygon } from 'react-leaflet/Polygon';
-import { LayersControl } from 'react-leaflet/LayersControl'
-import { LayerGroup } from 'react-leaflet/LayerGroup'
-import { Tooltip } from 'react-leaflet/Tooltip'
+import { Tooltip } from 'react-leaflet/Tooltip';
import { useState, useEffect } from "react";
import React from 'react';
import L from 'leaflet';
@@ -19,7 +17,7 @@ function Stairs({position, size, body})
// and the body of the popup of the stairs (list of floors accessible from that staircase)
const map = useMap();
const [markerIcon, setMarkerIcon] = useState(new L.Icon({ iconUrl: stairs, iconSize: size }));
- const mmap = useMapEvent('zoomend', () => {setMarkerIcon(new L.Icon({ iconUrl: stairs, iconSize: [40*Math.pow(2, map.getZoom() - 4), 40*Math.pow(2, map.getZoom() - 4)]}))});
+ useMapEvent('zoomend', () => {setMarkerIcon(new L.Icon({ iconUrl: stairs, iconSize: [40*Math.pow(2, map.getZoom() - 4), 40*Math.pow(2, map.getZoom() - 4)]}))});
return
{body}
@@ -31,7 +29,7 @@ function Lift({position, size, body})
// and the body of the popup of the lift (list of floors accessible from that lift)
const map = useMap();
const [markerIcon, setMarkerIcon] = useState(new L.Icon({ iconUrl: lift, iconSize: size }));
- const mmap = useMapEvent('zoomend', () => {setMarkerIcon(new L.Icon({ iconUrl: lift, iconSize: [20*Math.pow(2, map.getZoom() - 4), 20*Math.pow(2, map.getZoom() - 4)]}))});
+ useMapEvent('zoomend', () => {setMarkerIcon(new L.Icon({ iconUrl: lift, iconSize: [20*Math.pow(2, map.getZoom() - 4), 20*Math.pow(2, map.getZoom() - 4)]}))});
return
{body}
@@ -43,7 +41,7 @@ function Toilet({position, size})
// and the body of the popup of the lift (list of floors accessible from that lift)
const map = useMap();
const [markerIcon, setMarkerIcon] = useState(new L.Icon({ iconUrl: toilet, iconSize: size }));
- const mmap = useMapEvent('zoomend', () => {setMarkerIcon(new L.Icon({ iconUrl: toilet, iconSize: [20*Math.pow(2, map.getZoom() - 4), 20*Math.pow(2, map.getZoom() - 4)]}))});
+ useMapEvent('zoomend', () => {setMarkerIcon(new L.Icon({ iconUrl: toilet, iconSize: [20*Math.pow(2, map.getZoom() - 4), 20*Math.pow(2, map.getZoom() - 4)]}))});
return
}
@@ -145,8 +143,8 @@ function floorList(connectedFloors, callbackChangeFloor)
let htmlFloorList = [];
for (const floor in connectedFloors)
{
- htmlFloorList = [...htmlFloorList, {callbackChangeFloor(connectedFloors[floor]);}}>
- {connectedFloors[floor]}
+ htmlFloorList = [...htmlFloorList, {callbackChangeFloor(connectedFloors[floor]["id"]);}}>
+ {connectedFloors[floor]["name"]}
];
}
return htmlFloorList;
@@ -195,6 +193,13 @@ function newPolygon(element, positions, selectedRoom, callbackRoomSelected, call
{element["id"]}
}
+ else if (element["type"] === "C")
+ {
+ // In this case it is a corridor
+ return callbackRoomSelected(element["id"])}}>
+ {element["id"]}
+
+ }
}
function list_polygons(request, center, callbackRoomSelected, selectedRoom, callbackChangeFloor)