diff --git a/src/Map.js b/src/Map.js index 097146e..9f973c5 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) +function list_polygons(request, center, ratio, ind, cb, selectedRoom) { let polygons = []; //let tarace = 0; @@ -67,13 +67,13 @@ function list_polygons(request, center, ratio, ind, cb) return [(z[1]-center[1])/25, (z[0]-center[0])/25]; } }) - })).map((x) => {return cb(k)}>{k}})]; + })).map((x) => {return cb(k)}>{k}})]; // })).map((x) => {tarace = tarace+1; return {k}Popup})]; } return polygons; } -function layers_list(requestList, cb) +function layers_list(requestList, cb, selectedRoom) { let layers = []; requestList.forEach( (request, ind) => @@ -88,7 +88,7 @@ function layers_list(requestList, cb) // console.log((maxY-minY)/2284); // console.log((maxX-minX)/135); // console.log(ratio); - const polygons = list_polygons(request, center, ratio, ind, cb); + const polygons = list_polygons(request, center, ratio, ind, cb, selectedRoom); layers = [...layers, {polygons} ]; }) return layers; @@ -99,9 +99,9 @@ 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) => { - return layers_list([request2, request3, request4], callbackRoomSelected); - }, [request2, request3, request4, callbackRoomSelected]); + const buildLayers = React.useCallback((request2, request3, request4, callbackRoomSelected, selectedRoom) => { + return layers_list([request2, request3, request4], callbackRoomSelected, selectedRoom); + }, [request2, request3, request4, callbackRoomSelected, selectedRoom]); const layers = buildLayers(request2, request3, request4); return