include mixed EPCI in each region

MTES-MCT · Aug 1, 2024 · 079f89b · 079f89b
1 parent e106cc3
commit 079f89b
Show file tree

Hide file tree

Showing 40 changed files with 51 additions and 54 deletions.
diff --git a/src/metabase/maps/region_01_com.geojson b/src/metabase/maps/region_01_com.geojson
diff --git a/src/metabase/maps/region_01_epci.geojson b/src/metabase/maps/region_01_epci.geojson
diff --git a/src/metabase/maps/region_02_com.geojson b/src/metabase/maps/region_02_com.geojson
diff --git a/src/metabase/maps/region_02_epci.geojson b/src/metabase/maps/region_02_epci.geojson
diff --git a/src/metabase/maps/region_03_com.geojson b/src/metabase/maps/region_03_com.geojson
diff --git a/src/metabase/maps/region_03_epci.geojson b/src/metabase/maps/region_03_epci.geojson
diff --git a/src/metabase/maps/region_04_com.geojson b/src/metabase/maps/region_04_com.geojson
diff --git a/src/metabase/maps/region_04_epci.geojson b/src/metabase/maps/region_04_epci.geojson
diff --git a/src/metabase/maps/region_06_com.geojson b/src/metabase/maps/region_06_com.geojson
diff --git a/src/metabase/maps/region_06_epci.geojson b/src/metabase/maps/region_06_epci.geojson
diff --git a/src/metabase/maps/region_11_com.geojson b/src/metabase/maps/region_11_com.geojson
diff --git a/src/metabase/maps/region_11_epci.geojson b/src/metabase/maps/region_11_epci.geojson
diff --git a/src/metabase/maps/region_24_com.geojson b/src/metabase/maps/region_24_com.geojson
diff --git a/src/metabase/maps/region_24_epci.geojson b/src/metabase/maps/region_24_epci.geojson
diff --git a/src/metabase/maps/region_27_com.geojson b/src/metabase/maps/region_27_com.geojson
diff --git a/src/metabase/maps/region_27_epci.geojson b/src/metabase/maps/region_27_epci.geojson
diff --git a/src/metabase/maps/region_28_com.geojson b/src/metabase/maps/region_28_com.geojson
diff --git a/src/metabase/maps/region_28_epci.geojson b/src/metabase/maps/region_28_epci.geojson
diff --git a/src/metabase/maps/region_32_com.geojson b/src/metabase/maps/region_32_com.geojson
diff --git a/src/metabase/maps/region_32_epci.geojson b/src/metabase/maps/region_32_epci.geojson
diff --git a/src/metabase/maps/region_44_com.geojson b/src/metabase/maps/region_44_com.geojson
diff --git a/src/metabase/maps/region_44_epci.geojson b/src/metabase/maps/region_44_epci.geojson
diff --git a/src/metabase/maps/region_52_com.geojson b/src/metabase/maps/region_52_com.geojson
diff --git a/src/metabase/maps/region_52_epci.geojson b/src/metabase/maps/region_52_epci.geojson
diff --git a/src/metabase/maps/region_53_com.geojson b/src/metabase/maps/region_53_com.geojson
diff --git a/src/metabase/maps/region_53_epci.geojson b/src/metabase/maps/region_53_epci.geojson
diff --git a/src/metabase/maps/region_75_com.geojson b/src/metabase/maps/region_75_com.geojson
diff --git a/src/metabase/maps/region_75_epci.geojson b/src/metabase/maps/region_75_epci.geojson
diff --git a/src/metabase/maps/region_76_com.geojson b/src/metabase/maps/region_76_com.geojson
diff --git a/src/metabase/maps/region_76_epci.geojson b/src/metabase/maps/region_76_epci.geojson
diff --git a/src/metabase/maps/region_84_com.geojson b/src/metabase/maps/region_84_com.geojson
diff --git a/src/metabase/maps/region_84_epci.geojson b/src/metabase/maps/region_84_epci.geojson
diff --git a/src/metabase/maps/region_93_com.geojson b/src/metabase/maps/region_93_com.geojson
diff --git a/src/metabase/maps/region_93_epci.geojson b/src/metabase/maps/region_93_epci.geojson
diff --git a/src/metabase/maps/region_94_com.geojson b/src/metabase/maps/region_94_com.geojson
diff --git a/src/metabase/maps/region_94_epci.geojson b/src/metabase/maps/region_94_epci.geojson
diff --git a/src/metabase/maps/region_984_com.geojson b/src/metabase/maps/region_984_com.geojson
diff --git a/src/metabase/maps/region_987_com.geojson b/src/metabase/maps/region_987_com.geojson
diff --git a/src/metabase/maps/region_988_com.geojson b/src/metabase/maps/region_988_com.geojson
diff --git a/src/notebook/misc/maps.md b/src/notebook/misc/maps.md
@@ -98,20 +98,25 @@ query_reg = """SELECT region.code AS reg_code, region.name, ST_AsGeoJSON(region.
            FROM region""" 
 query_dep = """SELECT department.code, department.name, ST_AsGeoJSON(department.geometry) :: json -> 'coordinates'  AS polygon, region.code AS reg_code
            FROM department INNER JOIN region ON department.region_id = region.id""" 
