From 232e531faf94424f8b594d3365b15f8f464d8b6f Mon Sep 17 00:00:00 2001 From: Tomas Vajda Date: Mon, 30 Sep 2019 12:12:21 +0200 Subject: [PATCH 1/5] Add dyke --- spreadsheets/collision_rank.yaml | 2 +- spreadsheets/sort_rank/landuse.csv | 2 +- tilejson/tilejson.json.erb | 2 +- yaml/landuse.yaml | 9 ++++----- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/spreadsheets/collision_rank.yaml b/spreadsheets/collision_rank.yaml index 7c93ddcfd..3748c4dea 100644 --- a/spreadsheets/collision_rank.yaml +++ b/spreadsheets/collision_rank.yaml @@ -676,7 +676,7 @@ - {$layer: 'landuse', kind: 'land'} - {$layer: 'landuse', kind: 'dam'} - {$layer: 'landuse', kind: 'groyne'} -- {$layer: 'landuse', kind: 'dike'} +- {$layer: 'landuse', kind: 'dyke'} - {$layer: 'landuse', kind: 'pier'} - {$layer: 'landuse', kind: 'bridge'} - {$layer: 'pois', kind: 'stop_area'} diff --git a/spreadsheets/sort_rank/landuse.csv b/spreadsheets/sort_rank/landuse.csv index 02f76a49a..76d001ed8 100644 --- a/spreadsheets/sort_rank/landuse.csv +++ b/spreadsheets/sort_rank/landuse.csv @@ -13,7 +13,7 @@ tree_row,*,264 hedge,*,263 bridge,*,229 pier,*,228 -dike,*,227 +dyke,*,227 cutline,*,226 groyne,*,225 breakwater,*,224 diff --git a/tilejson/tilejson.json.erb b/tilejson/tilejson.json.erb index 00df88c93..7fc65c7ed 100644 --- a/tilejson/tilejson.json.erb +++ b/tilejson/tilejson.json.erb @@ -100,7 +100,7 @@ "name" : "String. Localized name variants are in properties like 'name:en'. Common value.", "id" : "Integer. Common value.", "source" : "String. Common value, one of: openstreetmap.org, naturalearthdata.com.", - "kind" : "String. Common value, one of: aerodrome, airfield, allotments, amusement_ride, animal, apron, aquarium, artwork, attraction, aviary, bare_rock, barren, battlefield, beach, boatyard, breakwater, bridge, camp_site, caravan_site, carousel, cemetery, cinema, city_wall, college, commercial, common, container_terminal, crane, cutline, cutting, dam, danger_area, desert, dike, ditch, dog_park, embankment, enclosure, farm, farmland, farmyard, fence, fence, ferry_terminal, footway, forest, fort, fuel, garden, gate, generator, glacier, golf_course, grass, grassland, groyne, guard_rail, hanami, harbour, heath, hospital, industrial, kerb, land, library, maze, meadow, military, mud, national_park, nature_reserve, naval_base, orchard, park, parking, pedestrian, petting_zoo, picnic_site, pier, pier, pitch, place_of_worship, plant, plant_nursery, playground, port, port_terminal, power_line, power_minor_line, prison, protected_area, quarry, quay, railway, range, recreation_ground, recreation_track, residential, resort, rest_area, retail, retaining_wall, rock, roller_coaster, runway, rural, sand, school, scree, scrub, service_area, shingle, shipyard, snow_fence, sports_centre, stadium, stone, substation, summer_toboggan, taxiway, theatre, theme_park, tower, trail_riding_station, university, urban, urban_area, village_green, vineyard, wall, wastewater_plant, water_park, water_slide, water_works, wetland, wharf, wilderness_hut, wildlife_park, winery, winter_sports, wood, works, zoo, low_emission_zone.", + "kind" : "String. Common value, one of: aerodrome, airfield, allotments, amusement_ride, animal, apron, aquarium, artwork, attraction, aviary, bare_rock, barren, battlefield, beach, boatyard, breakwater, bridge, camp_site, caravan_site, carousel, cemetery, cinema, city_wall, college, commercial, common, container_terminal, crane, cutline, cutting, dam, danger_area, desert, dyke, ditch, dog_park, embankment, enclosure, farm, farmland, farmyard, fence, fence, ferry_terminal, footway, forest, fort, fuel, garden, gate, generator, glacier, golf_course, grass, grassland, groyne, guard_rail, hanami, harbour, heath, hospital, industrial, kerb, land, library, maze, meadow, military, mud, national_park, nature_reserve, naval_base, orchard, park, parking, pedestrian, petting_zoo, picnic_site, pier, pier, pitch, place_of_worship, plant, plant_nursery, playground, port, port_terminal, power_line, power_minor_line, prison, protected_area, quarry, quay, railway, range, recreation_ground, recreation_track, residential, resort, rest_area, retail, retaining_wall, rock, roller_coaster, runway, rural, sand, school, scree, scrub, service_area, shingle, fell, shipyard, snow_fence, sports_centre, stadium, stone, substation, summer_toboggan, taxiway, theatre, theme_park, tower, trail_riding_station, university, urban, urban_area, village_green, vineyard, wall, wastewater_plant, water_park, water_slide, water_works, wetland, wharf, wilderness_hut, wildlife_park, winery, winter_sports, wood, works, zoo, low_emission_zone.", "kind_detail" : "String. Common optional value.", "min_zoom" : "Number. A suggested minimum zoom at which the features should become visible. Common value.", "sort_rank" : "Integer. Suggestion for which order to draw features (lower values are bottom, bigger values on top). Common value.", diff --git a/yaml/landuse.yaml b/yaml/landuse.yaml index 6c2ad2586..9f8b59038 100644 --- a/yaml/landuse.yaml +++ b/yaml/landuse.yaml @@ -891,14 +891,13 @@ filters: <<: *output_properties kind: groyne tier: 4 - # dike + # dyke - filter: - man_made: dike - geom_type: polygon - min_zoom: { max: [ 13, *tier4_min_zoom ] } + man_made: dyke + min_zoom: 13 output: <<: *output_properties - kind: dike + kind: dyke tier: 4 # cutline - filter: From 491cf5e6a437d817b56966ee4f188a687ec34aac Mon Sep 17 00:00:00 2001 From: Tomas Vajda Date: Mon, 30 Sep 2019 12:51:10 +0200 Subject: [PATCH 2/5] Add dyke to tilejson description --- tilejson/tilejson.json.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tilejson/tilejson.json.erb b/tilejson/tilejson.json.erb index 7fc65c7ed..8a6672876 100644 --- a/tilejson/tilejson.json.erb +++ b/tilejson/tilejson.json.erb @@ -55,7 +55,7 @@ "kind" : "String. Common value, one of: address, building, building_part, entrance, exit.", "kind_detail" : "String. Common value, one of: abandoned, administrative, agricultural, airport, allotment_house, apartments, arbour, arch, balcony, bank, barn, base, basilica, beach_hut, bell_tower, boathouse, brewery, bridge, bungalow, bunker, cabin, carport, castle, cathedral, chapel, chimney, church, civic, clinic, clubhouse, collapsed, college, column, commercial, construction, container, convent, cowshed, dam, damaged, depot, destroyed, detached, disused, door, dormitory, duplex, elevator, emergency, entrance, factory, farm, farm_auxiliary, fire_exit, fire_station, floor, garage, garages, gazebo, ger, glasshouse, government, grandstand, greenhouse, hall, hangar, healthcare, hermitage, home, hospital, hotel, house, houseboat, hut, industrial, kindergarten, kiosk, library, main, mall, manor, manufacture, mixed_use, mobile_home, monastery, mortuary, mosque, museum, office, or unisex, outbuilding, parking, passageway, pavilion, pillar, porch, power, prison, private, proposed, pub, public, ramp, residence, residential, restaurant, retail, roof, room, ruin, ruins, school, secondary, semidetached_house, service, shed, shelter, shop, shrine, silo, slurry_tank, stable, stadium, staircase, static_caravan, steps, stilobate, storage, storage_tank, store, substation, summer_cottage, summer_house, supermarket, synagogue, tank, temple, terrace, tier, tower, train_station, transformer_tower, transportation, university, utility, veranda, verticalpassage, wall, warehouse, wayside_shrine, window, works.", "source" : "String. Common value, one of: openstreetmap.org.", - "landuse_kind" : "String. Tilezen calculates the `landuse_kind` value by intercutting `buildings` with the `landuse` layer to determine if a building is over a parks, hospitals, universities or other landuse features. Common value, one of: aerodrome, allotments, amusement_ride, animal, apron, aquarium, artwork, attraction, aviary, battlefield, beach, breakwater, bridge, camp_site, caravan_site, carousel, cemetery, cinema, city_wall, college, commercial, common, cutline, dam, dike, dog_park, enclosure, farm, farmland, farmyard, fence, footway, forest, fort, fuel, garden, gate, generator, glacier, golf_course, grass, groyne, hanami, hospital, industrial, land, library, maze, meadow, military, national_park, nature_reserve, park, parking, pedestrian, petting_zoo, picnic_site, pier, pitch, place_of_worship, plant, playground, prison, protected_area, quarry, railway, recreation_ground, recreation_track, residential, resort, rest_area, retail, retaining_wall, rock, roller_coaster, runway, rural, school, scree, scrub, service_area, snow_fence, sports_centre, stadium, stone, substation, summer_toboggan, taxiway, theatre, theme_park, tower, trail_riding_station, university, urban_area, urban, village_green, wastewater_plant, water_park, water_slide, water_works, wetland, wilderness_hut, wildlife_park, winery, winter_sports, wood, works, zoo.", + "landuse_kind" : "String. Tilezen calculates the `landuse_kind` value by intercutting `buildings` with the `landuse` layer to determine if a building is over a parks, hospitals, universities or other landuse features. Common value, one of: aerodrome, allotments, amusement_ride, animal, apron, aquarium, artwork, attraction, aviary, battlefield, beach, breakwater, bridge, camp_site, caravan_site, carousel, cemetery, cinema, city_wall, college, commercial, common, cutline, dam, dyke, dog_park, enclosure, farm, farmland, farmyard, fence, footway, forest, fort, fuel, garden, gate, generator, glacier, golf_course, grass, groyne, hanami, hospital, industrial, land, library, maze, meadow, military, national_park, nature_reserve, park, parking, pedestrian, petting_zoo, picnic_site, pier, pitch, place_of_worship, plant, playground, prison, protected_area, quarry, railway, recreation_ground, recreation_track, residential, resort, rest_area, retail, retaining_wall, rock, roller_coaster, runway, rural, school, scree, scrub, service_area, snow_fence, sports_centre, stadium, stone, substation, summer_toboggan, taxiway, theatre, theme_park, tower, trail_riding_station, university, urban_area, urban, village_green, wastewater_plant, water_park, water_slide, water_works, wetland, wilderness_hut, wildlife_park, winery, winter_sports, wood, works, zoo.", "sort_rank" : "Integer. Suggestion for which order to draw features (lower values are bottom, bigger values on top). Common value.", "collision_rank" : "Integer. Common property. Suggestion for which order labels should collide. Use as tie breaker with min_zoom.", "min_zoom" : "Number. A suggested minimum zoom at which the features should become visible (eg: based on area and volume limits). Common value.", @@ -194,7 +194,7 @@ "source" : "String. Common value, one of: openstreetmap.org, naturalearthdata.com.", "min_zoom" : "Number. A suggested minimum zoom at which the features should become visible. Common value.", "kind" : "String. Common value, one of: aerialway, exit, ferry, highway, major_road, minor_road, path, piste, quay, racetrack, rail.", - "landuse_kind" : "String. Tilezen calculates the `landuse_kind` value by intercutting `buildings` with the `landuse` layer to determine if a building is over a parks, hospitals, universities or other landuse features. Common value, one of: aerodrome, allotments, amusement_ride, animal, apron, aquarium, artwork, attraction, aviary, battlefield, beach, breakwater, bridge, camp_site, caravan_site, carousel, cemetery, cinema, city_wall, college, commercial, common, cutline, dam, dike, dog_park, enclosure, farm, farmland, farmyard, fence, footway, forest, fort, fuel, garden, gate, generator, glacier, golf_course, grass, groyne, hanami, hospital, industrial, land, library, maze, meadow, military, national_park, nature_reserve, park, parking, pedestrian, petting_zoo, picnic_site, pier, pitch, place_of_worship, plant, playground, prison, protected_area, quarry, railway, recreation_ground, recreation_track, residential, resort, rest_area, retail, retaining_wall, rock, roller_coaster, runway, rural, school, scree, scrub, service_area, snow_fence, sports_centre, stadium, stone, substation, summer_toboggan, taxiway, theatre, theme_park, tower, trail_riding_station, university, urban_area, urban, village_green, wastewater_plant, water_park, water_slide, water_works, wetland, wilderness_hut, wildlife_park, winery, winter_sports, wood, works, zoo.", + "landuse_kind" : "String. Tilezen calculates the `landuse_kind` value by intercutting `buildings` with the `landuse` layer to determine if a building is over a parks, hospitals, universities or other landuse features. Common value, one of: aerodrome, allotments, amusement_ride, animal, apron, aquarium, artwork, attraction, aviary, battlefield, beach, breakwater, bridge, camp_site, caravan_site, carousel, cemetery, cinema, city_wall, college, commercial, common, cutline, dam, dog_park, dyke, enclosure, farm, farmland, farmyard, fence, footway, forest, fort, fuel, garden, gate, generator, glacier, golf_course, grass, groyne, hanami, hospital, industrial, land, library, maze, meadow, military, national_park, nature_reserve, park, parking, pedestrian, petting_zoo, picnic_site, pier, pitch, place_of_worship, plant, playground, prison, protected_area, quarry, railway, recreation_ground, recreation_track, residential, resort, rest_area, retail, retaining_wall, rock, roller_coaster, runway, rural, school, scree, scrub, service_area, snow_fence, sports_centre, stadium, stone, substation, summer_toboggan, taxiway, theatre, theme_park, tower, trail_riding_station, university, urban_area, urban, village_green, wastewater_plant, water_park, water_slide, water_works, wetland, wilderness_hut, wildlife_park, winery, winter_sports, wood, works, zoo.", "ref" : "String. Used for road shields. Common value.", "sort_rank" : "Integer. Suggestion for which order to draw features (lower values are bottom, bigger values on top). Common value.", "collision_rank" : "Integer. Common property. Suggestion for which order labels should collide. Use as tie breaker with min_zoom.", From 2019551d12a1345142ee343e31f00d5123621370 Mon Sep 17 00:00:00 2001 From: Vectura Games Maps Date: Tue, 1 Oct 2019 13:18:50 +0200 Subject: [PATCH 3/5] Treat differently dyke line and polygon --- yaml/landuse.yaml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/yaml/landuse.yaml b/yaml/landuse.yaml index 9f8b59038..dce768019 100644 --- a/yaml/landuse.yaml +++ b/yaml/landuse.yaml @@ -894,7 +894,16 @@ filters: # dyke - filter: man_made: dyke - min_zoom: 13 + geom_type: line + min_zoom: { max: [ 13, *tier4_min_zoom ] } + output: + <<: *output_properties + kind: dyke + tier: 4 + - filter: + man_made: dyke + geom_type: polygon + min_zoom: { clamp: { max: 16, min: 11, value: { col: zoom } } } output: <<: *output_properties kind: dyke From d80af4c3b0a5388abfc6322d733cc0eee7be8541 Mon Sep 17 00:00:00 2001 From: Tomas Vajda Date: Wed, 9 Oct 2019 12:05:13 +0200 Subject: [PATCH 4/5] Replace all dike occurrences with dyke --- docs/layers.md | 2 +- integration-test/1794-demote-early-landcover.py | 4 ++-- yaml/pois.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/layers.md b/docs/layers.md index 0059e1118..13d2c418e 100644 --- a/docs/layers.md +++ b/docs/layers.md @@ -516,7 +516,7 @@ _TIP: Some `landuse` features only exist as point features in OpenStreetMap. Fin * `dam` - polygon, line * `danger_area` - e.g: military training zones, firing ranges. * `desert` -* `dike` +* `dyke` * `ditch` line. * `dog_park` * `embankment` - A raised area of land, usually to carry a road or railway. diff --git a/integration-test/1794-demote-early-landcover.py b/integration-test/1794-demote-early-landcover.py index 6a88ab530..dcf30a08c 100644 --- a/integration-test/1794-demote-early-landcover.py +++ b/integration-test/1794-demote-early-landcover.py @@ -286,8 +286,8 @@ def test_trail_riding_station(self): def test_aviary(self): self._check_min_zoom({'zoo': 'aviary'}, 'aviary', 13) - def test_dike(self): - self._check_min_zoom({'man_made': 'dike'}, 'dike', 13) + def test_dyke(self): + self._check_min_zoom({'man_made': 'dyke'}, 'dyke', 13) def test_summer_toboggan(self): self._check_min_zoom({'attraction': 'summer_toboggan'}, diff --git a/yaml/pois.yaml b/yaml/pois.yaml index 3a65dab42..1a65be558 100644 --- a/yaml/pois.yaml +++ b/yaml/pois.yaml @@ -925,7 +925,7 @@ filters: denomination: { col: denomination } # commercial - no POI # cutline - no POI - # dike - no POI + # dyke - no POI # generator - filter: {power: generator} min_zoom: { max: [15, *tier4_min_zoom ] } From b3be618cfe3f6a922e326ffd2fa20b45345932e1 Mon Sep 17 00:00:00 2001 From: Tomas Vajda Date: Wed, 9 Oct 2019 12:13:44 +0200 Subject: [PATCH 5/5] Change dyke polygon min zoom to 13 --- yaml/landuse.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yaml/landuse.yaml b/yaml/landuse.yaml index dce768019..875f8ec51 100644 --- a/yaml/landuse.yaml +++ b/yaml/landuse.yaml @@ -903,7 +903,7 @@ filters: - filter: man_made: dyke geom_type: polygon - min_zoom: { clamp: { max: 16, min: 11, value: { col: zoom } } } + min_zoom: { clamp: { max: 16, min: 13, value: { col: zoom } } } output: <<: *output_properties kind: dyke