From 642a9dc9563a83d869909d9bb6f6f509ed22e795 Mon Sep 17 00:00:00 2001 From: Tomas Vajda Date: Mon, 30 Sep 2019 12:30:46 +0200 Subject: [PATCH 1/4] Add weir to water layer --- spreadsheets/sort_rank/water.csv | 1 + yaml/water.yaml | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/spreadsheets/sort_rank/water.csv b/spreadsheets/sort_rank/water.csv index 237b5afb0..dddf18133 100644 --- a/spreadsheets/sort_rank/water.csv +++ b/spreadsheets/sort_rank/water.csv @@ -6,6 +6,7 @@ dam,-,201 ditch,-,201 drain,-,201 playa,-,203 +weir,-,205 lake,-,204 water,-,204 riverbank,-,204 diff --git a/yaml/water.yaml b/yaml/water.yaml index feca16d2f..fd5730b40 100644 --- a/yaml/water.yaml +++ b/yaml/water.yaml @@ -138,6 +138,12 @@ filters: <<: *water_standard_properties_osm kind: drain table: osm + - filter: {waterway: weir} + min_zoom: 14 + output: + <<: *water_standard_properties_osm + kind: weir + table: osm # reef - filter: natural: reef From 78dff55181269c14590536adc48514be63db7944 Mon Sep 17 00:00:00 2001 From: Tomas Vajda Date: Mon, 30 Sep 2019 12:32:05 +0200 Subject: [PATCH 2/4] Add to tilejson description --- tilejson/tilejson.json.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tilejson/tilejson.json.erb b/tilejson/tilejson.json.erb index 00df88c93..60cc27c71 100644 --- a/tilejson/tilejson.json.erb +++ b/tilejson/tilejson.json.erb @@ -288,7 +288,7 @@ "id" : "water", "fields" : { "name" : "String. Localized name variants are in properties like 'name:en'. Common value.", - "kind" : "String. detailed below, per geometry type. Common value, one of: basin, bay, canal, dam, ditch, dock, drain, fjord, fountain, lake, ocean, playa, reef, river, riverbank, sea, strait, stream, swimming_pool, water.", + "kind" : "String. detailed below, per geometry type. Common value, one of: basin, bay, canal, dam, ditch, dock, drain, fjord, fountain, lake, ocean, playa, reef, river, riverbank, sea, strait, stream, swimming_pool, water, weir.", "source" : "String. Common value, one of: naturalearthdata.com, osmdata.openstreetmap.de, openstreetmap.org.", "min_zoom" : "Number. A suggested minimum zoom at which the features should become visible. Common value.", "boundary" : "Boolean. For line geometries only. Common value.", From 6d0a0192098607528654634784d83a7875817356 Mon Sep 17 00:00:00 2001 From: Vectura Games Maps Date: Tue, 1 Oct 2019 12:28:26 +0200 Subject: [PATCH 3/4] Move weir to landuse layer --- spreadsheets/sort_rank/landuse.csv | 1 + spreadsheets/sort_rank/water.csv | 1 - tilejson/tilejson.json.erb | 4 ++-- yaml/landuse.yaml | 8 ++++++++ yaml/water.yaml | 6 ------ 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/spreadsheets/sort_rank/landuse.csv b/spreadsheets/sort_rank/landuse.csv index 02f76a49a..6929ab07e 100644 --- a/spreadsheets/sort_rank/landuse.csv +++ b/spreadsheets/sort_rank/landuse.csv @@ -21,6 +21,7 @@ dam,*,223 land,*,222 wetland,*,220 mud,*,219 +weir,*,218 footway,*,126 tower,*,125 wilderness_hut,*,124 diff --git a/spreadsheets/sort_rank/water.csv b/spreadsheets/sort_rank/water.csv index dddf18133..237b5afb0 100644 --- a/spreadsheets/sort_rank/water.csv +++ b/spreadsheets/sort_rank/water.csv @@ -6,7 +6,6 @@ dam,-,201 ditch,-,201 drain,-,201 playa,-,203 -weir,-,205 lake,-,204 water,-,204 riverbank,-,204 diff --git a/tilejson/tilejson.json.erb b/tilejson/tilejson.json.erb index 60cc27c71..13f4eec7e 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, 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, weir, 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.", @@ -288,7 +288,7 @@ "id" : "water", "fields" : { "name" : "String. Localized name variants are in properties like 'name:en'. Common value.", - "kind" : "String. detailed below, per geometry type. Common value, one of: basin, bay, canal, dam, ditch, dock, drain, fjord, fountain, lake, ocean, playa, reef, river, riverbank, sea, strait, stream, swimming_pool, water, weir.", + "kind" : "String. detailed below, per geometry type. Common value, one of: basin, bay, canal, dam, ditch, dock, drain, fjord, fountain, lake, ocean, playa, reef, river, riverbank, sea, strait, stream, swimming_pool, water.", "source" : "String. Common value, one of: naturalearthdata.com, osmdata.openstreetmap.de, openstreetmap.org.", "min_zoom" : "Number. A suggested minimum zoom at which the features should become visible. Common value.", "boundary" : "Boolean. For line geometries only. Common value.", diff --git a/yaml/landuse.yaml b/yaml/landuse.yaml index 6c2ad2586..18a622307 100644 --- a/yaml/landuse.yaml +++ b/yaml/landuse.yaml @@ -1252,6 +1252,14 @@ filters: <<: *output_properties kind: dam extra_columns: [way] + - filter: + waterway: weir + geom_type: line + min_zoom: 12 + output: + <<: *output_properties + kind: weir + extra_columns: [way] - filter: waterway: dam geom_type: polygon diff --git a/yaml/water.yaml b/yaml/water.yaml index fd5730b40..feca16d2f 100644 --- a/yaml/water.yaml +++ b/yaml/water.yaml @@ -138,12 +138,6 @@ filters: <<: *water_standard_properties_osm kind: drain table: osm - - filter: {waterway: weir} - min_zoom: 14 - output: - <<: *water_standard_properties_osm - kind: weir - table: osm # reef - filter: natural: reef From 71ff98ff94a44ceffaf188cb76f79e0f09ac4472 Mon Sep 17 00:00:00 2001 From: Tomas Vajda Date: Wed, 9 Oct 2019 12:22:38 +0200 Subject: [PATCH 4/4] Put weir between dam and breakwater --- spreadsheets/sort_rank/landuse.csv | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/spreadsheets/sort_rank/landuse.csv b/spreadsheets/sort_rank/landuse.csv index 6929ab07e..09a58c71f 100644 --- a/spreadsheets/sort_rank/landuse.csv +++ b/spreadsheets/sort_rank/landuse.csv @@ -11,17 +11,17 @@ retaining_wall,*,266 dam,LineString;MultiLineString,265 tree_row,*,264 hedge,*,263 -bridge,*,229 -pier,*,228 -dike,*,227 -cutline,*,226 -groyne,*,225 -breakwater,*,224 +bridge,*,230 +pier,*,229 +dike,*,228 +cutline,*,227 +groyne,*,226 +breakwater,*,225 +weir,*,224 dam,*,223 land,*,222 wetland,*,220 mud,*,219 -weir,*,218 footway,*,126 tower,*,125 wilderness_hut,*,124