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

Jump to bottom

Stop label rendering for too big areas #3764

Merged
merged 1 commit into from
Apr 29, 2019
Merged

Stop label rendering for too big areas #3764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
58 changes: 29 additions & 29 deletions amenity-points.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1744,10 +1744,10 @@
/* Note that these layers are also used in water.mss */
.text-low-zoom[zoom < 10],
#text-point[zoom >= 10] {
[feature = 'place_island'][zoom >= 4][way_pixels > 3000][way_pixels < 800000],
[feature = 'place_island'][zoom >= 16][way_pixels < 800000],
[feature = 'place_islet'][zoom >= 11][way_pixels > 3000][way_pixels < 800000],
[feature = 'place_islet'][zoom >= 17][way_pixels < 800000] {
[feature = 'place_island'][zoom >= 4][way_pixels > 3000][way_pixels <= 768000],
[feature = 'place_island'][zoom >= 16][way_pixels <= 768000],
[feature = 'place_islet'][zoom >= 11][way_pixels > 3000][way_pixels <= 768000],
[feature = 'place_islet'][zoom >= 17][way_pixels <= 768000] {
text-name: "[name]";
text-fill: #000;
text-size: @landcover-font-size;
Expand Down Expand Up @@ -2184,8 +2184,8 @@
}

[feature = 'leisure_swimming_pool'][is_building = 'no'] {
[zoom >= 14][way_pixels > 3000],
[zoom >= 17] {
[zoom >= 14][way_pixels > 3000][way_pixels <= 768000],
[zoom >= 17][way_pixels <= 768000] {
text-name: "[name]";
text-size: @landcover-font-size;
text-wrap-width: @landcover-wrap-width-size;
Expand Down Expand Up @@ -2239,8 +2239,8 @@
[feature = 'leisure_nature_reserve'],
[feature = 'boundary_aboriginal_lands'],
[feature = 'boundary_protected_area'] {
[zoom >= 8][way_pixels > 3000][is_building = 'no'],
[zoom >= 17] {
[zoom >= 8][way_pixels > 3000][way_pixels <= 768000][is_building = 'no'],
[zoom >= 17][way_pixels <= 768000] {
text-name: "[name]";
text-size: @landcover-font-size;
text-wrap-width: @landcover-wrap-width-size;
Expand Down Expand Up @@ -2278,8 +2278,8 @@
}

[feature = 'military_danger_area'][is_building = 'no'] {
[zoom >= 9][way_pixels > 3000],
[zoom >= 17] {
[zoom >= 9][way_pixels > 3000][way_pixels <= 768000],
[zoom >= 17][way_pixels <= 768000] {
text-name: "[name]";
text-size: @landcover-font-size;
text-wrap-width: @landcover-wrap-width-size;
Expand All @@ -2303,8 +2303,8 @@
}

[feature = 'landuse_garages'][is_building = 'no'] {
[zoom >= 13][way_pixels > 3000],
[zoom >= 17] {
[zoom >= 13][way_pixels > 3000][way_pixels <= 768000],
[zoom >= 17][way_pixels <= 768000] {
text-name: "[name]";
text-size: @landcover-font-size;
text-wrap-width: @landcover-wrap-width-size;
Expand Down Expand Up @@ -2380,10 +2380,10 @@
[feature = 'leisure_dog_park'],
[feature = 'leisure_ice_rink'],
[feature = 'leisure_pitch'] {
[zoom >= 10][way_pixels > 3000][is_building = 'no'],
[zoom >= 17][is_building = 'no'],
[zoom >= 10][way_pixels > 3000][feature = 'shop_mall'],
[zoom >= 17][feature = 'shop_mall'] {
[zoom >= 10][way_pixels > 3000][way_pixels <= 768000][is_building = 'no'],
[zoom >= 17][way_pixels <= 768000][is_building = 'no'],
[zoom >= 10][way_pixels > 3000][way_pixels <= 768000][feature = 'shop_mall'],
[zoom >= 17][way_pixels <= 768000][feature = 'shop_mall'] {
text-name: "[name]";
text-size: @landcover-font-size;
text-wrap-width: @landcover-wrap-width-size;
Expand Down Expand Up @@ -2648,8 +2648,8 @@
}

[feature = 'leisure_marina'][zoom >= 15] {
[zoom >= 10][way_pixels > 3000],
[zoom >= 17] {
[zoom >= 10][way_pixels > 3000][way_pixels <= 768000],
[zoom >= 17][way_pixels <= 768000] {
text-name: "[name]";
text-size: @landcover-font-size;
text-wrap-width: @landcover-wrap-width-size;
Expand Down Expand Up @@ -3024,8 +3024,8 @@
[feature = 'power_generator'][is_building = 'no']["generator:source" != 'wind'][zoom >= 10],
[feature = 'power_sub_station'][is_building = 'no'][zoom >= 13],
[feature = 'power_substation'][is_building = 'no'][zoom >= 13]{
[way_pixels > 3000],
[zoom >= 17] {
[way_pixels > 3000][way_pixels <= 768000],
[zoom >= 17][way_pixels <= 768000] {
text-name: "[name]";
text-size: @landcover-font-size;
text-wrap-width: @landcover-wrap-width-size;
Expand All @@ -3052,8 +3052,8 @@
[feature = 'natural_shingle'][zoom >= 9],
[feature = 'natural_bare_rock'],
[feature = 'natural_sand'] {
[zoom >= 8][way_pixels > 3000][is_building = 'no'],
[zoom >= 17][is_building = 'no'] {
[zoom >= 8][way_pixels > 3000][way_pixels <= 768000][is_building = 'no'],
[zoom >= 17][way_pixels <= 768000][is_building = 'no'] {
text-name: "[name]";
text-size: @landcover-font-size;
text-wrap-width: @landcover-wrap-width-size;
Expand Down Expand Up @@ -3084,8 +3084,8 @@
}

[feature = 'aeroway_apron'][is_building = 'no'] {
[zoom >= 10][way_pixels > 3000],
[zoom >= 17] {
[zoom >= 10][way_pixels > 3000][way_pixels <= 768000],
[zoom >= 17][way_pixels <= 768000] {
text-name: "[name]";
text-size: @landcover-font-size;
text-wrap-width: @landcover-wrap-width-size;
Expand All @@ -3110,8 +3110,8 @@

[feature = 'highway_services'][is_building = 'no'],
[feature = 'highway_rest_area'][is_building = 'no'] {
[zoom >= 10][way_pixels > 3000],
[zoom >= 17] {
[zoom >= 10][way_pixels > 3000][way_pixels <= 768000],
[zoom >= 17][way_pixels <= 768000] {
text-name: "[name]";
text-size: @landcover-font-size;
text-wrap-width: @landcover-wrap-width-size;
Expand All @@ -3135,9 +3135,9 @@
}

[feature = 'natural_glacier'][is_building = 'no'] {
[zoom >= 8][way_pixels > 10000],
[zoom >= 10][way_pixels > 750],
[zoom >= 17] {
[zoom >= 8][way_pixels > 10000][way_pixels <= 768000],
[zoom >= 10][way_pixels > 750][way_pixels <= 768000],
[zoom >= 17][way_pixels <= 768000] {
text-name: "[name]";
text-size: @landcover-font-size;
text-wrap-width: @landcover-wrap-width-size;
Expand Down
2 changes: 1 addition & 1 deletion roads.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2672,7 +2672,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */

#bridge-text {
[man_made = 'bridge'] {
[zoom >= 12][way_pixels > 62.5] {
[zoom >= 12][way_pixels > 62.5][way_pixels <= 64000] {
text-name: "[name]";
text-size: 10;
text-wrap-width: 30; // 3 em
Expand Down
2 changes: 1 addition & 1 deletion water.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@
[feature = 'landuse_reservoir'],
[feature = 'landuse_basin'],
[feature = 'waterway_dock'] {
[zoom >= 0][way_pixels > 3000],
[zoom >= 0][way_pixels > 3000][way_pixels <= 768000],
[zoom >= 17] {
text-name: "[name]";
text-size: 10;
Expand Down