cerxes/openmaptiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into gh-master

Browse Source 
# Conflicts:
#	Makefile
#	layers/landuse/landuse.sql
#	layers/poi/poi.sql
This commit is contained in:
Miel Truyen
2021-04-24 22:47:18 +02:00
parent 76d5d753d8 1d39075f03
commit 2a39e1ebfe
20 changed files with 760 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
layers/landuse/landuse.sql
View File

@@ -12,6 +12,7 @@ SELECT
NULL::text AS tourism,
NULL::text AS place,
NULL::text AS waterway,
NULL::text AS man_made,
scalerank
FROM ne_50m_urban_areas
) /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
@@ -29,7 +30,8 @@ SELECT
leisure,
tourism,
place,
waterway
waterway,
man_made
FROM ne_50m_urban_areas_gen_z5
WHERE scalerank <= 2
) /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
@@ -55,7 +57,8 @@ SELECT osm_id,
NULLIF(leisure, ''),
NULLIF(tourism, ''),
NULLIF(place, ''),
NULLIF(waterway, '')
NULLIF(waterway, ''),
NULLIF(man_made, '')
) AS class
FROM (
-- etldoc: ne_50m_urban_areas_gen_z4 -> layer_landuse:z4
@@ -66,7 +69,8 @@ FROM (
leisure,
tourism,
place,
waterway
waterway,
man_made
FROM ne_50m_urban_areas_gen_z4
WHERE zoom_level = 4
UNION ALL
@@ -78,7 +82,8 @@ FROM (
leisure,
tourism,
place,
waterway
waterway,
man_made
FROM ne_50m_urban_areas_gen_z5
WHERE zoom_level = 5
UNION ALL
@@ -90,7 +95,8 @@ FROM (
leisure,
tourism,
place,
waterway
waterway,
man_made
FROM osm_landuse_polygon_gen_z6
WHERE zoom_level = 6
UNION ALL
@@ -102,7 +108,8 @@ FROM (
leisure,
tourism,
place,
waterway
waterway,
man_made
FROM osm_landuse_polygon_gen_z7
WHERE zoom_level = 7
UNION ALL
@@ -114,7 +121,8 @@ FROM (
leisure,
tourism,
place,
waterway
waterway,
man_made
FROM osm_landuse_polygon_gen_z8
WHERE zoom_level = 8
UNION ALL
@@ -126,7 +134,8 @@ FROM (
leisure,
tourism,
place,
waterway
waterway,
man_made
FROM osm_landuse_polygon_gen_z9
WHERE zoom_level = 9
UNION ALL
@@ -138,7 +147,8 @@ FROM (
leisure,
tourism,
place,
waterway
waterway,
man_made
FROM osm_landuse_polygon_gen_z10
WHERE zoom_level = 10
UNION ALL
@@ -150,7 +160,8 @@ FROM (
leisure,
tourism,
place,
waterway
waterway,
man_made
FROM osm_landuse_polygon_gen_z11
WHERE zoom_level = 11
UNION ALL
@@ -162,7 +173,8 @@ FROM (
leisure,
tourism,
place,
waterway
waterway,
man_made
FROM osm_landuse_polygon_gen_z12
WHERE zoom_level = 12
UNION ALL
@@ -174,7 +186,8 @@ FROM (
leisure,
tourism,
place,
waterway
waterway,
man_made
FROM osm_landuse_polygon_gen_z13
WHERE zoom_level = 13
UNION ALL
@@ -186,7 +199,8 @@ FROM (
leisure,
tourism,
place,
waterway
waterway,
man_made
FROM osm_landuse_polygon
WHERE zoom_level >= 14
) AS zoom_levels

8
layers/landuse/landuse.yaml
View File

@@ -41,6 +41,14 @@ layer:
- quarter
- neighbourhood
- dam
- sports_centre
- parking
- motorcycle_parking
- bicycle_parking
- religious
- prison
- wastewater_plant
- water_works
datasource:
geometry_field: geometry
query: (SELECT geometry, class FROM layer_landuse(!bbox!, z(!scale_denominator!))) AS t

15
layers/landuse/mapping.yaml
View File

@@ -69,6 +69,9 @@ tables:
type: string
- name: area
type: area
- name: man_made
key: man_made
type: string
mapping:
landuse:
- railway
@@ -80,6 +83,8 @@ tables:
- industrial
- garages
- retail
- religious
- construction
amenity:
- bus_station
- school
@@ -88,17 +93,27 @@ tables:
- college
- library
- hospital
- parking
- prison
- motorcycle_parking
- bicycle_parking
- animal_training
leisure:
- stadium
- pitch
- playground
- track
- sports_centre
tourism:
- theme_park
- zoo
- picnic_site
place:
- suburb
- quarter
- neighbourhood
waterway:
- dam
man_made:
- wastewater_plant
- water_works