kopia lustrzana https://github.com/openmaptiles/openmaptiles
Porównaj commity
7 Commity
1f879b5208
...
be0465ac17
Autor | SHA1 | Data |
---|---|---|
Frédéric Rodrigo | be0465ac17 | |
Tomas Pohanka | eae7d7e1ed | |
Tomas Pohanka | 382b12ae8a | |
Tomas Pohanka | 59692656bd | |
Tomas Pohanka | ee19519905 | |
Tomas Pohanka | 8266197149 | |
Frédéric Rodrigo | 6f40400d56 |
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
|
||||||
|
|
||||||
|
|
|
@ -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.
|
||||||
|
|
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
|
||||||
|
|
|
@ -0,0 +1,7 @@
|
||||||
|
## Trees
|
||||||
|
|
||||||
|
### Mapping Diagram
|
||||||
|
![Mapping diagram for trees](mapping_diagram.png?raw=true)
|
||||||
|
|
||||||
|
### ETL diagram
|
||||||
|
![ETL diagram for trees](etl_diagram.png?raw=true)
|
Plik binarny nie jest wyświetlany.
Po Szerokość: | Wysokość: | Rozmiar: 10 KiB |
|
@ -0,0 +1,16 @@
|
||||||
|
-- etldoc: layer_tree[shape=record fillcolor=lightpink,
|
||||||
|
-- etldoc: style="rounded,filled", label="layer_tree | <z14_> z14+" ] ;
|
||||||
|
CREATE OR REPLACE FUNCTION layer_tree(bbox geometry, zoom_level integer, pixel_width numeric)
|
||||||
|
RETURNS TABLE(
|
||||||
|
osm_id bigint,
|
||||||
|
geometry geometry,
|
||||||
|
leaf_type text
|
||||||
|
) AS $$
|
||||||
|
-- etldoc: osm_tree -> layer_tree:z14_
|
||||||
|
SELECT osm_id, geometry, leaf_type
|
||||||
|
FROM osm_tree
|
||||||
|
WHERE zoom_level >= 14
|
||||||
|
AND geometry && bbox;
|
||||||
|
$$ LANGUAGE SQL STABLE
|
||||||
|
-- STRICT
|
||||||
|
PARALLEL SAFE;
|
|
@ -0,0 +1,15 @@
|
||||||
|
tables:
|
||||||
|
# etldoc: imposm3 -> osm_tree
|
||||||
|
tree:
|
||||||
|
type: point
|
||||||
|
fields:
|
||||||
|
- name: osm_id
|
||||||
|
type: id
|
||||||
|
- name: geometry
|
||||||
|
type: geometry
|
||||||
|
- name: leaf_type
|
||||||
|
tag: leaf_type
|
||||||
|
type: string
|
||||||
|
mapping:
|
||||||
|
natural: [tree]
|
||||||
|
leaf_type: [broadleaved, needleleaved]
|
Plik binarny nie jest wyświetlany.
Po Szerokość: | Wysokość: | Rozmiar: 10 KiB |
|
@ -0,0 +1,20 @@
|
||||||
|
layer:
|
||||||
|
id: "tree"
|
||||||
|
description: |
|
||||||
|
[Trees](http://wiki.openstreetmap.org/wiki/Tag:natural%3Dtree)
|
||||||
|
buffer_size: 4
|
||||||
|
fields:
|
||||||
|
leaf_type:
|
||||||
|
description: |
|
||||||
|
Type of leaf from [OSM](https://wiki.openstreetmap.org/wiki/Key:leaf_type).
|
||||||
|
values:
|
||||||
|
- broadleaved
|
||||||
|
- needleleaved
|
||||||
|
datasource:
|
||||||
|
geometry_field: geometry
|
||||||
|
query: (SELECT geometry, leaf_type FROM layer_tree(!bbox!, z(!scale_denominator!), !pixel_width!)) AS t
|
||||||
|
schema:
|
||||||
|
- ./layer.sql
|
||||||
|
datasources:
|
||||||
|
- type: imposm3
|
||||||
|
mapping_file: ./mapping.yaml
|
|
@ -0,0 +1,102 @@
|
||||||
|
tileset:
|
||||||
|
layers:
|
||||||
|
- layers/water/water.yaml
|
||||||
|
- layers/waterway/waterway.yaml
|
||||||
|
- layers/landcover/landcover.yaml
|
||||||
|
- layers/landuse/landuse.yaml
|
||||||
|
- layers/mountain_peak/mountain_peak.yaml
|
||||||
|
- layers/park/park.yaml
|
||||||
|
- layers/boundary/boundary.yaml
|
||||||
|
- layers/aeroway/aeroway.yaml
|
||||||
|
- layers/transportation/transportation.yaml
|
||||||
|
- layers/building/building.yaml
|
||||||
|
- layers/water_name/water_name.yaml
|
||||||
|
- layers/transportation_name/transportation_name.yaml
|
||||||
|
- layers/place/place.yaml
|
||||||
|
- layers/housenumber/housenumber.yaml
|
||||||
|
- layers/poi/poi.yaml
|
||||||
|
- layers/aerodrome_label/aerodrome_label.yaml
|
||||||
|
- layers_addons/tree/tree.yaml
|
||||||
|
name: OpenMapTiles + Addons
|
||||||
|
version: 3.11.0+addons
|
||||||
|
id: openmaptiles+addons
|
||||||
|
description: "A tileset showcasing all base layers and addons in OpenMapTiles. https://openmaptiles.org"
|
||||||
|
attribution: '<a href="https://www.openmaptiles.org/" target="_blank">© OpenMapTiles</a> <a href="https://www.openstreetmap.org/copyright" target="_blank">© OpenStreetMap contributors</a>'
|
||||||
|
center: [-12.2168, 28.6135, 4]
|
||||||
|
bounds: [-180.0,-85.0511,180.0,85.0511]
|
||||||
|
maxzoom: 14
|
||||||
|
minzoom: 0
|
||||||
|
pixel_scale: 256
|
||||||
|
languages:
|
||||||
|
- am # Amharic
|
||||||
|
- ar # Arabic
|
||||||
|
- az # Azerbaijani, Latin
|
||||||
|
- be # Belorussian
|
||||||
|
- bg # Bulgarian
|
||||||
|
- br # Breton, Latin
|
||||||
|
- bs # Bosnian, Latin
|
||||||
|
- ca # Catalan, Latin
|
||||||
|
- co # Corsican, Latin
|
||||||
|
- cs # Czech, Latin
|
||||||
|
- cy # Welsh, Latin
|
||||||
|
- da # Danish, Latin
|
||||||
|
- de # German, Latin
|
||||||
|
- el # Greek
|
||||||
|
- en # English, Latin
|
||||||
|
- eo # Esperanto, Latin
|
||||||
|
- es # Spanish, Latin
|
||||||
|
- et # Estonian, Latin
|
||||||
|
- eu # Basque, Latin
|
||||||
|
- fi # Finnish, Latin
|
||||||
|
- fr # French, Latin
|
||||||
|
- fy # Western Frisian, Latin
|
||||||
|
- ga # Irish, Latin
|
||||||
|
- gd # Scottish Gaelic, Latin
|
||||||
|
- he # Hebrew
|
||||||
|
- hi # Hindi
|
||||||
|
- hr # Croatian, Latin
|
||||||
|
- hu # Hungarian, Latin
|
||||||
|
- hy # Armenian
|
||||||
|
- id # Indonesian, Latin
|
||||||
|
- is # Icelandic, Latin
|
||||||
|
- it # Italian, Latin
|
||||||
|
- ja # Japanese
|
||||||
|
- ja_kana # Japanese Kana form
|
||||||
|
- ja_rm # romanization of Japanese, Latin
|
||||||
|
- ka # Georgian
|
||||||
|
- kk # Kazakh
|
||||||
|
- kn # Kannada
|
||||||
|
- ko # Korean
|
||||||
|
- ko_rm # romanization of Korean, Latin
|
||||||
|
- ku # Kurdish, Latin
|
||||||
|
- la # Latin, Latin
|
||||||
|
- lb # Luxembourgish, Latin
|
||||||
|
- lt # Lithuanian, Latin
|
||||||
|
- lv # Latvian, Latin
|
||||||
|
- mk # Macedonian
|
||||||
|
- mt # Maltese, Latin
|
||||||
|
- ml # Malayalam
|
||||||
|
- nl # Dutch, Latin
|
||||||
|
- "no" # Norwegian, Latin
|
||||||
|
- oc # Occitan (post 1500), Latin
|
||||||
|
- pl # Polish, Latin
|
||||||
|
- pt # Portuguese, Latin
|
||||||
|
- rm # Romansh, Latin
|
||||||
|
- ro # Romania, Latin
|
||||||
|
- ru # Russian
|
||||||
|
- sk # Slovak, Latin
|
||||||
|
- sl # Slovene, Latin
|
||||||
|
- sq # Albanian, Latin
|
||||||
|
- sr # Serbian, Cyrillic
|
||||||
|
- sr-Latn # Serbian, Latin
|
||||||
|
- sv # Swedish, Latin
|
||||||
|
- ta # Tamil
|
||||||
|
- te # Telugu
|
||||||
|
- th # Thai
|
||||||
|
- tr # Turkish, Latin
|
||||||
|
- uk # Ukrainian
|
||||||
|
- zh # Chinese
|
||||||
|
defaults:
|
||||||
|
srs: +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over
|
||||||
|
datasource:
|
||||||
|
srid: 900913
|
Ładowanie…
Reference in New Issue