Skip to content

Commit

Permalink
differentiate guidepost from general tourism=information display
Browse files Browse the repository at this point in the history
  • Loading branch information
nebulon42 committed Apr 26, 2018
1 parent 529e3f6 commit ab57e39
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 19 deletions.
45 changes: 26 additions & 19 deletions amenity-points.mss
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
marker-placement: interior;
marker-clip: false;
}

[feature = 'amenity_bbq'][zoom >= 17] {
marker-file: url('symbols/bbq.svg');
marker-fill: @amenity-brown;
Expand Down Expand Up @@ -159,7 +159,7 @@
marker-clip: false;
}

// Ford tagging on points - ford on lines is defined later
// Ford tagging on points - ford on lines is defined later
[feature = 'highway_ford'][zoom >= 16] {
marker-file: url('symbols/ford.svg');
marker-fill: @transportation-icon;
Expand Down Expand Up @@ -313,13 +313,20 @@
marker-clip: false;
}

[feature = 'tourism_information'][zoom >= 17] {
[feature = 'tourism_information'][information != 'guidepost'][zoom >= 17] {
marker-file: url('symbols/information.12.svg');
marker-placement: interior;
marker-fill: @amenity-brown;
marker-clip: false;
}

[feature = 'tourism_information'][information = 'guidepost'][zoom >= 19] {
marker-file: url('symbols/guidepost.svg');
marker-placement: interior;
marker-fill: @amenity-brown;
marker-clip: false;
}

[feature = 'amenity_embassy'][zoom >= 17] {
marker-file: url('symbols/embassy.svg');
marker-fill: @public-service;
Expand Down Expand Up @@ -347,7 +354,7 @@
marker-placement: interior;
marker-clip: false;
}

[feature = 'amenity_shower'][zoom >= 18] {
marker-file: url('symbols/shower.svg');
marker-fill: @amenity-brown;
Expand All @@ -374,7 +381,7 @@
[zoom >= 16][height > 40],
[zoom >= 17][height > 20],
[zoom >= 18] {
["tower:type" != 'lighting'] {
["tower:type" != 'lighting'] {
marker-file: url('symbols/towers/mast.svg');
marker-fill: @man-made-icon;
marker-placement: interior;
Expand All @@ -385,7 +392,7 @@
marker-fill: @man-made-icon;
marker-placement: interior;
marker-clip: false;
}
}
["tower:type" = 'communication'] {
marker-file: url('symbols/towers/mast_communications.svg');
}
Expand All @@ -404,10 +411,10 @@
marker-placement: interior;
marker-clip: false;
["tower:type" = 'defensive'] {
marker-file: url('symbols/towers/tower_defensive.svg');
marker-file: url('symbols/towers/tower_defensive.svg');
}
["tower:type" = 'observation'] {
marker-file: url('symbols/towers/tower_observation.svg');
marker-file: url('symbols/towers/tower_observation.svg');
}
["tower:type" = 'bell_tower'] {
marker-file: url('symbols/towers/bell_tower.svg');
Expand All @@ -417,7 +424,7 @@
["tower:construction" = 'lattice'] {
marker-file: url('symbols/towers/tower_lattice_lighting.svg');
}
}
}
["tower:construction" = 'lattice'] {
marker-file: url('symbols/towers/tower_lattice.svg');
}
Expand Down Expand Up @@ -534,7 +541,7 @@
marker-placement: interior;
marker-clip: false;
}

[feature = 'amenity_police'][zoom >= 16] {
marker-file: url('symbols/police.svg');
marker-fill: @public-service;
Expand Down Expand Up @@ -1096,7 +1103,7 @@
marker-placement: interior;
marker-clip: false;
}

[feature = 'leisure_firepit'][zoom >= 17] {
marker-file: url('symbols/firepit.svg');
marker-fill: @amenity-brown;
Expand All @@ -1118,7 +1125,7 @@
marker-clip: false;
}

// Slipway tagging on points - slipway on lines is defined later
// Slipway tagging on points - slipway on lines is defined later
[feature = 'leisure_slipway'][zoom >= 17] {
marker-file: url('symbols/transport_slipway.p.20.svg');
marker-fill: @transportation-icon;
Expand Down Expand Up @@ -1196,10 +1203,10 @@

[feature = 'military_bunker'][zoom >= 17] {
marker-file: url('symbols/bunker.svg');
marker-fill: @man-made-icon;
marker-fill: @man-made-icon;
marker-placement: interior;
marker-clip: false;
}
}

[feature = 'natural_spring'][zoom >= 14] {
marker-file: url('symbols/spring.svg');
Expand Down Expand Up @@ -1230,8 +1237,8 @@
marker-placement: interior;
marker-clip: false;
}
// waste_disposal tagging on ways - tagging on nodes is defined later

// waste_disposal tagging on ways - tagging on nodes is defined later
[feature = 'amenity_waste_disposal'][zoom >= 19] {
[access = null],
[access = 'permissive'],
Expand Down Expand Up @@ -1330,7 +1337,7 @@
marker-placement: interior;
}

// waste_disposal tagging on nodes - tagging on ways is defined earlier
// waste_disposal tagging on nodes - tagging on ways is defined earlier
[feature = 'amenity_waste_disposal'][zoom >= 19]::amenity {
[access = null],
[access = 'permissive'],
Expand Down Expand Up @@ -1646,7 +1653,7 @@
text-halo-fill: @standard-halo-fill;
text-placement: interior;
}

[feature = 'military_bunker'][zoom >= 17],
[feature = 'historic_wayside_shrine'][zoom >= 17] {
text-name: "[name]";
Expand Down Expand Up @@ -2033,7 +2040,7 @@
text-dy: 6;
}
}

[feature = 'amenity_shower'][zoom >= 18] {
text-name: "[name]";
text-size: @standard-font-size;
Expand Down
2 changes: 2 additions & 0 deletions project.mml
Original file line number Diff line number Diff line change
Expand Up @@ -1478,6 +1478,7 @@ Layer:
tags->'icao' as icao,
tags->'iata' as iata,
tags->'office' as office,
tags->'information' as information,
tags->'recycling_type' as recycling_type,
tags->'tower:construction' as "tower:construction",
tags->'tower:type' as "tower:type",
Expand Down Expand Up @@ -1606,6 +1607,7 @@ Layer:
tags->'icao' as icao,
tags->'iata' as iata,
tags->'office' as office,
tags->'information' as information,
tags->'recycling_type' as recycling_type,
tags->'tower:construction' as "tower:construction",
tags->'tower:type' as "tower:type",
Expand Down
40 changes: 40 additions & 0 deletions symbols/guidepost.svg
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 ab57e39

Please sign in to comment.