Traitement geocodage en lot

CHANGELOG.md

@@ -11,7 +11,9 @@ and this project adheres to [Semantic Versioning].
 ### Added
 
 ### Changed
+* Geocodage des adresses en lot
 * Refacto : fetch_matrices dans un fichier externe
+* Suppression des références à "école" pour généraliser vers destinations
 
 ### Deprecated
 

app.py

@@ -1,7 +1,6 @@
 import requests
 import folium
 import colorcet as cc
-import shapely
 import plotly.express as px
 import panel as pn
 import pandas as pd
@@ -25,43 +24,6 @@ l93="EPSG:9794"
 pal=cc.glasbey_dark
 
 
-def cree_adresse(df, cols):
-    return df[cols].astype(str).agg(' '.join, axis=1).str.strip()
-
-
-def geocode(adresse, as_point=False, as_dict=False):
-    r=requests.get(url="https://data.geopf.fr/geocodage/search",
-                   params={"q": adresse})
-    if not r.ok:
-        return None
-    try:
-        js=r.json()
-        feature=js['features'][0]
-        if as_point:
-            return shapely.Point(feature['geometry']['coordinates'])
-        if as_dict:
-            return {js["query"] : feature}
-        return feature
-    except:
-        return None
-
-
-def add_coo(adresse, details=False):
-    feature=geocode(adresse)
-    if feature is None:
-        sleep(0.1)
-        feature=geocode(adresse)
-        if feature is None:
-            return None, None, 0
-    coo=shapely.Point(feature['geometry']['coordinates'])
-    score=feature['properties']['score']
-    suggestion=feature['properties']['label']
-    return (coo, suggestion, score) if details else coo
-
- 
-
-
-
 def mat_figs(dfadr, mat_dist, mat_dur):
     labels=[ f'{row["oid"]}:{row["lieu"]}'  for _, row in dfadr.iterrows()]
     fig_dist = px.imshow(mat_dur, height=1500, x=labels, y=labels, title = "Distance (m) entre deux adresses")
@@ -75,8 +37,6 @@ capacité=pn.widgets.IntInput(name='Capacité taxi', value=3, step=1, start=0, e
 
     
 
-
-
 def mise_en_forme_dfinal(sol, dfadr):
     dfsol=sol.routes
     dfsol["num_vehicule"]=dfsol.groupby("vehicle_id").ngroup()
@@ -152,9 +112,10 @@ tabp=Tableur(idx_offset=1001, delivery_tab=tabd)
 def tous_calculs(_):
     
     dfp=tabp.df.dropna()
+    dest_col=tabp.dest_col.value
     gdfadr=gpd.GeoDataFrame(pd.concat([
         dfp[["suggestion", "geometry_p"]].rename(columns={"suggestion" : "lieu", "geometry_p": "geometry"}),
-        tabd.df[["ECOLE", "geometry"]][tabd.df.ECOLE.isin(tabp.df.dropna()["ECOLE"])].rename(columns={"ECOLE" : "lieu"})],
+        tabd.df[[dest_col, "geometry"]][tabd.df[dest_col].isin(tabp.df.dropna()[dest_col])].rename(columns={dest_col : "lieu"})],
         keys=["p", "d"], names=['type', 'oid']).drop_duplicates().reset_index() )
     ladr=gdfadr["lieu"].to_list()
 
@@ -166,9 +127,9 @@ def tous_calculs(_):
      
     sol=calcul_routes(dfp, ladr, mat_dist, mat_dur, duree_taxi.value, duree_ecole.value, capacité.value)
 
