Update id column for layers

OpenHistoricalMap · Dec 3, 2024 · de2561d · de2561d
1 parent dc78768
commit de2561d
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 42 deletions.
diff --git a/images/tiler-server/config/providers/admin_boundaries_centroids.toml b/images/tiler-server/config/providers/admin_boundaries_centroids.toml
@@ -2,12 +2,11 @@
 name = "admin_boundaries_centroid_z0_2"
 geometry_fieldname = "geometry"
 geometry_type = "point"
-id_fieldname = "id"
+id_fieldname = "osm_id"
 sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry,  
-    id, 
-    osm_id, 
+    ABS(osm_id) AS osm_id, 
     admin_level, 
     name, 
     type, 
@@ -26,12 +25,11 @@ WHERE
 name = "admin_boundaries_centroid_z3_5"
 geometry_fieldname = "geometry"
 geometry_type = "point"
-id_fieldname = "id"
+id_fieldname = "osm_id"
 sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
-    id, 
-    osm_id, 
+    ABS(osm_id) AS osm_id, 
     admin_level, 
     name, 
     type, 
@@ -50,12 +48,11 @@ WHERE
 name = "admin_boundaries_centroid_z6_7"
 geometry_fieldname = "geometry"
 geometry_type = "point"
-id_fieldname = "id"
+id_fieldname = "osm_id"
 sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
-    id, 
-    osm_id, 
+    ABS(osm_id) AS osm_id, 
     admin_level, 
     name, 
     type, 
@@ -78,12 +75,11 @@ WHERE
 name = "admin_boundaries_centroid_z8_9"
 geometry_fieldname = "geometry"
 geometry_type = "point"
-id_fieldname = "id"
+id_fieldname = "osm_id"
 sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
-    id, 
-    osm_id, 
+    ABS(osm_id) AS osm_id, 
     admin_level, 
     name, 
     type, 
@@ -102,12 +98,11 @@ WHERE
 name = "admin_boundaries_centroid_z10_12"
 geometry_fieldname = "geometry"
 geometry_type = "point"
-id_fieldname = "id"
+id_fieldname = "osm_id"
 sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
-    id, 
-    osm_id, 
+    ABS(osm_id) AS osm_id, 
     admin_level, 
     name, 
     type, 
@@ -127,12 +122,11 @@ WHERE
 name = "admin_boundaries_centroid_z13_15"
 geometry_fieldname = "geometry"
 geometry_type = "point"
-id_fieldname = "id"
+id_fieldname = "osm_id"
 sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
-    id, 
-    osm_id, 
+    ABS(osm_id) AS osm_id, 
     admin_level, 
     name, 
     type, 
@@ -151,12 +145,11 @@ WHERE
 name = "admin_boundaries_centroid_z16_20"
 geometry_fieldname = "geometry"
 geometry_type = "point"
-id_fieldname = "id"
+id_fieldname = "osm_id"
 sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
-    id, 
-    osm_id, 
+    ABS(osm_id) AS osm_id, 
     admin_level, 
     name, 
     type, 

diff --git a/images/tiler-server/config/providers/admin_boundaries_lines.toml b/images/tiler-server/config/providers/admin_boundaries_lines.toml
@@ -2,12 +2,11 @@
 name = "admin_boundaries_lines_z0_2"
 geometry_fieldname = "geometry"
 geometry_type = "linestring"
-id_fieldname = "id"
+id_fieldname = "osm_id"
 sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
-    id, 
-    osm_id, 
+    ABS(osm_id) AS osm_id, 
     admin_level, 
     name, 
     type, 
@@ -26,12 +25,11 @@ WHERE
 name = "admin_boundaries_lines_z3_5"
 geometry_fieldname = "geometry"
 geometry_type = "linestring"
-id_fieldname = "id"
+id_fieldname = "osm_id"
 sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
-    id, 
-    osm_id, 
+    ABS(osm_id) AS osm_id, 
     admin_level, 
     name, 
     type, 
@@ -51,12 +49,11 @@ WHERE
 name = "admin_boundaries_lines_z6_7"
 geometry_fieldname = "geometry"
 geometry_type = "linestring"
-id_fieldname = "id"
+id_fieldname = "osm_id"
 sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
-    id, 
-    osm_id, 
+    ABS(osm_id) AS osm_id, 
     admin_level, 
     name, 
     type, 
@@ -75,12 +72,11 @@ WHERE
 name = "admin_boundaries_lines_z8_9"
 geometry_fieldname = "geometry"
 geometry_type = "linestring"
-id_fieldname = "id"
+id_fieldname = "osm_id"
 sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
-    id, 
-    osm_id, 
+    ABS(osm_id) AS osm_id, 
     admin_level, 
     name, 
     type, 
@@ -99,12 +95,11 @@ WHERE
 name = "admin_boundaries_lines_z10_12"
 geometry_fieldname = "geometry"
 geometry_type = "linestring"
-id_fieldname = "id"
+id_fieldname = "osm_id"
 sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
-    id, 
-    osm_id, 
+    ABS(osm_id) AS osm_id, 
     admin_level, 
     name, 
     type, 
@@ -123,12 +118,11 @@ WHERE
 name = "admin_boundaries_lines_z13_15"
 geometry_fieldname = "geometry"
 geometry_type = "linestring"
-id_fieldname = "id"
+id_fieldname = "osm_id"
 sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
-    id, 
-    osm_id, 
+    ABS(osm_id) AS osm_id, 
     admin_level, 
     name, 
     type, 
@@ -147,12 +141,11 @@ WHERE
 name = "admin_boundaries_lines_z16_20"
 geometry_fieldname = "geometry"
 geometry_type = "linestring"
-id_fieldname = "id"
+id_fieldname = "osm_id"
 sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
-    id, 
-    osm_id, 
+    ABS(osm_id) AS osm_id, 
     admin_level, 
     name, 
     type,