Skip to content

Commit

Permalink
connects with #1424 HOT icons
Browse files Browse the repository at this point in the history
  • Loading branch information
@nvkelso
nvkelso committed Dec 22, 2017
1 parent fcdbee2 commit ced9e41
Showing 1 changed file with 166 additions and 37 deletions.
203 changes: 166 additions & 37 deletions yaml/pois.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ global:
attraction: {col: attraction}
zoo: {col: zoo}
exit_to: {col: exit_to}
- &health_facility_type_kind_detail
kind_detail: {col: tags->'health_facility:type'}

- &tier1_min_zoom
lookup:
Expand Down Expand Up @@ -131,26 +133,28 @@ global:
- aerialway: pylon
- aeroway: [ gate, helipad ]
- amenity: [ atm, bbq, bench, bicycle_parking, bicycle_rental,
bicycle_repair_station, boat_storage, car_sharing, fuel,
life_ring, parking, picnic_table, post_box, ranger_station, recycling,
shelter, shower, telephone, toilets, waste_basket, waste_disposal,
water_point, watering_place ]
- barrier: [ cycle_barrier, gate, toll_booth ]
- emergency: [ lifeguard_tower, phone ]
bicycle_repair_station, boat_storage, bureau_de_change, car_sharing, customs,
fuel, harbourmaster, karaoke_box, life_ring, money_transfer, parking,
picnic_table, post_box, ranger_station, recycling, shelter, shower, taxi,
telephone, toilets, waste_basket, waste_disposal, water_point,
watering_place ]
- barrier: [ border_control, cycle_barrier, gate, toll_booth ]
- emergency: [ fire_hydrant, lifeguard_tower, phone ]
- highway: [ bus_stop, ford, mini_roundabout, motorway_junction, platform,
rest_area, traffic_signals, trailhead ]
rest_area, street_lamp, traffic_signals, trailhead ]
- historic: landmark
- landuse: quarry
- leisure: [ dog_park, firepit, fishing, pitch, slipway, swimming_area ]
- lock: yes
- man_made: [ adit, communications_tower, mast, mineshaft, observatory,
offshore_platform, petroleum_well, power_wind, telescope, water_tower,
water_well, windmill ]
water_well, watermill, windmill ]
- natural: [ cave_entrance, peak, volcano, geyser, hot_spring, rock, saddle,
stone, spring, tree, waterfall ]
- power: [ pole, tower ]
- public_transport: [ platform, stop_area ]
- railway: [ halt, level_crossing, platform, stop, subway_entrance, tram_stop ]
- tags->'health_facility:type': field_hospital
- tags->icn_ref: true
- tags->iwn_ref: true
- tags->lcn_ref: true
Expand All @@ -161,7 +165,7 @@ global:
- tags->rwn_ref: true
- tags->whitewater: [ egress, hazard, put_in, put_in;egress, rapid ]
- tourism: [ alpine_hut, information, picnic_site, viewpoint, wilderness_hut ]
- waterway: [ dam, lock, waterfall ]
- waterway: [ boat_lift, dam, fuel, lock, waterfall ]

