Merge branch 'master' into water_union

openmaptiles · Oct 14, 2020 · 083bada · 083bada
2 parents 4edb8f8 + 7216593
commit 083bada
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -90,7 +90,7 @@ services:
 
   postserve:
     image: "openmaptiles/openmaptiles-tools:${TOOLS_VERSION}"
-    command: "postserve ${TILESET_FILE} --verbose --serve=${OMT_HOST:-localhost}:${PPORT:-8090}"
+    command: "postserve ${TILESET_FILE} --verbose --serve=${OMT_HOST:-http://localhost}:${PPORT:-8090}"
     env_file: .env
     environment:
       TILESET_FILE: ${TILESET_FILE}

diff --git a/layers/place/update_island_polygon.sql b/layers/place/update_island_polygon.sql
@@ -15,7 +15,8 @@ $$
     UPDATE osm_island_polygon
     SET geometry = ST_PointOnSurface(geometry)
     WHERE (full_update OR osm_id IN (SELECT osm_id FROM place_island_polygon.osm_ids))
-      AND ST_GeometryType(geometry) <> 'ST_Point';
+      AND ST_GeometryType(geometry) <> 'ST_Point'
+      AND ST_IsValid(geometry);
 
     UPDATE osm_island_polygon
     SET tags = update_tags(tags, geometry)

diff --git a/layers/poi/update_poi_polygon.sql b/layers/poi/update_poi_polygon.sql
@@ -21,7 +21,8 @@ $$
                 ELSE ST_PointOnSurface(geometry)
                 END
     WHERE (full_update OR osm_id IN (SELECT osm_id FROM poi_polygon.osm_ids))
-      AND ST_GeometryType(geometry) <> 'ST_Point';
+      AND ST_GeometryType(geometry) <> 'ST_Point'
+      AND ST_IsValid(geometry);
 
     UPDATE osm_poi_polygon
     SET subclass = 'subway'

diff --git a/layers/water_name/update_water_point.sql b/layers/water_name/update_water_point.sql
@@ -14,7 +14,8 @@ SELECT wp.osm_id,
 FROM osm_water_polygon AS wp
          LEFT JOIN lake_centerline ll ON wp.osm_id = ll.osm_id
 WHERE ll.osm_id IS NULL
-  AND wp.name <> '';
+  AND wp.name <> ''
+  AND ST_IsValid(wp.geometry);
 
 -- etldoc:  osm_water_polygon ->  osm_water_point
 -- etldoc:  lake_centerline ->  osm_water_point

diff --git a/openmaptiles.yaml b/openmaptiles.yaml
@@ -62,11 +62,13 @@ tileset:
     - ja # Japanese
     - ja_kana # Japanese Kana form
     - ja_rm # romanization of Japanese, Latin
+    - ja-Latn # romanisation of Japanese, Latin since 2018
+    - ja-Hira # Japanese Hiragana form
     - ka # Georgian
     - kk # Kazakh
     - kn # Kannada
     - ko # Korean
-    - ko_rm # romanization of Korean, Latin
+    - ko-Latn # romanization of Korean, Latin
     - ku # Kurdish, Latin
     - la # Latin, Latin
     - lb # Luxembourgish, Latin