Fix tegola layers config columns

OpenHistoricalMap · Dec 20, 2024 · 7113461 · 7113461
1 parent 6a82e5e
commit 7113461
Show file tree

Hide file tree

Showing 8 changed files with 162 additions and 163 deletions.
diff --git a/images/tiler-server/config/providers/admin_boundaries_centroids.toml b/images/tiler-server/config/providers/admin_boundaries_centroids.toml
@@ -7,11 +7,11 @@ sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry,  
     ABS(osm_id) AS osm_id, 
-    admin_level, 
-    name, 
-    type, 
-    start_date, 
-    end_date, 
+    NULLIF(admin_level, '') AS admin_level, 
+    NULLIF(name, '') AS name, 
+    NULLIF(type, '') AS type, 
+    NULLIF(start_date, '') AS start_date, 
+    NULLIF(end_date, '') AS end_date, 
     isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, 
     isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate,
     {{LENGUAGES}} 
@@ -31,11 +31,11 @@ sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
     ABS(osm_id) AS osm_id, 
-    admin_level, 
-    name, 
-    type, 
-    start_date, 
-    end_date, 
+    NULLIF(admin_level, '') AS admin_level, 
+    NULLIF(name, '') AS name, 
+    NULLIF(type, '') AS type, 
+    NULLIF(start_date, '') AS start_date, 
+    NULLIF(end_date, '') AS end_date, 
     isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, 
     isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate,
     {{LENGUAGES}} 
@@ -55,11 +55,11 @@ sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
     ABS(osm_id) AS osm_id, 
-    admin_level, 
-    name, 
-    type, 
-    start_date, 
-    end_date, 
+    NULLIF(admin_level, '') AS admin_level, 
+    NULLIF(name, '') AS name, 
+    NULLIF(type, '') AS type, 
+    NULLIF(start_date, '') AS start_date, 
+    NULLIF(end_date, '') AS end_date, 
     isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, 
     isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate,
     {{LENGUAGES}} 
@@ -79,11 +79,11 @@ sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
     ABS(osm_id) AS osm_id, 
-    admin_level, 
-    name, 
-    type, 
-    start_date, 
-    end_date, 
+    NULLIF(admin_level, '') AS admin_level, 
+    NULLIF(name, '') AS name, 
+    NULLIF(type, '') AS type, 
+    NULLIF(start_date, '') AS start_date, 
+    NULLIF(end_date, '') AS end_date, 
     isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, 
     isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate,
     {{LENGUAGES}} 
@@ -103,11 +103,11 @@ sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
     ABS(osm_id) AS osm_id, 
-    admin_level, 
-    name, 
-    type, 
-    start_date, 
-    end_date, 
+    NULLIF(admin_level, '') AS admin_level, 
+    NULLIF(name, '') AS name, 
+    NULLIF(type, '') AS type, 
+    NULLIF(start_date, '') AS start_date, 
+    NULLIF(end_date, '') AS end_date, 
     isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, 
     isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate,
     {{LENGUAGES}} 
