r2gg 2.2.3__py3-none-any.whl → 2.2.5__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.3"
+__version__ = "2.2.5"
 __version_info__ = tuple(
     [
         int(num) if num.isdigit() else num

r2gg/_main.py

@@ -407,16 +407,20 @@ def valhalla_convert(config, resource, logger, build_lua_from_cost_config = True
         start_command = time.time()
         valhalla_build_config_args = ["valhalla_build_config",
             "--mjolnir-tile-dir",  source["storage"]["dir"],
-            "--mjolnir-tile-extract", source["storage"]["tar"]]
+            "--mjolnir-tile-extract", source["storage"]["tar"],
+            # Modification des limites par défaut du service : 10h pour isochrone et 1000km pour iso distance
+            # contre 2h et 200km par défaut
+            "--service-limits-isochrone-max-time-contour", "600",
+            "--service-limits-isochrone-max-distance-contour", "1000",
+            # Ajout de l'autorisation à exclure les ponts/tunnels/péages
+            "--service-limits-allow-hard-exclusions", "True"]
         subprocess_execution(valhalla_build_config_args, logger, outfile = source["storage"]["config"])
         # Nécessaire le temps que le fichier s'écrive...
         time.sleep(1)
-        # Ajout du graph custom dans la config valhalla
+        # Ajout du graph custom dans la config valhalla (impossible via les paramètres du build_config)
         with open(source["storage"]["config"], "r") as valhalla_config:
             config_dict = json.load(valhalla_config)
             config_dict["mjolnir"]["graph_lua_name"] = source["costs"][0]["compute"]["storage"]["file"]
-            # Ajout de l'autorisation à exclure les ponts/tunnels/péages
-            config_dict["service_limits"]["allow_hard_exclusions"] = True
 
         with open(source["storage"]["config"], "w") as valhalla_config:
             valhalla_config.write(json.dumps(config_dict))

r2gg/_pivot_to_pgr.py

@@ -395,13 +395,43 @@ def pivot_to_pgr(source, cost_calculation_file_path, connection_work, connection
 
     for profile_name in profile_names:
         logger.info("Cleaning isolated edges for profile {}...".format(profile_name))
-        clean_graph_query = "SELECT {0}.clean_graph('{1}')".format(schema, profile_name)
+        clean_graph_query = """
+        WITH connected_components AS (
+          SELECT * FROM pgr_connectedComponents(
+            'SELECT id, source, target, cost_s_{1} as cost, reverse_cost_s_{1} as reverse_cost FROM {0}.ways'
+          )
+        ),
+        remove_nodes AS (
+          SELECT node
+          FROM
+            connected_components
+          WHERE
+          component = ANY(
+            SELECT DISTINCT component
+            FROM
+            (
+              SELECT component, count(*) AS nb
+              FROM
+                connected_components
+              GROUP BY component
+            )
+            AS components
+            WHERE nb <= 10
+          )
+        )
+        UPDATE {0}.ways
+        SET cost_s_{1} = -1,
+          reverse_cost_s_{1} = -1,
+          cost_m_{1} = -1,
+          reverse_cost_m_{1} = -1
+        WHERE {0}.ways.target = ANY(SELECT * from remove_nodes) OR {0}.ways.source = ANY(SELECT * from remove_nodes);
+        """.format(schema, profile_name)
         logger.info("SQL: {}".format(clean_graph_query))
         cursor_isolated.execute(clean_graph_query)
+        connection_out.commit()
 
     et_execute = time.time()
     logger.info("Execution ended. Elapsed time : %s seconds." %(et_execute - st_execute))
-    connection_out.commit()
     cursor_isolated.close()
 
     end_time = time.time()

r2gg/_subprocess_execution.py

@@ -14,7 +14,8 @@ def subprocess_execution(args, logger, outfile = None):
     """
     try:
         str_args = [str(arg) for arg in args]
-        logger.info('Subprocess: \"' + " ".join(str_args) + '\"')
+        subprocess_arg = " ".join(str_args)
+        logger.info('Subprocess: \"' + subprocess_arg + '\"')
         if outfile is not None:
             with open(outfile, "w") as out:
                 process = subprocess.Popen(
@@ -32,6 +33,12 @@ def subprocess_execution(args, logger, outfile = None):
             process_output, _ =  process.communicate()
             logger.info(process_output.decode("utf-8"))
 
+        returncode = process.returncode
+        if process.returncode != 0:
+            error_msg = f"Invalid returncode {returncode} for subprocess '{subprocess_arg}'"
+            logger.error(error_msg)
+            raise RuntimeError(error_msg)
+
 
     except (OSError, subprocess.CalledProcessError) as exception:
         logger.info('Exception occured: ' + str(exception))

{r2gg-2.2.3.dist-info → r2gg-2.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: r2gg
-Version: 2.2.3
+Version: 2.2.5
 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

{r2gg-2.2.3.dist-info → r2gg-2.2.5.dist-info}/RECORD

@@ -1,23 +1,23 @@
-r2gg/__about__.py,sha256=ngRpKEpEbdLAoGKW9lVryj3vhty9D8fUMOYj8-W4flA,1343
+r2gg/__about__.py,sha256=Ite9kzvRtV8_PUbjmNiaJAw9qbF-UTbrnuJdaZbF3T4,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/_main.py,sha256=_xmZalO9ZFAUcM8UbSx46at-7r4jjd4x2yjI9nLt_lw,21592
+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=JJ7PnBlkCAKJ0pCJ-uORrYs746D08j7iEqc2dEe08lM,16317
+r2gg/_pivot_to_pgr.py,sha256=CWTWnzIWXUMFSneMa_qiEkhc1Bx2s_RxL7l-CWBR6GM,17226
 r2gg/_read_config.py,sha256=VQ6d6Oi1aKHwwURA3KrbpWHK0zP18aJ98XQJiHZb8oI,721
 r2gg/_sql_building.py,sha256=DefYIerZ0k_yltgJFaSzTXAZPSSUH7WAxN3d5FceoWw,840
-r2gg/_subprocess_execution.py,sha256=tNTqEEjG-zmf8TZwa35V6BNcyKXaZfjHjMQmgh8DTns,1245
+r2gg/_subprocess_execution.py,sha256=NcH3wTwaeOIWA4huSunhnp0qqCkpU6wbHV1w_xqj3C8,1533
 r2gg/_valhalla_lua_builder.py,sha256=vNUnsu4yYQflnNv49-ElxrfIqa4b30vJP740ab7M7rY,13816
 r2gg/cli.py,sha256=2QM7pzvh-iz0kqNsPFtnDiCVAwn63o4GEQK4QwCcgSc,2894
-r2gg-2.2.3.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-r2gg-2.2.3.dist-info/METADATA,sha256=p1HkC1kfnTv6E371E2Pga1lz9ly6nCHJZ-rPhZSb5Rk,5013
-r2gg-2.2.3.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-r2gg-2.2.3.dist-info/entry_points.txt,sha256=Km7XbbcVI9jy1TQI0raQfRyKdNGAUIwVkkBG5YeQP4k,275
-r2gg-2.2.3.dist-info/top_level.txt,sha256=fj9IaWXORCdMRcnWWZ7LmvOG4W_sVH8J4BUWf1pM37c,5
-r2gg-2.2.3.dist-info/RECORD,,
+r2gg-2.2.5.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+r2gg-2.2.5.dist-info/METADATA,sha256=_QAvaf9Q46IrVy9mFX7pEqcXg4jDAtlNsem5vi_PHZg,5013
+r2gg-2.2.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+r2gg-2.2.5.dist-info/entry_points.txt,sha256=Km7XbbcVI9jy1TQI0raQfRyKdNGAUIwVkkBG5YeQP4k,275
+r2gg-2.2.5.dist-info/top_level.txt,sha256=fj9IaWXORCdMRcnWWZ7LmvOG4W_sVH8J4BUWf1pM37c,5
+r2gg-2.2.5.dist-info/RECORD,,

{r2gg-2.2.3.dist-info → r2gg-2.2.5.dist-info}/WHEEL

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