clean

InseeFrLab · Dec 26, 2023 · bb7d6d7 · bb7d6d7
1 parent 8f44df2
commit bb7d6d7
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 27 deletions.
diff --git a/cartiflette/mapshaper/mapshaper_split.py b/cartiflette/mapshaper/mapshaper_split.py
@@ -1,7 +1,5 @@
 import subprocess
 
-
-
 DICT_CORRESP_IGN = {"REGION": "INSEE_REG", "DEPARTEMENT": "INSEE_DEP"}
 
 
@@ -101,7 +99,6 @@ def mapshaperize_split(
     return output_path
 
 
-
 def mapshaperize_split_merge(
     local_dir="temp",
     extension_initial="shp",
@@ -131,36 +128,42 @@ def mapshaperize_split_merge(
     # PREPROCESS CITIES
     subprocess.run(
         (
-        f"mapshaper {local_dir}/COMMUNE.{extension_initial} name='COMMUNE' "
-        f"-proj EPSG:{crs} "
-        f"-filter '\"69123,13055,75056\".indexOf(INSEE_COM) > -1' invert "
-        f"-each \"INSEE_COG=INSEE_COM\" "
-        f"-o {output_path}/communes_simples.{format_intermediate} format={format_intermediate} extension=\".{format_intermediate}\" singles"
+            f"mapshaper {local_dir}/COMMUNE.{extension_initial} name='COMMUNE' "
+            f"-proj EPSG:{crs} "
+            f"-filter '\"69123,13055,75056\".indexOf(INSEE_COM) > -1' invert "
+            f"-each \"INSEE_COG=INSEE_COM\" "
+            f"-o {output_path}/communes_simples.{format_intermediate} "
+            f"format={format_intermediate} extension=\".{format_intermediate}\" singles"
         ),
         shell=True
     )
 
     # PREPROCESS ARRONDISSEMENT
     subprocess.run(
         (
-        f"mapshaper {local_dir}/ARRONDISSEMENT_MUNICIPAL.{extension_initial} name='ARRONDISSEMENT_MUNICIPAL' "
-        f"-proj EPSG:{crs} "
-        f"-rename-fields INSEE_COG=INSEE_ARM "
-        f"-each 'STATUT=\"Arrondissement municipal\" ' "
-        f"-o {output_path}/arrondissements.{format_intermediate} format={format_intermediate} extension=\".{format_intermediate}\""
+            f"mapshaper {local_dir}/ARRONDISSEMENT_MUNICIPAL.{extension_initial} "
+            f"name='ARRONDISSEMENT_MUNICIPAL' "
+            f"-proj EPSG:{crs} "
+            f"-rename-fields INSEE_COG=INSEE_ARM "
+            f"-each 'STATUT=\"Arrondissement municipal\" ' "
+            f"-o {output_path}/arrondissements.{format_intermediate} "
+            f"format={format_intermediate} extension=\".{format_intermediate}\""
         ),
         shell=True
     )
 
     # MERGE CITIES AND ARRONDISSEMENT
     subprocess.run(
         (
-        f"mapshaper {output_path}/communes_simples.{format_intermediate} {output_path}/arrondissements.{format_intermediate} snap combine-files "
-        f"-proj EPSG:{crs} "
-        f"-rename-layers COMMUNE,ARRONDISSEMENT_MUNICIPAL "
-        f"-merge-layers target=COMMUNE,ARRONDISSEMENT_MUNICIPAL force "
-        f"-rename-layers COMMUNE_ARRONDISSEMENT "
-        f"-o {output_path}/raw.{format_intermediate} format={format_intermediate} extension=\".{format_intermediate}\""
+            f"mapshaper "
+            f"{output_path}/communes_simples.{format_intermediate} "
+            f"{output_path}/arrondissements.{format_intermediate} snap combine-files "
+            f"-proj EPSG:{crs} "
+            f"-rename-layers COMMUNE,ARRONDISSEMENT_MUNICIPAL "
+            f"-merge-layers target=COMMUNE,ARRONDISSEMENT_MUNICIPAL force "
+            f"-rename-layers COMMUNE_ARRONDISSEMENT "
+            f"-o {output_path}/raw.{format_intermediate} "
+            f"format={format_intermediate} extension=\".{format_intermediate}\""
         ),
         shell=True
     )

diff --git a/cartiflette/pipeline/mapshaper_split_from_s3.py b/cartiflette/pipeline/mapshaper_split_from_s3.py
@@ -6,6 +6,7 @@
 from cartiflette.mapshaper import mapshaperize_split, mapshaperize_split_merge
 from .prepare_mapshaper import prepare_local_directory_mapshaper
 
+
 def mapshaperize_split_from_s3(
     path_bucket,
     config,
@@ -29,7 +30,7 @@ def mapshaperize_split_from_s3(
     path_within_bucket = config.get("path_within_bucket", PATH_WITHIN_BUCKET)
     local_dir = config.get("local_dir", "temp")
 
-    local_directories = prepare_local_directory_mapshaper(
+    prepare_local_directory_mapshaper(
         path_bucket,
         borders=borders,
         niveau_agreg=filter_by,
@@ -73,7 +74,6 @@ def mapshaperize_split_from_s3(
                 })
         fs.put(f"{output_path}/{values}", path_s3)
 
-
     return output_path
 
 
@@ -85,7 +85,7 @@ def mapshaperize_merge_split_from_s3(
 
     format_output = config.get("format_output", "topojson")
     filter_by = config.get("filter_by", "DEPARTEMENT")
-    borders = config.get("borders", "COMMUNE")
+    # borders = config.get("borders", "COMMUNE")
     territory = config.get("territory", "metropole")
 
     provider = config.get("provider", "IGN")
@@ -100,7 +100,7 @@ def mapshaperize_merge_split_from_s3(
     path_within_bucket = config.get("path_within_bucket", PATH_WITHIN_BUCKET)
     local_dir = config.get("local_dir", "temp")
 
-    local_directory = prepare_local_directory_mapshaper(
+    prepare_local_directory_mapshaper(
             path_bucket,
             borders="COMMUNE",
             niveau_agreg=filter_by,
@@ -120,7 +120,6 @@ def mapshaperize_merge_split_from_s3(
             fs=fs
     )
 
-
     output_path = mapshaperize_split_merge(
         local_dir=local_dir,
         extension_initial="shp",
@@ -154,6 +153,4 @@ def mapshaperize_merge_split_from_s3(
                 })
         fs.put(f"{output_path}/{values}", path_s3)
 
-
     return output_path
-
diff --git a/cartiflette/pipeline/prepare_cog_metadata.py b/cartiflette/pipeline/prepare_cog_metadata.py
@@ -6,7 +6,6 @@
 from cartiflette.s3 import upload_s3_raw
 
 
-
 def prepare_cog_metadata(
     path_within_bucket: str,
     local_dir: str = "temp",