filters:
# remove disused things, they're not real POIs any more
Expand Down Expand Up @@ -189,24 +193,15 @@ filters:
# otherwise that rule will trigger first. So these have been moved
# up here.
############################################################
- filter: {man_made: windmill}
- filter: {man_made: [lighthouse, watermill, windmill]}
min_zoom:
case:
- when: { tourism: attraction }
then: 14
- else: 15
output:
<<: *output_properties
kind: windmill
- filter: {man_made: lighthouse}
min_zoom:
case:
- when: { tourism: attraction }
then: 14
- else: 15
output:
<<: *output_properties
kind: lighthouse
kind: {col: man_made}
- filter: {man_made: observatory}
min_zoom: 15
output:
Expand Down Expand Up @@ -449,6 +444,7 @@ filters:
output:
<<: *output_properties
kind: generator
kind_detail: {col: tags->'generator:method'}
tier: 4
# golf_course
- filter: {leisure: golf_course}
Expand All @@ -464,6 +460,7 @@ filters:
output:
<<: *output_properties
kind: hospital
<<: *health_facility_type_kind_detail
tier: 4
# industrial - no POI
# pier - no POI
Expand Down Expand Up @@ -508,6 +505,13 @@ filters:
<<: *output_properties
kind: stadium
tier: 4
# casino
- filter: {amenity: casino}
min_zoom: { min: [ { max: [ { sum: [ { col: zoom }, 2.3 ] }, *tier4_min_zoom ] }, 15 ] }
output:
<<: *output_properties
kind: casino
tier: 4
# substation
- filter: {power: substation}
min_zoom: 15
Expand Down Expand Up @@ -767,6 +771,7 @@ filters:
output:
<<: *output_properties
kind: {col: amenity}
<<: *health_facility_type_kind_detail
- filter:
craft: [brewery, carpenter, confectionery, dressmaker, electrician, gardener,
handicraft, hvac, metal_construction, painter, photographer, photographic_laboratory,
Expand All @@ -776,16 +781,22 @@ filters:
<<: *output_properties
kind: {col: craft}
- filter:
shop: [variety_store, furniture, shoes, pet]
shop: [charity, variety_store, furniture, shoes, pet]
min_zoom: { clamp: { min: 0, max: 17, value: { sum: [ { col: zoom }, 3.3 ] } } }
output:
<<: *output_properties
kind: {col: shop}
- filter: {shop: [camera, copyshop, photo, tyres]}
min_zoom: 16
output:
<<: *output_properties
kind: {col: shop}
- filter: {amenity: nursing_home}
min_zoom: { clamp: { min: 0, max: 16, value: { sum: [ { col: zoom }, 1.25 ] } } }
output:
<<: *output_properties
kind: nursing_home
<<: *health_facility_type_kind_detail
- filter: {shop: music}
min_zoom: { clamp: { min: 0, max: 17, value: { sum: [ { col: zoom }, 1.27 ] } } }
output:
Expand Down Expand Up @@ -926,11 +937,11 @@ filters:
output:
<<: *output_properties
kind: fitness_station
- filter: {leisure: beach_resort}
- filter: {leisure: [beach_resort,adult_gaming_centre]}
min_zoom: { clamp: { min: 14, max: 16, value: { sum: [ { col: zoom }, 0.5 ] } } }
output:
<<: *output_properties
kind: beach_resort
kind: {col: leisure}
- filter:
tourism: [hotel, motel]
min_zoom: { clamp: { min: 0, max: 17, value: { sum: [ { col: zoom }, 4.3 ] } } }
Expand Down Expand Up @@ -991,19 +1002,64 @@ filters:
output:
<<: *output_properties
kind: gallery
- filter: { tags->health_facility:type: health_centre }
min_zoom: 15
output:
<<: *output_properties
kind: health_centre
<<: *health_facility_type_kind_detail
- filter: { tags->health_facility:type: field_hospital }
min_zoom: 15
output:
<<: *output_properties
kind: field_hospital
<<: *health_facility_type_kind_detail
- filter: { tags->health_facility:type: dispensary }
min_zoom: 17
output:
<<: *output_properties
kind: dispensary
<<: *health_facility_type_kind_detail
- filter:
social_facility: ambulatory_care
min_zoom: 17
output:
<<: *output_properties
kind: ambulatory_care
<<: *health_facility_type_kind_detail
- filter:
amenity: [social_facility, clinic, doctors, dentist]
min_zoom: 17
output:
<<: *output_properties
kind: {col: amenity}
- filter: {tags->healthcare: midwife}
<<: *health_facility_type_kind_detail
- filter: {tags->healthcare: [midwife,physiotherapist, psychotherapist, rehabilitation, podiatrist, optometrist, blood_donation, speech_therapist, occupational_therapist, chiropractor, hospice, physiotherapy, paediatrics]}
min_zoom: 17
output:
<<: *output_properties
kind: {col: tags->healthcare}
<<: *health_facility_type_kind_detail
- filter: {tags->healthcare: alternative}
min_zoom: 17
output:
<<: *output_properties
kind: healthcare_alternative
<<: *health_facility_type_kind_detail
- filter: {tags->healthcare: centre}
min_zoom: 17
output:
<<: *output_properties
kind: midwife
kind: healthcare_centre
<<: *health_facility_type_kind_detail
- filter: {tags->healthcare: laboratory}
min_zoom: 17
output:
<<: *output_properties
kind: healthcare_laboratory
<<: *health_facility_type_kind_detail
- filter:
amenity: [kindergarten, childcare]
amenity: [baby_hatch, kindergarten, childcare]
min_zoom: 17
output:
<<: *output_properties
Expand All @@ -1020,21 +1076,34 @@ filters:
<<: *output_properties
kind: boat_rental

- filter: {emergency: phone}
- filter: {emergency: [fire_hydrant, phone]}
min_zoom: 18
output:
<<: *output_properties
kind: phone
kind: {col: emergency}
- filter: {amenity: toilets}
min_zoom: 18
output:
<<: *output_properties
kind: toilets
kind_detail: {col: tags->'toilets:disposal'}
- filter: {barrier: gate}
min_zoom: { call: { func: mz_get_min_zoom_highway_level_gate, args: [ { col: fid }, { col: meta.ways } ] } }
output:
<<: *output_properties
kind: gate
- filter:
shop: funeral_directors
min_zoom: 14
output:
<<: *output_properties
kind: funeral_directors
- filter:
barrier: border_control
min_zoom: 14
output:
<<: *output_properties
kind: border_control
- filter: {barrier: toll_booth}
min_zoom: 15
output:
Expand Down Expand Up @@ -1137,7 +1206,13 @@ filters:
<<: *output_properties
kind: helipad
- filter:
amenity: [bus_station, car_sharing, recycling, shelter]
amenity: arts_centre
min_zoom: 15
output:
<<: *output_properties
kind: {col: amenity}
- filter:
amenity: [bus_station, car_rental, car_sharing, recycling, shelter]
min_zoom: 16
output:
<<: *output_properties
Expand Down Expand Up @@ -1270,14 +1345,14 @@ filters:
<<: *output_properties
kind: information
- filter:
amenity: [atm, bus_stop, drinking_water, emergency_phone,
post_box, telephone]
amenity: [atm, bureau_de_change, bus_stop, drinking_water, emergency_phone,
gambling, money_transfer, post_box, telephone]
min_zoom: 17
output:
<<: *output_properties
kind: {col: amenity}
- filter:
highway: [bus_stop, traffic_signals]
highway: [bus_stop, street_lamp, traffic_signals]
min_zoom: 17
output:
<<: *output_properties
Expand Down Expand Up @@ -1372,9 +1447,9 @@ filters:
<<: *output_properties
kind: cycle_barrier
- filter:
shop: [art, bakery, beauty, books, butcher, car, car_repair, clothes,
computer, convenience, fashion, florist, gift, greengrocer,
hairdresser, hifi, jewelry, mobile_phone, newsagent, optician,
shop: [art, bakery, beauty, bookmaker, books, butcher, car, car_parts, car_repair,
clothes, computer, convenience, fashion, florist, gift, greengrocer,
hairdresser, hifi, jewelry, lottery, mobile_phone, newsagent, optician,
perfumery, stationery, tobacco, travel_agency]
min_zoom: 17
output:
Expand Down Expand Up @@ -1408,11 +1483,44 @@ filters:
output:
<<: *output_properties
kind: adit

- filter: {man_made: water_well}
min_zoom: 17
output:
<<: *output_properties
kind: water_well
kind_detail:
case:
- when:
drinking_water: 'yes'
then:
case:
- when:
pump: 'no'
then: 'drinking_water_no_pump'
- when:
pump: 'powered'
# OSM tags use powered, but HOT icon set calls this "auto"
then: 'drinking_water_pump_powered'
- when:
pump: 'manual'
then: 'drinking_water_pump_manual'
- else: 'drinking_water'
- when:
drinking_water: 'no'
then:
case:
- when:
pump: 'no'
then: 'no_pump'
- when:
pump: 'powered'
# OSM tags use powered, but HOT icon set calls this "auto"
then: 'pump_powered'
- when:
pump: 'manual'
then: 'pump_manual'
- else: null
- filter: {natural: saddle}
min_zoom: 14
output:
Expand Down Expand Up @@ -1467,6 +1575,12 @@ filters:
output:
<<: *output_properties
kind: bbq
- filter: {amenity: studio}
min_zoom: 17
output:
<<: *output_properties
kind: studio
kind_detail: {col: studio}
- filter: {amenity: bicycle_repair_station}
min_zoom: 18
output:
Expand All @@ -1482,11 +1596,11 @@ filters:
output:
<<: *output_properties
kind: picnic_table
- filter: {amenity: shower}
- filter: {amenity: [shower,taxi]}
min_zoom: 18
output:
<<: *output_properties
kind: shower
kind: {col: amenity}
- filter: {amenity: waste_disposal}
min_zoom: 18
output:
Expand Down Expand Up @@ -1612,3 +1726,18 @@ filters:
<<: *output_properties
kind: attraction
tier: 6

# if a more specific shop isn't found, then default to generic shop kind
- filter:
shop: true
min_zoom: 17
output:
<<: *output_properties
kind: shop
# if a more specific craft isn't found, then default to generic craft kind
- filter:
craft: true
min_zoom: 17
output:
<<: *output_properties
kind: craft

0 comments on commit ced9e41

Please sign in to comment.