Skip to content

Commit

Permalink
Rendering dots for gastronomy on z17 (#3475)
Browse files Browse the repository at this point in the history
  • Loading branch information
@kocio-pl
kocio-pl authored Oct 26, 2018
1 parent 59c47c4 commit 9d16b99
Showing 1 changed file with 65 additions and 78 deletions.
143 changes: 65 additions & 78 deletions amenity-points.mss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,17 +76,49 @@
marker-placement: interior;
marker-clip: false;
}

[feature = 'amenity_internet_cafe'][zoom >= 17] {
marker-file: url('symbols/amenity/internet_cafe.svg');
marker-fill: @amenity-brown;

[feature = 'amenity_bar'][zoom >= 17],
[feature = 'amenity_biergarten'][zoom >= 17],
[feature = 'amenity_cafe'][zoom >= 17],
[feature = 'amenity_fast_food'][zoom >= 17],
[feature = 'amenity_food_court'][zoom >= 17],
[feature = 'amenity_ice_cream'][zoom >= 17],
[feature = 'amenity_pub'][zoom >= 17],
[feature = 'amenity_restaurant'][zoom >= 17] {
marker-placement: interior;
marker-clip: false;
marker-fill: @gastronomy-icon;
[feature != 'amenity_food_court'][zoom = 17] {
marker-width: 4;
marker-line-width: 0;
}
[feature = 'amenity_bar'][zoom >= 18] {
marker-file: url('symbols/amenity/bar.svg');
}
[feature = 'amenity_biergarten'][zoom >= 18] {
marker-file: url('symbols/amenity/biergarten.svg');
}
[feature = 'amenity_cafe'][zoom >= 18] {
marker-file: url('symbols/amenity/cafe.svg');
}
[feature = 'amenity_fast_food'][zoom >= 18] {
marker-file: url('symbols/amenity/fast_food.svg');
}
[feature = 'amenity_food_court'][zoom >= 17],
[feature = 'amenity_restaurant'][zoom >= 18] {
marker-file: url('symbols/amenity/restaurant.svg');
}
[feature = 'amenity_ice_cream'][zoom >= 18] {
marker-file: url('symbols/shop/ice_cream.svg');
}
[feature = 'amenity_pub'][zoom >= 18] {
marker-file: url('symbols/amenity/pub.svg');
}
}

[feature = 'amenity_bar'][zoom >= 17] {
marker-file: url('symbols/amenity/bar.svg');
marker-fill: @gastronomy-icon;
[feature = 'amenity_internet_cafe'][zoom >= 17] {
marker-file: url('symbols/amenity/internet_cafe.svg');
marker-fill: @amenity-brown;
marker-placement: interior;
marker-clip: false;
}
Expand Down Expand Up @@ -156,13 +188,6 @@
marker-clip: false;
}

[feature = 'amenity_cafe'][zoom >= 17] {
marker-file: url('symbols/amenity/cafe.svg');
marker-fill: @gastronomy-icon;
marker-placement: interior;
marker-clip: false;
}

[feature = 'tourism_artwork'][zoom >= 17] {
marker-file: url('symbols/tourism/artwork.svg');
marker-fill: @memorials;
Expand Down Expand Up @@ -229,7 +254,7 @@

[feature = 'amenity_nightclub'][zoom >= 17] {
marker-file: url('symbols/amenity/nightclub.svg');
marker-fill: @gastronomy-icon;
marker-fill: @amenity-brown;
marker-placement: interior;
marker-clip: false;
}
Expand Down Expand Up @@ -345,13 +370,6 @@
marker-fill: @accommodation-icon;
}

[feature = 'amenity_ice_cream'][zoom >= 17] {
marker-file: url('symbols/shop/ice_cream.svg');
marker-fill: @gastronomy-icon;
marker-placement: interior;
marker-clip: false;
}

[feature = 'tourism_information'][zoom >= 19],
[feature = 'tourism_information']["information"='office'][zoom >= 17] {
marker-file: url('symbols/tourism/information.svg');
Expand Down Expand Up @@ -683,20 +701,6 @@
marker-clip: false;
}

[feature = 'amenity_pub'][zoom >= 17] {
marker-file: url('symbols/amenity/pub.svg');
marker-fill: @gastronomy-icon;
marker-placement: interior;
marker-clip: false;
}

[feature = 'amenity_biergarten'][zoom >= 17] {
marker-file: url('symbols/amenity/biergarten.svg');
marker-fill: @gastronomy-icon;
marker-placement: interior;
marker-clip: false;
}

[feature = 'amenity_recycling'][recycling_type = 'centre'][zoom >= 17],
[feature = 'amenity_recycling'][zoom >= 19] {
marker-file: url('symbols/amenity/recycling.svg');
Expand All @@ -708,21 +712,6 @@
}
}

