Merge pull request #445 from OpenHistoricalMap/fix/tiler_server

Fix smalint bug in tiler
OpenHistoricalMap · Dec 21, 2024 · f270661 · f270661
2 parents ac8ed93 + 21c350d
commit f270661
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 43 deletions.
diff --git a/.github/workflows/chartpress.yaml b/.github/workflows/chartpress.yaml
@@ -5,7 +5,7 @@ on:
       - 'main'
       - 'staging'
       - 'development'
-      - 'refactor/imposm'
+      - 'fix/tiler_server'
 jobs:
   build:
     runs-on: ubuntu-20.04

diff --git a/images/tiler-cache/Dockerfile b/images/tiler-cache/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.1964.h8703c77
+FROM ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.1967.h8492956
 
 RUN apk update && apk add --no-cache \
     proj \

diff --git a/images/tiler-server/config/providers/transport_lines.toml b/images/tiler-server/config/providers/transport_lines.toml
@@ -7,15 +7,15 @@ sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
     ABS(osm_id) AS osm_id, 
-    NULLIF(type, '') AS type, 
-    NULLIF(tunnel, '') AS tunnel, 
-    NULLIF(bridge, '') AS bridge, 
-    NULLIF(ref, '') AS ref,
-    NULLIF(service, '') AS service,
-    NULLIF(name, '') AS name,
-    NULLIF(electrified, '') AS electrified, 
-    NULLIF(highspeed, '') AS highspeed, 
-    NULLIF(usage, '') AS usage, 
+    type, 
+    tunnel, 
+    bridge, 
+    ref,
+    service,
+    name,
+    electrified, 
+    highspeed, 
+    usage, 
     NULLIF(start_date, '') AS start_date, 
     NULLIF(end_date, '') AS end_date, 
     isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, 
@@ -36,14 +36,16 @@ sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
     ABS(osm_id) AS osm_id,
-    NULLIF(ref, '') AS ref, 
-    NULLIF(class, '') AS class, 
-    NULLIF(type, '') AS type, 
-    NULLIF(service, '') AS service,
-    NULLIF(name, '') AS name,
-    NULLIF(electrified, '') AS electrified, 
-    NULLIF(highspeed, '') AS highspeed, 
-    NULLIF(usage, '') AS usage, 
+    ref, 
+    class, 
+    type, 
+    tunnel, 
+    bridge, 
+    service,
+    name,
+    electrified, 
+    highspeed, 
+    usage, 
     NULLIF(start_date, '') AS start_date, 
     NULLIF(end_date, '') AS end_date, 
     isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, 
@@ -64,14 +66,16 @@ sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
     ABS(osm_id) AS osm_id, 
-    NULLIF(ref, '') AS ref, 
-    NULLIF(class, '') AS class, 
-    NULLIF(type, '') AS type, 
-    NULLIF(service, '') AS service, 
-    NULLIF(name, '') AS name,
-    NULLIF(electrified, '') AS electrified, 
-    NULLIF(highspeed, '') AS highspeed, 
-    NULLIF(usage, '') AS usage, 
+    ref, 
+    class, 
+    type, 
+    tunnel, 
+    bridge, 
+    service, 
+    name,
+    electrified, 
+    highspeed, 
+    usage, 
     NULLIF(start_date, '') AS start_date, 
     NULLIF(end_date, '') AS end_date, 
     isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, 
@@ -92,14 +96,16 @@ sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
     ABS(osm_id) AS osm_id, 
-    NULLIF(ref, '') AS ref, 
-    NULLIF(class, '') AS class, 
-    NULLIF(type, '') AS type, 
-    NULLIF(service, '') AS service, 
-    NULLIF(name, '') AS name,
-    NULLIF(electrified, '') AS electrified, 
-    NULLIF(highspeed, '') AS highspeed, 
-    NULLIF(usage, '') AS usage, 
+    ref, 
+    class, 
+    tunnel, 
+    bridge, 
+    type, 
+    service, 
+    name,
+    electrified, 
+    highspeed, 
+    usage, 
     NULLIF(start_date, '') AS start_date, 
     NULLIF(end_date, '') AS end_date, 
     isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, 
@@ -120,14 +126,16 @@ sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
     ABS(osm_id) AS osm_id,  
-    NULLIF(ref, '') AS ref, 
-    NULLIF(class, '') AS class, 
-    NULLIF(type, '') AS type, 
-    NULLIF(service, '') AS service, 
-    NULLIF(name, '') AS name,
-    NULLIF(electrified, '') AS electrified, 
-    NULLIF(highspeed, '') AS highspeed, 
-    NULLIF(usage, '') AS usage, 
+    ref, 
+    class, 
+    type, 
+    tunnel, 
+    bridge, 
+    service, 
+    name,
+    electrified, 
+    highspeed, 
+    usage, 
     NULLIF(start_date, '') AS start_date, 
     NULLIF(end_date, '') AS end_date, 
     isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate,