diff --git a/layers/landuse/landuse.yaml b/layers/landuse/landuse.yaml index a6a71d8..7a6bf74 100644 --- a/layers/landuse/landuse.yaml +++ b/layers/landuse/landuse.yaml @@ -38,6 +38,7 @@ layer: - theme_park - zoo - suburb + - quarter - neighbourhood - dam datasource: diff --git a/layers/landuse/mapping.yaml b/layers/landuse/mapping.yaml index 7d8ecf1..b3b7621 100644 --- a/layers/landuse/mapping.yaml +++ b/layers/landuse/mapping.yaml @@ -12,7 +12,7 @@ generalized_tables: # etldoc: osm_landuse_polygon_gen_z9 -> osm_landuse_polygon_gen_z8 landuse_polygon_gen_z8: source: landuse_polygon_gen_z9 - sql_filter: area>power(ZRES6,2) AND (landuse='residential' OR place='suburb' OR place='neighbourhood') + sql_filter: area>power(ZRES6,2) AND (landuse='residential' OR place='suburb' OR place='quarter' OR place='neighbourhood') tolerance: ZRES8 # etldoc: osm_landuse_polygon_gen_z10 -> osm_landuse_polygon_gen_z9 landuse_polygon_gen_z9: @@ -98,6 +98,7 @@ tables: - zoo place: - suburb + - quarter - neighbourhood waterway: - dam diff --git a/layers/landuse/mapping_diagram.png b/layers/landuse/mapping_diagram.png index 1139c48..b4d6405 100644 Binary files a/layers/landuse/mapping_diagram.png and b/layers/landuse/mapping_diagram.png differ diff --git a/layers/place/mapping.yaml b/layers/place/mapping.yaml index 29d1f3b..efa1788 100644 --- a/layers/place/mapping.yaml +++ b/layers/place/mapping.yaml @@ -174,5 +174,6 @@ tables: - village - hamlet - suburb + - quarter - neighbourhood - isolated_dwelling diff --git a/layers/place/mapping_diagram.png b/layers/place/mapping_diagram.png index 6a43d74..5f21377 100644 Binary files a/layers/place/mapping_diagram.png and b/layers/place/mapping_diagram.png differ diff --git a/layers/place/place.yaml b/layers/place/place.yaml index f941df7..b1df1f2 100644 --- a/layers/place/place.yaml +++ b/layers/place/place.yaml @@ -32,6 +32,7 @@ layer: - village - hamlet - suburb + - quarter - neighbourhood - isolated_dwelling iso_a2: diff --git a/layers/place/types.sql b/layers/place/types.sql index 1ecdd3b..9e34ca9 100644 --- a/layers/place/types.sql +++ b/layers/place/types.sql @@ -2,7 +2,7 @@ DO $$ BEGIN IF NOT EXISTS(SELECT 1 FROM pg_type WHERE typname = 'city_place') THEN - CREATE TYPE city_place AS enum ('city', 'town', 'village', 'hamlet', 'suburb', 'neighbourhood', 'isolated_dwelling'); + CREATE TYPE city_place AS enum ('city', 'town', 'village', 'hamlet', 'suburb', 'quarter', 'neighbourhood', 'isolated_dwelling'); END IF; END $$;