[AMP] fix flow d'import des amp depuis l'OFB (#1392)

fix un problème de conversion + renommage des flows plus explicite
MTES-MCT · May 23, 2024 · 57514fb · 57514fb
2 parents 0aab234 + fe1aa8b
commit 57514fb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/datascience/src/pipeline/flows/amp_cacem.py b/datascience/src/pipeline/flows/amp_cacem.py
@@ -127,7 +127,7 @@ def load_new_amp(new_amp: pd.DataFrame):
     )
 
 
-with Flow("amp") as flow:
+with Flow("import amp cacem") as flow:
 
     local_hashes = extract_local_hashes()
     remote_hashes = extract_remote_hashes()

diff --git a/datascience/src/pipeline/flows/amp_ofb.py b/datascience/src/pipeline/flows/amp_ofb.py
@@ -161,6 +161,12 @@ def load_amp_areas(amp_areas: gpd.GeoDataFrame):
             df = amp_areas,
             logger = logger,
             nullable_integer_columns = [
+                "gid",
+                "mpa_id",
+                "mpa_pid",
+                "des_id",
+                "mpa_statusyr",
+                "mpa_wdpaid",
                 "mpa_marine"
             ]
         )
@@ -251,7 +257,7 @@ def load_amp_areas(amp_areas: gpd.GeoDataFrame):
         )
 
 
-with Flow("AMP areas") as flow:
+with Flow("update amp from ofb") as flow:
     amp_areas = extract_amp_areas(url=AMP_AREAS_URL, proxies=PROXIES)
     amp_areas = transform_amp_areas(amp_areas)
     load_amp_areas(amp_areas)

diff --git a/datascience/tests/test_pipeline/test_flows/test_amp_ofb.py b/datascience/tests/test_pipeline/test_flows/test_amp_ofb.py
@@ -11,10 +11,10 @@
 def amp_areas_from_ofb() -> gpd.GeoDataFrame:
     return gpd.GeoDataFrame(
         {
-            "mpa_id": [ 3, 4, 7, 92, 735],
-            "mpa_pid": [1, 2, 3, 4, 7],
-            "gid": [1, 2, 3, 4, 7],
-            "des_id": [1, 2, 3, 4, 7],
+            "mpa_id": [ 3.0, 4, 7, 92, 735],
+            "mpa_pid": [1.0, 2, 3, 4, 7],
+            "gid": [1.0, 2, 3, 4, 7],
+            "des_id": [1.0, 2, 3, 4, 7],
             "mpa_status": ["designated", "designated", "proposed", "proposed", "proposed"],
             "mpa_name": [
                 "AMP 1 updated",
@@ -51,11 +51,11 @@ def amp_areas_from_ofb() -> gpd.GeoDataFrame:
                 "2003-01-01",
                 "2004-01-01",
             ],
-            "mpa_statusyr": [2024, 2001, 2002, 2003, 2004],
-            "mpa_wdpaid": [106767, 555526886, 555526887, 555526888, 555526889],
+            "mpa_statusyr": [2024.0, 2001, 2002, 2003, 2004],
+            "mpa_wdpaid": [106767.0, 555526886, 555526887, 555526888, 555526889],
             "mpa_wdpapid": ["WDPA 1", "WDPA 2", "WDPA 3", "WDPA 4", "WDPA 5"],
             "mpa_mnhnid": ["FR3600138", "FR1100014", None, "FR11014", "FR11330014"],
-            "mpa_marine": [1, 0, 1, None, 1],
+            "mpa_marine": [1.0, 0, 1, None, 1],
             "mpa_url": ["URL 1", "URL 2", "URL 3", "URL 4", None],
             "mpa_calcarea": [100.1, 200, 300, 400, 500],
             "mpa_calcmarea": [100.1, 200, 300, 400, 500],