-    gpu=dfp.loc[list({u["id"] for u in sol.to_dict()["unassigned"]})][['suggestion', 'indice école', 'ECOLE', 'arrivée_max']].copy()
-    gpu["Distance (km)"]=gpu.apply(lambda row: mat_dist[ladr.index(row["suggestion"])][ladr.index( row["ECOLE"])], axis=1)
-    gpu["Durée (min)"]=gpu.apply(lambda row: mat_dur[ladr.index( row["suggestion"])][ladr.index( row["ECOLE"])]//60, axis=1)
+    gpu=dfp.loc[list({u["id"] for u in sol.to_dict()["unassigned"]})][['suggestion', 'indice_destination', dest_col, 'arrivée_max']].copy()
+    gpu["Distance (km)"]=gpu.apply(lambda row: mat_dist[ladr.index(row["suggestion"])][ladr.index( row[dest_col])], axis=1)
+    gpu["Durée (min)"]=gpu.apply(lambda row: mat_dur[ladr.index( row["suggestion"])][ladr.index( row[dest_col])]//60, axis=1)
     tabs.append(('Non assignés', pn.widgets.Tabulator(gpu, disabled=True,  height=1000)))
     
 

requirements.txt

@@ -106,7 +106,6 @@ pyogrio==0.11.1
 pyparsing==3.2.5
 pyproj==3.7.2
 pyproject-hooks==1.2.0
-pyrouting==1.3.0
 pyshp==2.3.1
 python-dateutil==2.9.0.post0
 python-json-logger==3.3.0

tableur.py

@@ -1,52 +1,15 @@
-import numpy as np
-
+import requests
 import dateparser
+import numpy as np
 import panel as pn
 import pandas as pd
+from shapely import Point
 
 from bokeh.models.widgets.tables import DateFormatter
+
 from io import BytesIO, StringIO
 from datetime import timedelta
 
-import requests
-import shapely
-
-from time import sleep
-
-
-def cree_adresse(df, cols):
-    return df[cols].astype(str).agg(' '.join, axis=1).str.strip()
-
-
-def geocode(adresse, as_point=False, as_dict=False):
-    r=requests.get(url="https://data.geopf.fr/geocodage/search",
-                   params={"q": adresse})
-    if not r.ok:
-        return None
-    try:
-        js=r.json()
-        feature=js['features'][0]
-        if as_point:
-            return shapely.Point(feature['geometry']['coordinates'])
-        if as_dict:
-            return {js["query"] : feature}
-        return feature
-    except:
-        return None
-
-
-def add_coo(adresse, details=False):
-    feature=geocode(adresse)
-    if feature is None:
-        sleep(0.1)
-        feature=geocode(adresse)
-        if feature is None:
-            return None, None, 0
-    coo=shapely.Point(feature['geometry']['coordinates'])
-    score=feature['properties']['score']
-    suggestion=feature['properties']['label']
-    return (coo, suggestion, score) if details else coo
-    
 
 def frenchdrop(dropper: pn.widgets.FileDropper):
     """Example of a FileDropper with French labels via JS injection."""
@@ -86,7 +49,7 @@ class Tableur():
         self.df=pd.DataFrame()
         self.dmime={'csv': 'text/csv', 'xlsx': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'}
         self.feuille=pn.widgets.Select(name='Feuille de calcul', disabled=True, width=200)
-        self.ecole_col=pn.widgets.Select(name="Colonne identifiant la destination", disabled=True, width=200)
+        self.dest_col=pn.widgets.Select(name="Colonne identifiant la destination", disabled=True, width=200)
         self.adr_col=pn.widgets.MultiChoice(name="Colonnes composant l'adresse", disabled=True, width=250)
         self.tabd=pn.widgets.Tabulator(height=1000,
                                   formatters={"arrivée_max" : DateFormatter(format="%H:%M")},
@@ -124,32 +87,42 @@ class Tableur():
         self.df = self.dfeuilles.get(self.feuille.value)
         if self.df is not None:
             cols=self.df.columns.to_list()
-            self.ecole_col.options=cols
-            self.ecole_col.disabled = False
+            self.dest_col.options=cols
+            self.dest_col.disabled = False
             self.adr_col.options = cols
             self.adr_col.disabled = False
             #print("Colonnes :", adr_col.options)
+
+
+    def batch_geocode(self):
+        r=requests.post(
+            url='https://data.geopf.fr/geocodage/search/csv',
+            files={'data': self.df[self.adr_col.value].to_csv(index=False)} )
+        if r.ok:
+            dfr=pd.read_csv(StringIO(r.text)) \
+                .rename(columns={"result_score": "score", "result_label": "suggestion"})
+            dfr["geometry"] = [Point(r["longitude"], r["latitude"]) for _, r in dfr.iterrows()]
+            self.df=pd.concat([self.df, dfr[["geometry", "score", "suggestion"]]], axis=1)
     
     
     def lancer_calculs(self, _):
-        self.df["adresse"]=cree_adresse(self.df, self.adr_col.value)
-        self.df["geometry"], self.df["suggestion"], self.df["score"] = zip(*self.df.adresse.apply(add_coo, details=True))
-        display_cols= self.adr_col.value + ["suggestion", "score", self.ecole_col.value, "arrivée_max"]
+        self.batch_geocode()
+        display_cols= self.adr_col.value + ["suggestion", "score", self.dest_col.value, "arrivée_max"]
         if self.delivery_tab is None:
             auj9=dateparser.parse("aujourd'hui 9:00")
-            self.df["arrivée_max"] = (auj9+ (self.df[self.ecole_col.value].str.split().str[0].isin({'Collège', 'Lycée'}))*timedelta(hours=-0.5))
+            self.df["arrivée_max"] = (auj9+ (self.df[self.dest_col.value].str.split().str[0].isin({'Collège', 'Lycée'}))*timedelta(hours=-0.5))
         else:
             self.delivery_tab.df["arrivée_max"]=self.delivery_tab.tabd.value["arrivée_max"]
             self.df=self.df.merge(
-                self.delivery_tab.df[[self.delivery_tab.ecole_col.value, "geometry", "arrivée_max"]].reset_index(names="indice école"),
-                left_on=self.ecole_col.value, right_on=self.delivery_tab.ecole_col.value,
+                self.delivery_tab.df[[self.delivery_tab.dest_col.value, "geometry", "arrivée_max"]].reset_index(names="indice_destination"),
+                left_on=self.dest_col.value, right_on=self.delivery_tab.dest_col.value,
                 how="left", suffixes=["_p", "_d"]
             )
-            display_cols+=["indice école"]
+            display_cols+=["indice_destination"]
         self.df.index = self.idx_offset+np.arange(len(self.df))
         self.tabd.value=self.df[display_cols]
         self.tabd.style.background_gradient(subset=["score"], cmap="RdYlGn", vmin=0.5, vmax=1.0)\
-                .map(lambda v: '' if v == v else 'background-color:grey;', subset=["indice école", "arrivée_max"])
+                .map(lambda v: '' if v == v else 'background-color:grey;', subset=["indice_destination", "arrivée_max"])
         self.tabd.param.trigger("value")
         return None
     
@@ -157,7 +130,7 @@ class Tableur():
     def get_panel(self):
         return pn.Column(pn.Row(frenchdrop(self.file_dropper),
                                 self.feuille,
-                                self.ecole_col,
+                                self.dest_col,
                                 self.adr_col,
                                 self.bouton,
                                 height=100),