Show residential already from z7, add commercial, retail, railway, industrial from z10 and military from z11

pull/312/head
Manuel Roth 2016-05-03 09:45:54 +02:00
rodzic 9649e62081
commit c25ddf82da
2 zmienionych plików z 13 dodań i 12 usunięć

Wyświetl plik

@ -31,12 +31,12 @@ Layer:
SELECT osm_ids2mbid(MAX(osm_id), true) AS osm_id, ST_CollectionExtract(ST_Collect(geometry), 3) AS geometry, landuse_class(type) AS class, type
FROM (
SELECT osm_id, geometry, type
FROM landuse_z5toz7
WHERE z(!scale_denominator!) BETWEEN 5 AND 7
FROM landuse_z5toz6
WHERE z(!scale_denominator!) BETWEEN 5 AND 6
UNION ALL
SELECT osm_id, geometry, type
FROM landuse_z8
WHERE z(!scale_denominator!) = 8
FROM landuse_z7toz8
WHERE z(!scale_denominator!) BETWEEN 7 AND 8
) AS landuse_z5toz8
WHERE geometry && !bbox!
GROUP BY type

Wyświetl plik

@ -1,12 +1,13 @@
CREATE OR REPLACE VIEW landuse_z5toz7 AS
CREATE OR REPLACE VIEW landuse_z5toz6 AS
SELECT osm_id, geometry, type
FROM osm_landuse_polygon_gen0
WHERE type IN ('wood', 'forest');
CREATE OR REPLACE VIEW landuse_z8 AS
CREATE OR REPLACE VIEW landuse_z7toz8 AS
SELECT osm_id, geometry, type
FROM osm_landuse_polygon_gen0
WHERE type IN ('wood', 'forest', 'residential');
WHERE type IN ('wood', 'forest', 'residential')
AND st_area(geometry) > 1000000;
CREATE OR REPLACE VIEW landuse_z9 AS
SELECT *
@ -17,19 +18,19 @@ CREATE OR REPLACE VIEW landuse_z9 AS
CREATE OR REPLACE VIEW landuse_z10 AS
SELECT *
FROM osm_landuse_polygon_gen0
WHERE landuse_class(type) IN ('wood', 'forest', 'residential', 'grass', 'cemetery', 'park', 'school')
WHERE landuse_class(type) IN ('wood', 'forest', 'residential', 'commercial', 'retail', 'railway', 'industrial', 'grass', 'cemetery', 'park', 'school')
AND st_area(geometry) > 99000;
CREATE OR REPLACE VIEW landuse_z11 AS
SELECT *
FROM osm_landuse_polygon_gen1
WHERE landuse_class(type) IN ('wood', 'forest', 'residential', 'grass', 'cemetery', 'park', 'school', 'hospital')
WHERE landuse_class(type) IN ('wood', 'forest', 'residential','commercial', 'retail', 'railway', 'industrial', 'military', 'grass', 'cemetery', 'park', 'school', 'hospital')
AND st_area(geometry) > 50000;
CREATE OR REPLACE VIEW landuse_z12 AS
SELECT *
FROM osm_landuse_polygon
WHERE landuse_class(type) IN ('wood', 'forest', 'residential', 'grass', 'cemetery', 'park', 'school', 'hospital')
WHERE landuse_class(type) IN ('wood', 'forest', 'residential', 'grass','retail', 'railway', 'industrial', 'military', 'cemetery', 'park', 'school', 'hospital')
AND st_area(geometry) > 10000;
CREATE OR REPLACE VIEW landuse_z13toz14 AS
@ -38,9 +39,9 @@ CREATE OR REPLACE VIEW landuse_z13toz14 AS
WHERE type NOT IN ('wetland', 'marsh', 'swamp', 'bog', 'mud', 'tidalflat', 'national_park', 'nature_reserve', 'protected_area');
CREATE OR REPLACE VIEW landuse_layer AS (
SELECT osm_id FROM landuse_z5toz7
SELECT osm_id FROM landuse_z5toz6
UNION
SELECT osm_id FROM landuse_z8
SELECT osm_id FROM landuse_z7toz8
UNION
SELECT osm_id FROM landuse_z9
UNION