Merge branch 'master' into power_facilities

.env

@@ -4,7 +4,7 @@
 TILESET_FILE=openmaptiles.yaml
 
 # Use 3-part patch version to ignore patch updates, e.g. 5.0.0
-TOOLS_VERSION=5.3
+TOOLS_VERSION=6.0
 
 # Make sure these values are in sync with the ones in .env-postgres file
 PGDATABASE=openmaptiles

Makefile

@@ -287,6 +287,7 @@ destroy-db:
 	$(DOCKER_COMPOSE) rm -fv
 	docker volume ls -q -f "name=^$(DC_PROJECT)_" | $(XARGS) docker volume rm
 	rm -rf cache
+	mkdir cache
 
 .PHONY: start-db-nowait
 start-db-nowait: init-dirs

README.md

@@ -114,11 +114,10 @@ make download area=albania
 ```
 
 [Import OpenStreetMap data](https://github.com/openmaptiles/openmaptiles-tools/tree/master/docker/import-osm) with the mapping rules from
-`build/mapping.yaml` (which has been created by `make`). Run after any change in layers definition.  Also create borders table using extra processing with [osmborder](https://github.com/pnorman/osmborder) tool.
+`build/mapping.yaml` (which has been created by `make`). Run after any change in layers definition.
 
 ```bash
 make import-osm
-make import-borders
 ```
 
 Import labels from Wikidata. If an OSM feature has [Key:wikidata](https://wiki.openstreetmap.org/wiki/Key:wikidata), OpenMapTiles check corresponding item in Wikidata and use its [labels](https://www.wikidata.org/wiki/Help:Label) for languages listed in [openmaptiles.yaml](openmaptiles.yaml). So the generated vector tiles includes multi-languages in name field.
@@ -162,7 +161,6 @@ make start-db               # start up the database container.
 make import-data            # Import external data from OpenStreetMapData, Natural Earth and OpenStreetMap Lake Labels.
 make download area=albania  # download albania .osm.pbf file -- can be skipped if a .osm.pbf file already existing
 make import-osm             # import data into postgres
-make import-borders         # create borders table
 make import-wikidata        # import Wikidata
 make import-sql             # create / import sql funtions 
 make generate-bbox-file     # compute data bbox -- not needed for the whole planet

layers/transportation/transportation.sql

@@ -340,7 +340,7 @@ FROM (
                 public_transport,
                 service_value(service) AS service,
                 CASE WHEN access IN ('private', 'no') THEN 'no' END AS access,
-                CASE WHEN toll='yes' THEN true ELSE NULL::boolean END AS toll,
+                toll,
                 is_bridge,
                 is_tunnel,
                 is_ford,

layers/transportation/update_route_member.sql

@@ -60,15 +60,16 @@ BEGIN
              JOIN transportation_name.network_changes AS c ON
         r.osm_id = c.osm_id;
 
-    INSERT INTO osm_route_member (id, network_type, concurrency_index)
+    INSERT INTO osm_route_member (id, osm_id, network_type, concurrency_index)
     SELECT
       id,
+      osm_id,
       osm_route_member_network_type(network) AS network_type,
       DENSE_RANK() over (PARTITION BY member ORDER BY network_type, network, LENGTH(ref), ref) AS concurrency_index
     FROM osm_route_member rm
     WHERE rm.member IN
       (SELECT DISTINCT osm_id FROM transportation_name.network_changes)
-    ON CONFLICT (id) DO UPDATE SET concurrency_index = EXCLUDED.concurrency_index;
+    ON CONFLICT (id, osm_id) DO UPDATE SET concurrency_index = EXCLUDED.concurrency_index;
 
 END;
 $$ LANGUAGE plpgsql;
@@ -86,12 +87,13 @@ CREATE INDEX IF NOT EXISTS osm_highway_linestring_gen_z11_osm_id_idx ON osm_high
 ALTER TABLE osm_route_member ADD COLUMN IF NOT EXISTS concurrency_index int;
 
 -- One-time load of concurrency indexes; updates occur via trigger
-INSERT INTO osm_route_member (id, concurrency_index)
+INSERT INTO osm_route_member (id, osm_id, concurrency_index)
   SELECT
     id,
+    osm_id,
     DENSE_RANK() over (PARTITION BY member ORDER BY network_type, network, LENGTH(ref), ref) AS concurrency_index
   FROM osm_route_member
-  ON CONFLICT (id) DO UPDATE SET concurrency_index = EXCLUDED.concurrency_index;
+  ON CONFLICT (id, osm_id) DO UPDATE SET concurrency_index = EXCLUDED.concurrency_index;
 
 UPDATE osm_highway_linestring hl
   SET network = rm.network_type

layers/transportation/update_transportation_merge.sql

@@ -32,9 +32,7 @@ SELECT (ST_Dump(ST_LineMerge(ST_Collect(geometry)))).geom AS geometry,
        CASE
            WHEN access IN ('private', 'no') THEN 'no'
            ELSE NULL::text END AS access,
-       CASE
-           WHEN toll = 'yes' THEN true
-           ELSE false END AS toll,
+       toll,
        layer
 FROM osm_highway_linestring_gen_z11
 -- mapping.yaml pre-filter: motorway/trunk/primary/secondary/tertiary, with _link variants, construction, ST_IsValid()