@@ -118,7 +118,6 @@ WHERE
     AND geometry && !BBOX!
 """
 
-
 [[providers.layers]]
 name = "admin_boundaries_centroid_z13_15"
 geometry_fieldname = "geometry"
@@ -128,11 +127,11 @@ sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
     ABS(osm_id) AS osm_id, 
-    admin_level, 
-    name, 
-    type, 
-    start_date, 
-    end_date, 
+    NULLIF(admin_level, '') AS admin_level, 
+    NULLIF(name, '') AS name, 
+    NULLIF(type, '') AS type, 
+    NULLIF(start_date, '') AS start_date, 
+    NULLIF(end_date, '') AS end_date, 
     isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, 
     isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate,
     {{LENGUAGES}} 
@@ -152,11 +151,11 @@ sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
     ABS(osm_id) AS osm_id, 
-    admin_level, 
-    name, 
-    type, 
-    start_date, 
-    end_date, 
+    NULLIF(admin_level, '') AS admin_level, 
+    NULLIF(name, '') AS name, 
+    NULLIF(type, '') AS type, 
+    NULLIF(start_date, '') AS start_date, 
+    NULLIF(end_date, '') AS end_date, 
     isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, 
     isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate,
     {{LENGUAGES}} 
@@ -165,4 +164,4 @@ FROM
 WHERE 
     has_label = 0 
     AND geometry && !BBOX!
-"""
+"""
diff --git a/images/tiler-server/config/providers/admin_boundaries_lines.toml b/images/tiler-server/config/providers/admin_boundaries_lines.toml
@@ -7,11 +7,11 @@ sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
     ABS(osm_id) AS osm_id, 
-    admin_level, 
-    name, 
-    type, 
-    start_date, 
-    end_date, 
+    NULLIF(admin_level, '') AS admin_level, 
+    NULLIF(name, '') AS name, 
+    NULLIF(type, '') AS type, 
+    NULLIF(start_date, '') AS start_date, 
+    NULLIF(end_date, '') AS end_date, 
     isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, 
     isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate,
     {{LENGUAGES}}
@@ -30,11 +30,11 @@ sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
     ABS(osm_id) AS osm_id, 
-    admin_level, 
-    name, 
-    type, 
-    start_date, 
-    end_date, 
+    NULLIF(admin_level, '') AS admin_level, 
+    NULLIF(name, '') AS name, 
+    NULLIF(type, '') AS type, 
+    NULLIF(start_date, '') AS start_date, 
+    NULLIF(end_date, '') AS end_date, 
     isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, 
     isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate,
     {{LENGUAGES}}
@@ -54,11 +54,11 @@ sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
     ABS(osm_id) AS osm_id, 
-    admin_level, 
-    name, 
-    type, 
-    start_date, 
-    end_date, 
+    NULLIF(admin_level, '') AS admin_level, 
+    NULLIF(name, '') AS name, 
+    NULLIF(type, '') AS type, 
+    NULLIF(start_date, '') AS start_date, 
+    NULLIF(end_date, '') AS end_date, 
     isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, 
     isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate,
     {{LENGUAGES}}
@@ -77,11 +77,11 @@ sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
     ABS(osm_id) AS osm_id, 
-    admin_level, 
-    name, 
-    type, 
-    start_date, 
-    end_date, 
+    NULLIF(admin_level, '') AS admin_level, 
+    NULLIF(name, '') AS name, 
+    NULLIF(type, '') AS type, 
+    NULLIF(start_date, '') AS start_date, 
+    NULLIF(end_date, '') AS end_date, 
     isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, 
     isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate,
     {{LENGUAGES}}
@@ -100,11 +100,11 @@ sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
     ABS(osm_id) AS osm_id, 
-    admin_level, 
-    name, 
-    type, 
-    start_date, 
-    end_date, 
+    NULLIF(admin_level, '') AS admin_level, 
+    NULLIF(name, '') AS name, 
+    NULLIF(type, '') AS type, 
+    NULLIF(start_date, '') AS start_date, 
+    NULLIF(end_date, '') AS end_date, 
     isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, 
     isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate,
     {{LENGUAGES}}
@@ -123,11 +123,11 @@ sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
     ABS(osm_id) AS osm_id, 
-    admin_level, 
-    name, 
-    type, 
-    start_date, 
-    end_date, 
+    NULLIF(admin_level, '') AS admin_level, 
+    NULLIF(name, '') AS name, 
+    NULLIF(type, '') AS type, 
+    NULLIF(start_date, '') AS start_date, 
+    NULLIF(end_date, '') AS end_date, 
     isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, 
     isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate,
     {{LENGUAGES}}
@@ -146,11 +146,11 @@ sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
     ABS(osm_id) AS osm_id, 
-    admin_level, 
-    name, 
-    type, 
-    start_date, 
-    end_date, 
+    NULLIF(admin_level, '') AS admin_level, 
+    NULLIF(name, '') AS name, 
+    NULLIF(type, '') AS type, 
+    NULLIF(start_date, '') AS start_date, 
+    NULLIF(end_date, '') AS end_date, 
     isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, 
     isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate,
     {{LENGUAGES}}

diff --git a/images/tiler-server/config/providers/admin_boundaries_maritime.toml b/images/tiler-server/config/providers/admin_boundaries_maritime.toml
@@ -35,8 +35,8 @@ SELECT
     name, 
     type, 
     maritime, 
-    start_date, 
-    end_date, 
+    NULLIF(start_date, '') AS start_date, 
+    NULLIF(end_date, '') AS end_date, 
     isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, 
     isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate,
     {{LENGUAGES}}
@@ -59,8 +59,8 @@ SELECT
     name, 
     type, 
     maritime, 
-    start_date, 
-    end_date, 
+    NULLIF(start_date, '') AS start_date, 
+    NULLIF(end_date, '') AS end_date, 
     isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, 
     isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate,
     {{LENGUAGES}}

diff --git a/images/tiler-server/config/providers/route_lines.toml b/images/tiler-server/config/providers/route_lines.toml
@@ -21,8 +21,8 @@ SELECT
     interval,
     duration,
     tourism,
-    start_date,
-    end_date,
+    NULLIF(start_date, '') AS start_date, 
+    NULLIF(end_date, '') AS end_date, 
     isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, 
     isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate,
     {{LENGUAGES}}