Skip to content

Commit

Permalink
Render man_made=telescope telescope:type=radio (#3473)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jeisenbe @kocio-pl
jeisenbe authored and kocio-pl committed Oct 25, 2018
1 parent 7255fe7 commit 8428661
Show file tree
Hide file tree
Showing 3 changed files with 84 additions and 10 deletions.
14 changes: 14 additions & 0 deletions amenity-points.mss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,18 @@
}
}

[feature = 'man_made_telescope']["telescope:type" = 'radio'] {
[zoom >= 13]["telescope:diameter" >= 60],
[zoom >= 14]["telescope:diameter" >= 30],
[zoom >= 15]["telescope:diameter" >= 15],
[zoom >= 16] {
marker-file: url('symbols/man_made/telescope_dish.svg');
marker-fill: @man-made-icon;
marker-placement: interior;
marker-clip: false;
}
}

[feature = 'historic_city_gate'][zoom >= 17] {
marker-file: url('symbols/historic/city_gate.svg');
marker-fill: @man-made-icon;
Expand Down Expand Up @@ -1867,6 +1879,7 @@
[feature = 'man_made_storage_tank'][zoom >= 18],
[feature = 'man_made_silo'][zoom >= 18],
[feature = 'man_made_communications_tower'][zoom >= 17],
[feature = 'man_made_telescope']["telescope:type" = 'radio'][zoom >= 16],
[feature = 'man_made_water_tower'][zoom >= 17],
[feature = 'man_made_chimney'][zoom >= 17],
[feature = 'man_made_waste_water_plant'][zoom >= 17] {
Expand All @@ -1884,6 +1897,7 @@
[feature = 'man_made_mast'],
[feature = 'man_made_tower'],
[feature = 'man_made_communications_tower'],
[feature = 'man_made_telescope']["telescope:type" = 'radio'],
[feature = 'man_made_water_tower'],
[feature = 'man_made_storage_tank'],
[feature = 'man_made_silo'],
Expand Down
49 changes: 39 additions & 10 deletions project.mml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1462,7 +1462,7 @@ Layer:
'fitness_centre', 'fitness_station', 'firepit', 'sauna', 'beach_resort',
'bowling_alley', 'outdoor_seating', 'bird_hide', 'amusement_arcade', 'sports_centre', 'swimming_area')
THEN leisure ELSE NULL END,
'man_made_' || CASE WHEN (man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'obelisk', 'communications_tower', 'chimney', 'storage_tank', 'silo')
'man_made_' || CASE WHEN (man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'obelisk', 'communications_tower', 'telescope', 'chimney', 'storage_tank', 'silo')
AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL)) THEN man_made ELSE NULL END,
'natural_' || CASE WHEN "natural" IN ('spring') THEN "natural" ELSE NULL END,
'historic_' || CASE WHEN historic IN ('memorial', 'monument', 'archaeological_site', 'fort', 'castle', 'manor', 'city_gate')
Expand Down Expand Up @@ -1492,6 +1492,15 @@ Layer:
tags->'recycling_type' as recycling_type,
tags->'tower:construction' as "tower:construction",
tags->'tower:type' as "tower:type",
tags->'telescope:type' as "telescope:type",
CASE
WHEN man_made IN ('telescope') THEN
CASE
WHEN tags->'telescope:diameter' ~ '^-?\d{1,4}(\.\d+)?$' THEN (tags->'telescope:diameter')::NUMERIC
ELSE NULL
END
ELSE NULL
END AS "telescope:diameter",
tags->'castle_type' as castle_type,
tags->'sport' as sport,
tags->'information' as information,
Expand Down Expand Up @@ -1519,7 +1528,7 @@ Layer:
OR leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table', 'fitness_centre',
'fitness_station', 'firepit', 'sauna', 'beach_resort', 'bowling_alley', 'outdoor_seating', 'bird_hide',
'amusement_arcade', 'sports_centre', 'swimming_area')
OR (man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'obelisk', 'communications_tower', 'chimney', 'storage_tank', 'silo')
OR (man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'obelisk', 'communications_tower', 'telescope', 'chimney', 'storage_tank', 'silo')
AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL))
OR "natural" IN ('spring')
OR historic IN ('memorial', 'monument', 'archaeological_site', 'fort', 'castle', 'manor', 'city_gate')
Expand Down Expand Up @@ -1586,7 +1595,7 @@ Layer:
'dog_park', 'fitness_centre', 'fitness_station', 'firepit', 'sauna', 'beach_resort',
'bowling_alley', 'outdoor_seating', 'bird_hide', 'amusement_arcade', 'sports_centre',
'swimming_area') THEN leisure ELSE NULL END,
'man_made_' || CASE WHEN (man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'obelisk', 'communications_tower', 'chimney', 'storage_tank', 'silo')
'man_made_' || CASE WHEN (man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'obelisk', 'communications_tower', 'telescope', 'chimney', 'storage_tank', 'silo')
AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL)) THEN man_made ELSE NULL END,
'natural_' || CASE WHEN "natural" IN ('peak', 'volcano', 'saddle', 'spring', 'cave_entrance') THEN "natural" ELSE NULL END,
'waterway_' || CASE WHEN "waterway" IN ('waterfall') THEN waterway ELSE NULL END,
Expand Down Expand Up @@ -1635,6 +1644,15 @@ Layer:
tags->'recycling_type' as recycling_type,
tags->'tower:construction' as "tower:construction",
tags->'tower:type' as "tower:type",
tags->'telescope:type' as "telescope:type",
CASE
WHEN man_made IN ('telescope') THEN
CASE
WHEN tags->'telescope:diameter' ~ '^-?\d{1,4}(\.\d+)?$' THEN (tags->'telescope:diameter')::NUMERIC
ELSE NULL
END
ELSE NULL
END AS "telescope:diameter",
tags->'castle_type' as castle_type,
tags->'sport' as sport,
tags->'information' as information,
Expand Down Expand Up @@ -1664,7 +1682,7 @@ Layer:
'bowling_alley', 'outdoor_seating', 'bird_hide', 'amusement_arcade', 'sports_centre',
'swimming_area')
OR barrier IN ('toll_booth')
OR (man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'cross', 'obelisk', 'communications_tower', 'chimney', 'storage_tank', 'silo')
OR (man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'cross', 'obelisk', 'communications_tower', 'telescope', 'chimney', 'storage_tank', 'silo')
AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL))
OR "natural" IN ('peak', 'volcano', 'saddle', 'spring', 'cave_entrance')
OR waterway IN ('waterfall')
Expand Down Expand Up @@ -2065,8 +2083,8 @@ Layer:
'residential', 'garages', 'meadow', 'grass', 'allotments', 'forest', 'farmyard', 'farmland',
'greenhouse_horticulture', 'retail', 'industrial', 'railway', 'commercial', 'brownfield', 'landfill',
'construction', 'military', 'plant_nursery', 'religious') THEN landuse ELSE NULL END,
'man_made_' || CASE WHEN (man_made IN ('lighthouse', 'windmill', 'mast', 'tower', 'water_tower', 'pier', 'breakwater', 'groyne', 'obelisk', 'works', 'communications_tower',
'chimney', 'storage_tank', 'silo', 'wastewater_plant', 'water_works')
'man_made_' || CASE WHEN (man_made IN ('lighthouse', 'windmill', 'mast', 'tower', 'water_tower', 'pier', 'breakwater', 'groyne', 'obelisk', 'works',
'communications_tower', 'telescope', 'chimney', 'storage_tank', 'silo', 'wastewater_plant', 'water_works')
AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL)) THEN man_made ELSE NULL END,
'natural_' || CASE WHEN "natural" IN ('wood', 'water', 'mud', 'wetland', 'marsh', 'bay', 'spring', 'scree', 'shingle', 'bare_rock', 'sand', 'heath',
'grassland', 'scrub', 'beach', 'shoal', 'reef', 'glacier', 'strait') THEN "natural" ELSE NULL END,
Expand Down Expand Up @@ -2103,6 +2121,15 @@ Layer:
tags->'iata' as iata,
tags->'office' as office,
tags->'recycling_type' as recycling_type,
tags->'telescope:type' as "telescope:type",
CASE
WHEN man_made IN ('telescope') THEN
CASE
WHEN tags->'telescope:diameter' ~ '^-?\d{1,4}(\.\d+)?$' THEN (tags->'telescope:diameter')::NUMERIC
ELSE NULL
END
ELSE NULL
END AS "telescope:diameter",
tags->'castle_type' as castle_type,
tags->'sport' as sport,
tags->'information' as information,
Expand All @@ -2120,8 +2147,8 @@ Layer:
OR (tags->'office') IS NOT NULL
OR leisure IS NOT NULL
OR landuse IS NOT NULL
OR (man_made IN ('lighthouse', 'windmill', 'mast', 'tower', 'water_tower', 'pier', 'breakwater', 'groyne', 'obelisk', 'works', 'communications_tower',
'chimney', 'storage_tank', 'silo', 'wastewater_plant', 'water_works')
OR (man_made IN ('lighthouse', 'windmill', 'mast', 'tower', 'water_tower', 'pier', 'breakwater', 'groyne', 'obelisk', 'works',
'communications_tower', 'telescope', 'chimney', 'storage_tank', 'silo', 'wastewater_plant', 'water_works')
AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL))
OR "natural" IS NOT NULL
OR place IN ('island', 'islet')
Expand Down Expand Up @@ -2194,6 +2221,7 @@ Layer:
iata,
office,
recycling_type,
"telescope:type",
castle_type,
sport,
information,
Expand Down Expand Up @@ -2239,7 +2267,7 @@ Layer:
'greenhouse_horticulture', 'retail', 'industrial', 'railway', 'commercial', 'brownfield', 'landfill',
'construction', 'military', 'plant_nursery') THEN landuse ELSE NULL END,
'man_made_' || CASE WHEN (man_made IN ('lighthouse', 'windmill', 'mast', 'tower', 'water_tower', 'obelisk', 'works', 'communications_tower',
'chimney', 'storage_tank', 'silo', 'wastewater_plant', 'water_works')
'telescope', 'chimney', 'storage_tank', 'silo', 'wastewater_plant', 'water_works')
AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL)) THEN man_made ELSE NULL END,
'natural_' || CASE WHEN "natural" IN ('wood', 'peak', 'volcano', 'saddle', 'cave_entrance', 'water', 'mud', 'wetland', 'marsh', 'bay', 'spring',
'scree', 'shingle', 'bare_rock', 'sand', 'heath', 'grassland', 'scrub', 'beach', 'glacier', 'tree', 'strait')
Expand Down Expand Up @@ -2285,6 +2313,7 @@ Layer:
tags->'iata' as iata,
tags->'office' as office,
tags->'recycling_type' as recycling_type,
tags->'telescope:type' as "telescope:type",
tags->'castle_type' as castle_type,
tags->'sport' as sport,
tags->'information' as information,
Expand All @@ -2305,7 +2334,7 @@ Layer:
'garages', 'meadow', 'grass', 'allotments', 'forest', 'farmyard', 'farmland', 'greenhouse_horticulture',
'retail', 'industrial', 'railway', 'commercial', 'brownfield', 'landfill', 'construction', 'military', 'plant_nursery')
OR (man_made IN ('lighthouse', 'windmill', 'mast', 'tower', 'water_tower', 'cross', 'obelisk', 'works', 'communications_tower',
'chimney', 'storage_tank', 'silo', 'wastewater_plant', 'water_works')
'telescope', 'chimney', 'storage_tank', 'silo', 'wastewater_plant', 'water_works')
AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL))
OR "natural" IS NOT NULL
OR waterway IN ('waterfall')
Expand Down
31 changes: 31 additions & 0 deletions symbols/man_made/telescope_dish.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 8428661

Please sign in to comment.