v0.2.0 Readable time, distance, price, road ; legend added

CHANGELOG.md

@@ -10,11 +10,14 @@ and this project adheres to [Semantic Versioning].
 - /
 
 
-## [0.1.0] - 2025-02-27
+## [0.2.0] - 2025-02-28
 
 ### Added
 
-- First online demo
+- Better map display features in general; in particular:
+- Every segment has a readable distance, time, price and road.
+- Every path has a legend aggregating those elements (except road).
+- Button can't be clicked while computing.
 
 ### Changed
 
@@ -24,7 +27,23 @@ and this project adheres to [Semantic Versioning].
 
 ### Fixed
 
+### Security
+
+
+
+## [0.1.0] - 2025-02-27
+
+### Added
+
+- First online demo
 
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
 
 ### Security
 

app.py

@@ -1,10 +1,10 @@
+import pandas as pd
 import osmnx as ox
 import panel as pn
 import param
 import colorcet as cc
 import autoroute
 
-map_kwds={"font_size": 15}
 transformer = autoroute.to_Lambert93()
 
 pn.extension()
@@ -19,6 +19,7 @@ calcul=pn.widgets.Button(button_type= "primary", name="Calculer parcours")
 carte=pn.pane.plot.Folium(min_height=1000, sizing_mode='stretch_both')
 
 def calculs(dummy):
+    calcul.disabled=True
     orig_coo=ox.geocoder.geocode(par.orig_adr)
     dest_coo=ox.geocoder.geocode(par.dest_adr)
     calcul.name="Téléchargement carte"
@@ -32,20 +33,18 @@ def calculs(dummy):
     df=autoroute.tariftimedf(Gc, orig_id, dest_id)
     calcul.name="Affichage résultats"
     
-    m=None
-    for irow, row in df.iterrows():
-        gfast=ox.routing.route_to_gdf(Gc, row["path"], weight= "travel_time")
-        m=gfast.explore(m=m, map_kwds=map_kwds, color=cc.b_glasbey_category10[irow],
-                  tooltip= set(gfast.columns) & {"travel_time", "tarif", "length"},
-                  highlight_kwds={"color": "green", "weight": 3} )
-
-    carte.object=m  
+    gpfs=pd.concat([autoroute.clean_gfast(autoroute.ox.routing.route_to_gdf(Gc, row["path"], weight= "travel_time"))
+        for _, row in df.iterrows()])
+    
+    carte.object=gpfs.explore(column="legend", tooltip= ["poids", "rue"],  cmap=cc.b_glasbey_category10,
+              map_kwds={"font_size": 12}, style_kwds={"weight": 3}, highlight_kwds={"weight": 5})
+    calcul.disabled=False
 
 calcul.on_click(calculs)
 
 
 app=pn.template.MaterialTemplate(
-    title="Autoroute v0.1.0",
+    title="Autoroute v0.2.0",
     sidebar=[pn.Param(par, name="Paramètres"), calcul],
     main=carte,
 )

autoroute.py

@@ -171,5 +171,41 @@ def add_tarifs(G):
     Gc.add_edges_from(ltup)
     return Gc
     
-
+def readable_place(row):
+    name= "\n".join(row["name"]) if isinstance(row["name"], list) else row["name"]
+    ref= row["ref"][0] if isinstance(row["ref"], list) else row["ref"]
+    if pd.isna(name):
+        return str(row["ref"])
+    return name if pd.isna(ref) else f'{row["ref"]} {name}'
+
+def readable_dist(dm):
+    if dm<1000:
+        return f"{dm:.0f}m"
+    elif dm<10000:
+        return f"{dm/1000:.1f}km"
+    else:
+        return f"{dm/1000:.0f}km"
+
+def readable_time(ts):
+    if ts<60:
+        return f"{ts:.0f}s"
+    elif ts<3600:
+        return f"{ts//60:.0f}min {ts%60:.0f}s"
+    else:
+        return f"{ts//3600:.0f}h {(ts//60)%60:.0f}min"
+
+def readable_tarif(row):
+    if "tarif" not in row or row["tarif"]==0:
+        return ""
+    else:
+        return f', {row["tarif"]}€'
+    
+def readable_agg(row):
+    return f'{readable_time(row["travel_time"])}, {readable_dist(row["length"])}{readable_tarif(row)}'
+
+def clean_gfast(gfast):
+    gfast["poids"]=gfast.apply(readable_agg, axis=1)
+    gfast["legend"] = readable_agg(gfast[list(set(gfast.columns) & {"travel_time", "tarif", "length"})].sum())
+    gfast["rue"] = gfast.apply(readable_place, axis=1)
+    return gfast