Merge branch 'vicky_test' into 'main'

Debug tool

See merge request !9

README.md

@@ -25,7 +25,7 @@ The environment is called `swp_debug_tool` by default. You can activate it via t
 When adding dependencies, execute : 
 
 ```sh
-conda env export -f <path to YAML file> --from-history
+conda env export --from-history | grep -v "^prefix: " > environment.yml
 ```
 
 The `--from-history` parameter prevents adding the build ID to the dependency, as that is usually OS-specific. Also, it only
@@ -38,3 +38,5 @@ still have build IDs (i.e. your dependencies have the form `<name>=<version>=<bu
 This works on JetBrains IDEs at least.
 
 so that the dependencies are reflected in the state of the project. 
+
+The proto sample should be in the directory `debug-tool/proto/sample` and the tool would take it automatically.
\ No newline at end of file

debug-tool/debug_map.py

 from ipyleaflet import Map, basemaps, basemap_to_tiles, GeoData
+from ipywidgets import HTML
+from ipyleaflet import WidgetControl, LayerGroup, Polyline
 from proto_parser import (
     parseData,
     getNodesDataframe,
@@ -15,6 +17,14 @@ class DebugTool:
             center=(self.nodes_df.iloc[0].lat, self.nodes_df.iloc[0].lon),
             zoom=17,
         )
+        self.node_widget = HTML(
+            """
+            Information Widget
+            """
+        )
+        self.node_widget.layout.margin = "0px 20px 20px 20px"
+        control1 = WidgetControl(widget=self.node_widget, position="bottomright")
+        self.m.add(control1)
         self.initializeLayers()
 
     def initializeLayers(self):
@@ -39,25 +49,46 @@ class DebugTool:
             },
             name="Intersections",
         )
-        geo_data_edges = GeoData(
-            geo_dataframe=self.edges_df,
-            style={
-                "color": "black",
-                "fillColor": "#3366cc",
-                "opacity": 0.05,
-                "weight": 1.9,
-                "dashArray": "2",
-                "fillOpacity": 0.6,
-            },
-            hover_style={
-                "fillColor": "red",
-                "fillOpacity": 0.2,
-            },  # point_style={'radius': 5, 'color': 'red', 'fillOpacity': 0.8, 'fillColor': 'blue', 'weight': 3},
-            name="Segments",
-        )
+        geo_data_nodes.on_click(self.addNodeDescription)
+        geo_data_edges = self.visualiseSegments()
         self.m.add_layer(geo_data_nodes)
         self.m.add_layer(geo_data_edges)
 
+    def visualiseSegments(self):
+        edges_layer = LayerGroup()
+        for _, row in self.edges_df.iterrows():
+            layer = Polyline(
+                locations=row["geometry"],
+                color="green",
+                opacity=0.6,
+                weight=5,
+                fill=False,
+            )
+            layer.on_click(self.onEdgeClick(row))
+            edges_layer.add_layer(layer)
+        return edges_layer
+
+    def onEdgeClick(self, edge):
+        def innerEdgeClick(**_):
+            self.node_widget.value = f"""
+            EDGE:
+            ID: {edge["id"]}, </br>
+            OSM ID: {edge["osmId"]}, </br>
+            LENGTH: {edge["length"]}, </br>
+            START NODE: {edge["startNode"]}, </br>
+            END NODE: {edge["endNode"]},
+            """
+
+        return innerEdgeClick
+
+    def addNodeDescription(self, **e):
+        properties = e["properties"]
+        self.node_widget.value = f"""
+        NODE:
+        OSM ID: {properties["osmId"]}, </br>
+        LAT/LON: {properties["lat"]}, {properties["lon"]} 
+        """
+
     def loadData(self):
         roadnetwork = parseData("./proto/sample/roadnetwork_sample.proto")
         self.nodes_df = getNodesDataframe(roadnetwork)

debug-tool/environment.yml

-name: swp_debug_tool
+name: debug-tool
 channels:
   - defaults
   - conda-forge
   - anaconda
 dependencies:
-  - python=3.9
-  - jupyter=1.0.0
-  - ipyleaflet=0.17.2
-  - protobuf=3.20.3
-  - pandas=1.5.3
-  - geopandas=0.12.2
-  - shapely=2.0.1
+  - ipyleaflet
+  - google-api-python-client
+  - python=3.10
+  - pandas
+  - pip
+  - shapely
+  - jupyterlab

debug-tool/proto_parser.py

@@ -24,14 +24,18 @@ def getNodesDataframe(roadnetwork_dict):
 
 
 def getEdgesDataframe(roadnetwork_dict):
+    if "segments" not in roadnetwork_dict.keys():
+        return gpd.GeoDataFrame()
     edges_df = pd.DataFrame.from_dict(roadnetwork_dict["segments"].values())
-    edges_df["geometry"] = edges_df["geometry"].map(
-        lambda values: LineString([[x["lon"], x["lat"]] for x in values])
+    edges_df["geometry"] = edges_df["geometry"].apply(
+        lambda x: [(value["lat"], value["lon"]) for value in x]
     )
-    gdf = gpd.GeoDataFrame(edges_df, geometry=edges_df.geometry)
-    return gdf
+    # gdf = gpd.GeoDataFrame(edges_df, geometry=edges_df.geometry)
+    return edges_df
 
 
 def getTurnRestrictions(roadnetwork_dict):
+    if "turnRestrictions" not in roadnetwork_dict.keys():
+        return gpd.GeoDataFrame()
     turn_restrictions_df = pd.DataFrame.from_dict(roadnetwork_dict["turnRestrictions"])
     return turn_restrictions_df

debug-tool/tool.ipynb

@@ -2,19 +2,12 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 25,
+   "execution_count": 1,
    "id": "0ac881f6",
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "The autoreload extension is already loaded. To reload it, use:\n",
-      "  %reload_ext autoreload\n"
-     ]
-    }
-   ],
+   "metadata": {
+    "tags": []
+   },
+   "outputs": [],
    "source": [
     "%load_ext autoreload\n",
     "%autoreload 2"
@@ -30,9 +23,11 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 28,
+   "execution_count": 19,
    "id": "191b5e99-44db-4cb2-99f9-392a786ab6c1",
-   "metadata": {},
+   "metadata": {
+    "tags": []
+   },
    "outputs": [],
    "source": [
     "from debug_map import DebugTool"
@@ -40,22 +35,24 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 29,
+   "execution_count": 20,
    "id": "e9991e26",
-   "metadata": {},
+   "metadata": {
+    "tags": []
+   },
    "outputs": [
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "b9c30573967d4b49bc1a64317b232e54",
+       "model_id": "fb10283bc2da4f6690e3d6e7d9722b58",
        "version_major": 2,
        "version_minor": 0
       },
       "text/plain": [
-       "Map(center=[51.743538, 14.326337], controls=(ZoomControl(options=['position', 'zoom_in_text', 'zoom_in_title',…"
+       "Map(center=[51.759586, 14.31715], controls=(ZoomControl(options=['position', 'zoom_in_text', 'zoom_in_title', …"
       ]
      },
-     "execution_count": 29,
+     "execution_count": 20,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -68,15 +65,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "a0c84919",
-   "metadata": {},
-   "outputs": [],
-   "source": []
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "606f6f23",
+   "id": "192b13b2-2db1-4af3-abdb-cbd43ed7a86c",
    "metadata": {},
    "outputs": [],
    "source": []
@@ -84,9 +73,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3.11.0 ('debug-tool')",
+   "display_name": "debug-tool",
    "language": "python",
-   "name": "python3"
+   "name": "debug-tool"
   },
   "language_info": {
    "codemirror_mode": {