-query_ecpi = """SELECT DISTINCT ON (epci.code) epci.code, epci.name, ST_AsGeoJSON(epci.geometry) :: json -> 'coordinates'  AS polygon, region.code AS reg_code
+query_epci = """SELECT epci.code, epci.name, ST_AsGeoJSON(epci.geometry) :: json -> 'coordinates'  AS polygon, region.code AS reg_code
            FROM epci INNER JOIN city ON city.epci_id = epci.id INNER JOIN department ON city.department_id = department.id INNER JOIN region ON department.region_id = region.id""" 
-query_city = """SELECT DISTINCT ON (city.code) city.code, city.name, ST_AsGeoJSON(city.geometry) :: json -> 'coordinates'  AS polygon, region.code AS reg_code
+query_city = """SELECT city.code, city.name, ST_AsGeoJSON(city.geometry) :: json -> 'coordinates'  AS polygon, region.code AS reg_code
            FROM city INNER JOIN department ON city.department_id = department.id INNER JOIN region ON department.region_id = region.id""" 
 
 maps_dir = '../../metabase/maps/'
 ```
 
-### Métropole
-
 ```python
-# df[df['reg_code'].isin(reg_metro)]
+'''query_epci2 = """SELECT epci.code, epci.name, ST_AsGeoJSON(epci.geometry) :: json -> 'coordinates'  AS polygon, region.code AS reg_code
+           FROM epci INNER JOIN city ON city.epci_id = epci.id INNER JOIN department ON city.department_id = department.id INNER JOIN region ON department.region_id = region.id""" 
+with engine.connect() as conn:
+    df = pd.read_sql_query(query_epci2, conn)
+reg = '52'
+df[df["reg_code"] == reg].drop_duplicates("code")'''
 ```
 
+### Métropole
+
 ```python
 import json
 
@@ -128,7 +133,6 @@ for query, ext, reg in zip(queries_metro, extension, code_reg):
                                      'properties': {'code': row[1], 'nom': row[2]}, 
                                      'geometry': {'type': ('MultiPolygon' if str(row[3])[:4] == '[[[[' else 'Polygon'), 'coordinates': row[3]}} 
                                     for row in df[df['reg_code'].isin(reg_metro)].itertuples()]}
-    #                                for row in list(df.itertuples()) if row[reg] in reg_metro]}
     print(ext)
     file_metro = 'metropole' + ext +'.geojson'
     with open(maps_dir + file_metro, 'w', encoding ='utf8') as map_file:
@@ -139,19 +143,12 @@ for query, ext, reg in zip(queries_metro, extension, code_reg):
 
 ### Régions
 
-```python
-# df
-
-```
-
 ```python
 import pandas as pd
 
-queries_reg = [query_dep, query_ecpi, query_city]
+queries_reg = [query_dep, query_epci, query_city]
 extension = ['_dep', '_epci', '_com']
 
-with engine.connect() as conn:
-    df = pd.read_sql_query(query_dep, conn)
 for query, ext in zip(queries_reg, extension):
     with engine.connect() as conn:
         df = pd.read_sql_query(query, conn)
@@ -161,7 +158,7 @@ for query, ext in zip(queries_reg, extension):
                    'features': [{'type': 'Feature', 
                                  'properties': {'code': row[1], 'nom': row[2]}, 
                                  'geometry': {'type': ('MultiPolygon' if str(row[3])[:4] == '[[[[' else 'Polygon'), 'coordinates': row[3]}} 
-                                for row in df[df["reg_code"] == reg].itertuples()]}
+                                for row in df[df["reg_code"] == reg].drop_duplicates("code").itertuples()]}
         print(reg, ext)
         if len(map_geo['features']):
             with open(maps_dir + file_dep, 'w', encoding ='utf8') as map_file: