Mysaa/Encartes-web
1
0
Fork 0
mirror of https://gitlab.aliens-lyon.fr/encartes/web-interface.git synced 2026-03-18 15:11:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add corridors in a pane

Browse Source
This commit is contained in:
Adrien Vannson 2023-03-13 19:42:16 +01:00
parent 1ba106551c
commit 607cda808f
No known key found for this signature in database
GPG Key ID: FE2E66FD978C1A55
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Map.js
View File

@ -1,5 +1,6 @@
import { MapContainer } from 'react-leaflet/MapContainer'; import { MapContainer } from 'react-leaflet/MapContainer';
import { Marker } from 'react-leaflet/Marker'; import { Marker } from 'react-leaflet/Marker';
import { Pane } from 'react-leaflet/Pane';
import { Popup } from 'react-leaflet/Popup'; import { Popup } from 'react-leaflet/Popup';
import { Polygon } from 'react-leaflet/Polygon'; import { Polygon } from 'react-leaflet/Polygon';
import { Tooltip } from 'react-leaflet/Tooltip'; import { Tooltip } from 'react-leaflet/Tooltip';
@ -175,7 +176,9 @@ function newPolygon(element, positions, selectedRoom, callbackRoomSelected, call
const color = selectedRoom === element['id'] ? 'red' : 'grey'; const color = selectedRoom === element['id'] ? 'red' : 'grey';
if (element['type'] === 'C') { // Corridor if (element['type'] === 'C') { // Corridor
return <Polygon positions={positions} key={element['id'] + color} color={'peru'} /> return <Pane style={{ zIndex: 500 }}>
<Polygon positions={positions} key={element['id'] + color} color={'peru'} />
</Pane>
} }
var content = <></> var content = <></>
@ -278,11 +281,6 @@ function Map({ callbackRoomSelected, selectedRoom, floorID, callbackChangeFloor
} }
else { else {
const request = floor["places"]; const request = floor["places"];
/*const createPolygons = React.useCallback((request, callbackRoomSelected, selectedRoom) => {
return buildPols(request, callbackRoomSelected, selectedRoom);
}, [request, callbackRoomSelected, selectedRoom]);
const polygons = createPolygons(request, callbackRoomSelected, selectedRoom);
*/
const polygons = buildPols(request, callbackRoomSelected, selectedRoom, callbackChangeFloor); const polygons = buildPols(request, callbackRoomSelected, selectedRoom, callbackChangeFloor);
return <MapContainer center={[0, 0]} zoom={4} scrollWheelZoom={true} style={{ flexGrow: '1' }} maxBounds={bounds} maxBoundsViscosity={1.0}> return <MapContainer center={[0, 0]} zoom={4} scrollWheelZoom={true} style={{ flexGrow: '1' }} maxBounds={bounds} maxBoundsViscosity={1.0}>
{polygons} {polygons}