Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add weir to water layer #1931

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add weir to water layer #1931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
642a9dc
Add weir to water layer
rwrx Sep 30, 2019
78dff55
Add to tilejson description
rwrx Sep 30, 2019
6d0a019
Move weir to landuse layer
Oct 1, 2019
71ff98f
Put weir between dam and breakwater
rwrx Oct 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions spreadsheets/sort_rank/landuse.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@ 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
Expand Down
2 changes: 1 addition & 1 deletion tilejson/tilejson.json.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down
8 changes: 8 additions & 0 deletions yaml/landuse.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1252,6 +1252,14 @@ filters:
<<: *output_properties
kind: dam
extra_columns: [way]
- filter:
waterway: weir
geom_type: line
min_zoom: 12
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why 12 and not 13 or 14? In your style when do you show it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it is used in our style which is similar to OpenTopoMap as OpenTopoMap shows this in lower zooms.

output:
<<: *output_properties
kind: weir
extra_columns: [way]
- filter:
waterway: dam
geom_type: polygon
Expand Down