r2gg 2.2.6__py3-none-any.whl → 3.1.0__py3-none-any.whl

r2gg/__about__.py

@@ -34,7 +34,7 @@ __uri_repository__ = "https://github.com/IGNF/route-graph-generator/"
 __uri_tracker__ = f"{__uri_repository__}issues/"
 __uri__ = __uri_repository__
 
-__version__ = "2.2.6"
+__version__ = "3.1.0"
 __version_info__ = tuple(
     [
         int(num) if num.isdigit() else num

r2gg/_lua_builder.py

@@ -172,9 +172,12 @@ def _build_process_way(costs_config, output_cost):
     process_way_string += "\n"
 
     # durée
-    process_way_string += "\n    -- durée\n"
-    process_way_string += "    result.duration  = {}\n".format(compute_operations_string(output_cost["operations"]))
-    process_way_string += "\n"
+    current_profile = output_cost["name"].split("_")[-1]
+    for output in costs_config["outputs"]:
+        if output["name"] == "cost_s_" + current_profile:
+          process_way_string += "\n    -- durée\n"
+          process_way_string += "    result.duration  = {}\n".format(compute_operations_string(output["operations"]))
+          process_way_string += "\n"
 
     # gestion du sens direct
     process_way_string += "    -- gestion du sens direct\n"

r2gg/_pivot_to_pgr.py

@@ -64,7 +64,6 @@ def pivot_to_pgr(source, cost_calculation_file_path, connection_work, connection
             nombre_de_voies text,
             insee_commune_gauche text,
             insee_commune_droite text,
-            bande_cyclable text,
             itineraire_vert boolean,
             sens_de_circulation text,
             reserve_aux_bus text,
@@ -79,7 +78,12 @@ def pivot_to_pgr(source, cost_calculation_file_path, connection_work, connection
             matieres_dangereuses_interdites boolean,
             cpx_gestionnaire text,
             cpx_numero_route_europeenne text,
-            cpx_classement_administratif text
+            cpx_classement_administratif text,
+            transport_exceptionnel boolean,
+            vla_par_defaut integer,
+            cout_penalites numeric,
+            vehicule_leger_interdit boolean,
+            cout_vehicule_prioritaire numeric
         );""".format(ways_table_name)
     logger.debug("SQL: {}".format(create_table))
     cursor_out.execute(create_table)
@@ -241,7 +245,6 @@ def pivot_to_pgr(source, cost_calculation_file_path, connection_work, connection
             'nombre_de_voies as nombre_de_voies',
             'insee_commune_gauche as insee_commune_gauche',
             'insee_commune_droite as insee_commune_droite',
-            'bande_cyclable as bande_cyclable',
             'itineraire_vert as itineraire_vert',
             'sens_de_circulation as sens_de_circulation',
             'reserve_aux_bus as reserve_aux_bus',
@@ -256,7 +259,12 @@ def pivot_to_pgr(source, cost_calculation_file_path, connection_work, connection
             'matieres_dangereuses_interdites as matieres_dangereuses_interdites',
             'cpx_gestionnaire as cpx_gestionnaire',
             'cpx_numero_route_europeenne as cpx_numero_route_europeenne',
-            'cpx_classement_administratif as cpx_classement_administratif'
+            'cpx_classement_administratif as cpx_classement_administratif',
+            'transport_exceptionnel as transport_exceptionnel',
+            'vla_par_defaut as vla_par_defaut',
+            'cout_penalites as cout_penalites',
+            'vehicule_leger_interdit as vehicule_leger_interdit',
+            'cout_vehicule_prioritaire as cout_vehicule_prioritaire'
         ]
     in_columns = attribute_columns.copy()
     for variable in costs["variables"]:

{r2gg-2.2.6.dist-info → r2gg-3.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: r2gg
-Version: 2.2.6
+Version: 3.1.0
 Summary: Route Graph Generator (r2gg) est un script Python qui permet la génération de graphes pour des moteurs de calcul d'itinéraire
 Home-page: https://github.com/IGNF/route-graph-generator/
 Author: IGNF
@@ -18,10 +18,19 @@ Classifier: Operating System :: OS Independent
 Classifier: Topic :: Scientific/Engineering :: GIS
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: lxml ==4.6.4
-Requires-Dist: psycopg2 ==2.9.1
-Requires-Dist: sqlparse ==0.4.2
-Requires-Dist: osmium ==3.2.0
+Requires-Dist: lxml==4.6.4
+Requires-Dist: psycopg2==2.9.1
+Requires-Dist: sqlparse==0.4.2
+Requires-Dist: osmium==3.2.0
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
 
 # Route Graph Generator
 

{r2gg-2.2.6.dist-info → r2gg-3.1.0.dist-info}/RECORD

@@ -1,23 +1,23 @@
-r2gg/__about__.py,sha256=PmNn5d2h_yhjEeobGjnxXMn_8g-rl5nW4m4CNGnaChw,1343
+r2gg/__about__.py,sha256=F3opKSaubhHsAV6IREP11XcoEIeWDiz8fG7RgfRR4Ok,1343
 r2gg/__init__.py,sha256=zERkbHrNMbNZleuOxsfA7afQExXxpP7-IWVP1IFzNNs,88
 r2gg/_configure.py,sha256=5kNElkBGKR2vmSBNTJtaLPuLNDIiNOsTIGnoA80qzKg,3914
 r2gg/_file_copier.py,sha256=NzDd6ZqxQsQ_EulXg6jZxECUMjlJ0VBtr40-c1Rde-w,578
-r2gg/_lua_builder.py,sha256=NnTDppU-RFsG9ztcICbPVydGE1KciSyvpvOu-GPQmJQ,10249
+r2gg/_lua_builder.py,sha256=W00BWFkRoKSyBgcWCl00hxBNqvE3Yf7Aw6DeLLwfO5M,10420
 r2gg/_main.py,sha256=r2wOXvZLOp8VR6XF4rS37PVOGZ5MvFyYH0j0VytuI4g,21922
 r2gg/_osm_building.py,sha256=MFFY3EYOVO4rPsYk90Oda70KH1DKW2rlRj8XT4Vx_4U,4227
 r2gg/_osm_to_pbf.py,sha256=ZCGaqao4r2xkwIvKjQSOBd7TVXzO_KDAT2PptnCuAoY,1088
 r2gg/_output_costs_from_costs_config.py,sha256=g7Qy4tlUIOA7DJcwXW9ZxhcOJ5Srq1c8hufylI2e0m8,6208
 r2gg/_path_converter.py,sha256=CTtFHucxTSDB89TMbTO7Q0VqRCs2295GTA4_3cftUVc,340
 r2gg/_pivot_to_osm.py,sha256=sE9q29-C_E5rgZsV7CmQIlG67tEMZRgt4yqUC9FeTGo,8202
-r2gg/_pivot_to_pgr.py,sha256=CWTWnzIWXUMFSneMa_qiEkhc1Bx2s_RxL7l-CWBR6GM,17226
+r2gg/_pivot_to_pgr.py,sha256=bfwRdUYcpIVq2vSJ-pb7eHyq2WUdl4KG2D2F6JrlsMQ,17649
 r2gg/_read_config.py,sha256=VQ6d6Oi1aKHwwURA3KrbpWHK0zP18aJ98XQJiHZb8oI,721
 r2gg/_sql_building.py,sha256=DefYIerZ0k_yltgJFaSzTXAZPSSUH7WAxN3d5FceoWw,840
 r2gg/_subprocess_execution.py,sha256=ipsynsXohonN9YfmxX7DFTFCvJWsvrLDuA5Y-0QDUDM,1603
 r2gg/_valhalla_lua_builder.py,sha256=vNUnsu4yYQflnNv49-ElxrfIqa4b30vJP740ab7M7rY,13816
 r2gg/cli.py,sha256=2QM7pzvh-iz0kqNsPFtnDiCVAwn63o4GEQK4QwCcgSc,2894
-r2gg-2.2.6.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-r2gg-2.2.6.dist-info/METADATA,sha256=KwZ09B6hBv-oesbXvHt_eFum3sB0RdFT8ComGN8VND0,5013
-r2gg-2.2.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-r2gg-2.2.6.dist-info/entry_points.txt,sha256=Km7XbbcVI9jy1TQI0raQfRyKdNGAUIwVkkBG5YeQP4k,275
-r2gg-2.2.6.dist-info/top_level.txt,sha256=fj9IaWXORCdMRcnWWZ7LmvOG4W_sVH8J4BUWf1pM37c,5
-r2gg-2.2.6.dist-info/RECORD,,
+r2gg-3.1.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+r2gg-3.1.0.dist-info/METADATA,sha256=KAqkb9jcVB1DwLSaLD52-t9OCJemAFr3BfaBVvGcTHg,5199
+r2gg-3.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+r2gg-3.1.0.dist-info/entry_points.txt,sha256=Km7XbbcVI9jy1TQI0raQfRyKdNGAUIwVkkBG5YeQP4k,275
+r2gg-3.1.0.dist-info/top_level.txt,sha256=fj9IaWXORCdMRcnWWZ7LmvOG4W_sVH8J4BUWf1pM37c,5
+r2gg-3.1.0.dist-info/RECORD,,

{r2gg-2.2.6.dist-info → r2gg-3.1.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any