Set index in feature for start_in_area to work (#52)

cedbossneo · Jul 30, 2024 · 6826f95 · 6826f95
1 parent 61ac17e
commit 6826f95
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.env b/.env
@@ -3,7 +3,7 @@ DB_PATH=./db
 DOCKER_HOST=unix:///Users/cedric/.rd/docker.sock
 WEB_DIR=./web/dist
 #ROS_MASTER_URI=http://192.168.64.6:11311
-ROS_MASTER_URI=http://10.0.0.134:11311
+ROS_MASTER_URI=http://192.168.1.67:11311
 MAP_TILE_SERVER=http://localhost:5000
 #MAP_TILE_URI=/tiles/vt/lyrs=s,h&x={x}&y={y}&z={z}
 HOMEKIT_ENABLED=false

diff --git a/web/src/pages/MapPage.tsx b/web/src/pages/MapPage.tsx
@@ -270,6 +270,7 @@ export const MapPage = () => {
             const centroidPt = centroid(feature);
             if (centroidPt.properties != null) {
                 centroidPt.properties.title = feature.properties?.title;
+                centroidPt.properties.index = feature.properties?.index;
             }
             centroidPt.id = feature.id
             return [centroidPt];
@@ -363,7 +364,7 @@ export const MapPage = () => {
                     "color": type == "navigation" ? "white" : "#01d30d",
                     title: type == "area" ? type + " " + index : undefined,
                     index,
-                },
+                },                
                 geometry: {
                     coordinates: [area.Area?.Points?.map((point) => {
                         return transpose(offsetX, offsetY, datum, point.Y!!, point.X!!)
@@ -377,7 +378,7 @@ export const MapPage = () => {
                     type: 'Feature',
                     properties: {
                         "color": "#bf0000",
-                    },
+                    },                    
                     geometry: {
                         coordinates: [obstacle.Points?.map((point) => {
                             return transpose(offsetX, offsetY, datum, point.Y!!, point.X!!)
@@ -928,7 +929,7 @@ export const MapPage = () => {
                     <AsyncDropDownButton size={"small"} menu={{
                         items: mowingAreas,
                         onAsyncClick: (e) => {
-                            const item = mowingAreas.find(item => item.key == e.key)
+                            const item = mowingAreas.find(item => item.key == e.key)                            
                             return mowerAction("start_in_area", {
                                 area: item!!.feat.properties?.index,
                             })()