[feature = 'amenity_restaurant'][zoom >= 17],
[feature = 'amenity_food_court'][zoom >= 17] {
marker-file: url('symbols/amenity/restaurant.svg');
marker-fill: @gastronomy-icon;
marker-placement: interior;
marker-clip: false;
}

[feature = 'amenity_fast_food'][zoom >= 17] {
marker-file: url('symbols/amenity/fast_food.svg');
marker-fill: @gastronomy-icon;
marker-placement: interior;
marker-clip: false;
}

[feature = 'amenity_telephone'][zoom >= 17] {
marker-file: url('symbols/amenity/telephone.svg');
marker-fill: @amenity-brown;
Expand Down Expand Up @@ -1613,32 +1602,26 @@
text-placement: interior;
}

[feature = 'amenity_pub'],
[feature = 'amenity_restaurant'],
[feature = 'amenity_food_court'],
[feature = 'amenity_cafe'],
[feature = 'amenity_fast_food'],
[feature = 'amenity_biergarten'],
[feature = 'amenity_bar'],
[feature = 'amenity_ice_cream'],
[feature = 'amenity_nightclub'] {
[zoom >= 17] {
text-name: "[name]";
text-fill: @gastronomy-text;
text-size: @standard-font-size;
text-wrap-width: @standard-wrap-width;
text-line-spacing: @standard-line-spacing-size;
text-dy: 11;
text-face-name: @standard-font;
text-halo-radius: @standard-halo-radius;
text-halo-fill: @standard-halo-fill;
text-placement: interior;
[feature = 'amenity_bar']{
text-dy: 13;
}
[feature = 'amenity_nightclub']{
text-dy: 12;
}
[feature = 'amenity_pub'][zoom >= 18],
[feature = 'amenity_restaurant'][zoom >= 18],
[feature = 'amenity_food_court'][zoom >= 17],
[feature = 'amenity_cafe'][zoom >= 18],
[feature = 'amenity_fast_food'][zoom >= 18],
[feature = 'amenity_biergarten'][zoom >= 18],
[feature = 'amenity_bar'][zoom >= 18],
[feature = 'amenity_ice_cream'][zoom >= 18] {
text-name: "[name]";
text-fill: @gastronomy-text;
text-size: @standard-font-size;
text-wrap-width: @standard-wrap-width;
text-line-spacing: @standard-line-spacing-size;
text-dy: 11;
text-face-name: @standard-font;
text-halo-radius: @standard-halo-radius;
text-halo-fill: @standard-halo-fill;
text-placement: interior;
[feature = 'amenity_bar'] {
text-dy: 13;
}
}

Expand All @@ -1648,7 +1631,8 @@
[feature = 'amenity_cinema'],
[feature = 'amenity_arts_centre'],
[feature = 'amenity_community_centre'],
[feature = 'historic_archaeological_site'] {
[feature = 'historic_archaeological_site'],
[feature = 'amenity_nightclub'] {
[zoom >= 17] {
text-name: "[name]";
text-size: @standard-font-size;
Expand All @@ -1661,6 +1645,9 @@
text-halo-radius: @standard-halo-radius;
text-halo-fill: @standard-halo-fill;
text-placement: interior;
[feature = 'amenity_nightclub']{
text-dy: 12;
}
}
}

Expand Down

0 comments on commit 9d16b99

Please sign in to comment.