kopia lustrzana https://github.com/openmaptiles/openmaptiles
Porównaj commity
8 Commity
1c8948e85d
...
f0a3d07468
Autor | SHA1 | Data |
---|---|---|
zstadler | f0a3d07468 | |
Tomas Pohanka | eae7d7e1ed | |
Tomas Pohanka | 382b12ae8a | |
Tomas Pohanka | 59692656bd | |
Tomas Pohanka | ee19519905 | |
Tomas Pohanka | 8266197149 | |
Tomas Pohanka | 5bf2ca106f | |
zstadler | 29b0416488 |
2
Makefile
2
Makefile
|
@ -289,7 +289,7 @@ ifeq (,$(wildcard build/sql/run_last.sql))
|
||||||
$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools bash -c \
|
$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools bash -c \
|
||||||
'generate-sql $(TILESET_FILE) --dir ./build/sql \
|
'generate-sql $(TILESET_FILE) --dir ./build/sql \
|
||||||
&& generate-sqltomvt $(TILESET_FILE) \
|
&& generate-sqltomvt $(TILESET_FILE) \
|
||||||
--key --gzip --postgis-ver 3.2.3 \
|
--key --gzip --postgis-ver 3.3.4 \
|
||||||
--function --fname=getmvt >> ./build/sql/run_last.sql'
|
--function --fname=getmvt >> ./build/sql/run_last.sql'
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -58,3 +58,4 @@ tables:
|
||||||
- ridge
|
- ridge
|
||||||
- cliff
|
- cliff
|
||||||
- arete
|
- arete
|
||||||
|
- valley
|
||||||
|
|
Plik binarny nie jest wyświetlany.
Przed Szerokość: | Wysokość: | Rozmiar: 14 KiB Po Szerokość: | Wysokość: | Rozmiar: 17 KiB |
|
@ -10,7 +10,7 @@ layer:
|
||||||
fields:
|
fields:
|
||||||
name: The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the peak. Language-specific values are in `name:xx`.
|
name: The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the peak. Language-specific values are in `name:xx`.
|
||||||
name_en: English name `name:en` if available, otherwise `name`. This is deprecated and will be removed in a future release in favor of `name:en`.
|
name_en: English name `name:en` if available, otherwise `name`. This is deprecated and will be removed in a future release in favor of `name:en`.
|
||||||
name_de: German name `name:de` if available, otherwise `name` or `name:en`.
|
name_de: German name `name:de` if available, otherwise `name` or `name:en`. This is deprecated and will be removed in a future release in favor of `name:de`.
|
||||||
class:
|
class:
|
||||||
description: |
|
description: |
|
||||||
Use the **class** to differentiate between natural objects.
|
Use the **class** to differentiate between natural objects.
|
||||||
|
@ -21,6 +21,7 @@ layer:
|
||||||
- ridge
|
- ridge
|
||||||
- cliff
|
- cliff
|
||||||
- arete
|
- arete
|
||||||
|
- valley
|
||||||
ele: Elevation (`ele`) in meters.
|
ele: Elevation (`ele`) in meters.
|
||||||
ele_ft: Elevation (`ele`) in feet.
|
ele_ft: Elevation (`ele`) in feet.
|
||||||
customary_ft:
|
customary_ft:
|
||||||
|
|
Plik binarny nie jest wyświetlany.
Przed Szerokość: | Wysokość: | Rozmiar: 772 KiB Po Szerokość: | Wysokość: | Rozmiar: 865 KiB |
|
@ -48,10 +48,6 @@ WHERE length(ref) > 1
|
||||||
CREATE OR REPLACE FUNCTION osm_route_member_network_type(network text, ref text) RETURNS route_network_type AS
|
CREATE OR REPLACE FUNCTION osm_route_member_network_type(network text, ref text) RETURNS route_network_type AS
|
||||||
$$
|
$$
|
||||||
SELECT CASE
|
SELECT CASE
|
||||||
-- https://wiki.openstreetmap.org/wiki/WikiProject_Europe/E-road_network
|
|
||||||
WHEN network = 'e-road' THEN 'e-road'::route_network_type
|
|
||||||
-- https://wiki.openstreetmap.org/wiki/Asia/Asian_Highway_Network
|
|
||||||
WHEN network = 'AsianHighway' THEN 'a-road'::route_network_type
|
|
||||||
-- https://wiki.openstreetmap.org/wiki/United_States_roads_tagging
|
-- https://wiki.openstreetmap.org/wiki/United_States_roads_tagging
|
||||||
WHEN network = 'US:I' THEN 'us-interstate'::route_network_type
|
WHEN network = 'US:I' THEN 'us-interstate'::route_network_type
|
||||||
WHEN network = 'US:US' THEN 'us-highway'::route_network_type
|
WHEN network = 'US:US' THEN 'us-highway'::route_network_type
|
||||||
|
@ -110,35 +106,6 @@ BEGIN
|
||||||
USING transportation_name.network_changes c
|
USING transportation_name.network_changes c
|
||||||
WHERE c.is_old IS TRUE AND transportation_route_member_coalesced.member = c.osm_id;
|
WHERE c.is_old IS TRUE AND transportation_route_member_coalesced.member = c.osm_id;
|
||||||
|
|
||||||
-- Create GBR/IRE relations (so we can use it in the same way as other relations)
|
|
||||||
-- etldoc: gbr_route_members_view -> transportation_route_member_coalesced
|
|
||||||
INSERT INTO transportation_route_member_coalesced (member, network, ref, network_type, concurrency_index, osm_id)
|
|
||||||
SELECT member, network, coalesce(ref, '') AS ref,
|
|
||||||
osm_route_member_network_type(network, coalesce(ref, '')) AS network_type,
|
|
||||||
1 AS concurrency_index, 0 AS osm_id
|
|
||||||
FROM gbr_route_members_view
|
|
||||||
WHERE full_update OR EXISTS(
|
|
||||||
SELECT NULL
|
|
||||||
FROM transportation_name.network_changes c
|
|
||||||
WHERE c.is_old IS FALSE AND c.osm_id = gbr_route_members_view.member
|
|
||||||
)
|
|
||||||
GROUP BY member, network, coalesce(ref, '')
|
|
||||||
ON CONFLICT (member, network, ref) DO NOTHING;
|
|
||||||
|
|
||||||
-- etldoc: ire_route_members_view -> transportation_route_member_coalesced
|
|
||||||
INSERT INTO transportation_route_member_coalesced (member, network, ref, network_type, concurrency_index, osm_id)
|
|
||||||
SELECT member, network, coalesce(ref, '') AS ref,
|
|
||||||
osm_route_member_network_type(network, coalesce(ref, '')) AS network_type,
|
|
||||||
1 AS concurrency_index, 0 AS osm_id
|
|
||||||
FROM ire_route_members_view
|
|
||||||
WHERE full_update OR EXISTS(
|
|
||||||
SELECT NULL
|
|
||||||
FROM transportation_name.network_changes c
|
|
||||||
WHERE c.is_old IS FALSE AND c.osm_id = ire_route_members_view.member
|
|
||||||
)
|
|
||||||
GROUP BY member, network, coalesce(ref, '')
|
|
||||||
ON CONFLICT (member, network, ref) DO NOTHING;
|
|
||||||
|
|
||||||
-- etldoc: osm_route_member -> transportation_route_member_coalesced
|
-- etldoc: osm_route_member -> transportation_route_member_coalesced
|
||||||
INSERT INTO transportation_route_member_coalesced
|
INSERT INTO transportation_route_member_coalesced
|
||||||
SELECT
|
SELECT
|
||||||
|
@ -155,11 +122,13 @@ BEGIN
|
||||||
END AS rank
|
END AS rank
|
||||||
FROM (
|
FROM (
|
||||||
-- etldoc: osm_route_member -> osm_route_member
|
-- etldoc: osm_route_member -> osm_route_member
|
||||||
|
-- etldoc: gbr_route_members_view -> osm_route_member
|
||||||
|
-- etldoc: ire_route_members_view -> osm_route_member
|
||||||
-- see http://wiki.openstreetmap.org/wiki/Relation:route#Road_routes
|
-- see http://wiki.openstreetmap.org/wiki/Relation:route#Road_routes
|
||||||
SELECT DISTINCT ON (member, COALESCE(network, ''), COALESCE(ref, ''))
|
SELECT DISTINCT ON (member, COALESCE(rel.network, ''), COALESCE(rel.ref, ''))
|
||||||
member,
|
rel.member,
|
||||||
COALESCE(network, '') AS network,
|
COALESCE(NULLIF(rel.network,''), gb_way.network, ir_way.network, '') AS network,
|
||||||
COALESCE(ref, '') AS ref,
|
COALESCE(rel.ref, '') AS ref,
|
||||||
osm_id,
|
osm_id,
|
||||||
role,
|
role,
|
||||||
type,
|
type,
|
||||||
|
@ -167,11 +136,13 @@ BEGIN
|
||||||
osmc_symbol,
|
osmc_symbol,
|
||||||
colour,
|
colour,
|
||||||
ref_colour
|
ref_colour
|
||||||
FROM osm_route_member
|
FROM osm_route_member rel
|
||||||
|
LEFT JOIN gbr_route_members_view gb_way ON (gb_way.member=rel.member)
|
||||||
|
LEFT JOIN ire_route_members_view ir_way ON (ir_way.member=rel.member)
|
||||||
WHERE full_update OR EXISTS(
|
WHERE full_update OR EXISTS(
|
||||||
SELECT NULL
|
SELECT NULL
|
||||||
FROM transportation_name.network_changes c
|
FROM transportation_name.network_changes c
|
||||||
WHERE c.is_old IS FALSE AND c.osm_id = osm_route_member.member
|
WHERE c.is_old IS FALSE AND c.osm_id = rel.member
|
||||||
)
|
)
|
||||||
) osm_route_member_filtered
|
) osm_route_member_filtered
|
||||||
ON CONFLICT (member, network, ref) DO UPDATE SET osm_id = EXCLUDED.osm_id, role = EXCLUDED.role,
|
ON CONFLICT (member, network, ref) DO UPDATE SET osm_id = EXCLUDED.osm_id, role = EXCLUDED.role,
|
||||||
|
|
|
@ -66,7 +66,8 @@ $$ LANGUAGE SQL IMMUTABLE
|
||||||
|
|
||||||
-- etldoc: osm_highway_linestring -> osm_transportation_name_network
|
-- etldoc: osm_highway_linestring -> osm_transportation_name_network
|
||||||
-- etldoc: transportation_route_member_coalesced -> osm_transportation_name_network
|
-- etldoc: transportation_route_member_coalesced -> osm_transportation_name_network
|
||||||
CREATE TABLE IF NOT EXISTS osm_transportation_name_network AS
|
DROP TABLE IF EXISTS osm_transportation_name_network;
|
||||||
|
CREATE TABLE osm_transportation_name_network AS
|
||||||
SELECT
|
SELECT
|
||||||
geometry,
|
geometry,
|
||||||
osm_id,
|
osm_id,
|
||||||
|
@ -824,7 +825,9 @@ BEGIN
|
||||||
WHERE transportation.changes_z4_z5_z6_z7.is_old IS FALSE AND
|
WHERE transportation.changes_z4_z5_z6_z7.is_old IS FALSE AND
|
||||||
transportation.changes_z4_z5_z6_z7.id = osm_transportation_merge_linestring_gen_z5.id
|
transportation.changes_z4_z5_z6_z7.id = osm_transportation_merge_linestring_gen_z5.id
|
||||||
)) AND
|
)) AND
|
||||||
(highway = 'motorway' AND osm_national_network(network)
|
(highway = 'motorway' OR construction = 'motorway'
|
||||||
|
) OR
|
||||||
|
(osm_national_network(network) AND network != 'gb-trunk'
|
||||||
) AND
|
) AND
|
||||||
-- Current view: national-importance motorways and trunks
|
-- Current view: national-importance motorways and trunks
|
||||||
ST_Length(geometry) > 1000
|
ST_Length(geometry) > 1000
|
||||||
|
|
Ładowanie…
Reference in New Issue