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

Revert "Revised min zoom visibility for some elements" #3

Merged
merged 1 commit into from
May 30, 2016
Merged

Revert "Revised min zoom visibility for some elements" #3

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
8 changes: 3 additions & 5 deletions addressing.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,11 @@
}
}

// ircama: revised zoom and text size
#building-text {
[zoom >= 14],
[zoom >= 13][way_pixels > 3000] {
[zoom >= 14][way_pixels > 3000],
[zoom >= 17] {
text-name: "[name]";
text-size: 8;
[zoom >= 17] { text-size: 11; }
text-size: 11;
text-fill: #444;
text-face-name: @book-fonts;
text-halo-radius: 1;
Expand Down
27 changes: 8 additions & 19 deletions amenity-points.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,9 @@
marker-clip: false;
}

// Ircama (revised zoom for tourism_chalet; allowed it at lower zoom, but with reduced size)
[feature = 'tourism_chalet'][zoom >= 13] {
[feature = 'tourism_chalet'][zoom >= 17] {
point-file: url('symbols/chalet.p.16.png');
point-placement: interior;
[zoom <= 15] { point-transform:"scale(0.9)"; } // ircama: this reduces the size of the symbol for lower zooms
}

[feature = 'amenity_cinema'][zoom >= 16] {
Expand Down Expand Up @@ -358,8 +356,7 @@
marker-clip: false;
}

// ircama: reduce zoom to 14 to mark references in the Alpes (with reduced size)
[feature = 'amenity_place_of_worship'][zoom >= 14] {
[feature = 'amenity_place_of_worship'][zoom >= 16] {
marker-file: url('symbols/place_of_worship.16.svg');
marker-fill: #000000;
marker-placement: interior;
Expand Down Expand Up @@ -391,7 +388,6 @@
[religion = 'taoist'] {
marker-file: url('symbols/taoist.16.svg');
}
[zoom <= 15] { marker-transform:"scale(0.8)"; } // ircama: this reduces the size of the symbol for lower zooms
}

[feature = 'man_made_cross'][zoom >= 17],
Expand Down Expand Up @@ -504,13 +500,11 @@
marker-clip: false;
}

// ircama: reduce viewpoint to zoom >=14
[feature = 'tourism_viewpoint'][zoom >= 14] {
[feature = 'tourism_viewpoint'][zoom >= 16] {
marker-file: url('symbols/viewpoint.16.svg');
marker-placement: interior;
marker-fill: @amenity-brown;
marker-clip: false;
[zoom <= 15] { marker-transform:"scale(0.8)"; } // ircama: this reduces the size of the symbol for lower zooms
}

[feature = 'man_made_water_tower'][zoom >= 17] {
Expand Down Expand Up @@ -1252,13 +1246,9 @@
text-placement: interior;
}

// ircama: reduce zoom to 14 to mark references in the Alpes; text size reduced
[feature = 'amenity_place_of_worship'][zoom >= 14] {
[feature = 'amenity_place_of_worship'][zoom >= 17] {
text-name: "[name]";
text-size: 9;
[zoom >= 17] {
text-size: 10;
}
text-fill: #000033;
text-dy: 12;
text-face-name: @book-fonts;
Expand Down Expand Up @@ -1646,7 +1636,7 @@
}

[feature = 'natural_bay'][zoom >= 14],
[feature = 'natural_spring'][zoom >= 14] {
[feature = 'natural_spring'][zoom >= 16] {
text-name: "[name]";
text-size: 10;
text-fill: @water-text;
Expand Down Expand Up @@ -1677,13 +1667,12 @@
text-face-name: @book-fonts;
}

// Ircama (revised zoom for text of tourism_chalet)
[feature = 'tourism_alpine_hut'][zoom >= 14],
[feature = 'amenity_shelter'][zoom >= 14],
[feature = 'tourism_alpine_hut'][zoom >= 15],
[feature = 'amenity_shelter'][zoom >= 17],
[feature = 'tourism_hotel'][zoom >= 17],
[feature = 'tourism_motel'][zoom >= 17],
[feature = 'tourism_hostel'][zoom >= 17],
[feature = 'tourism_chalet'][zoom >= 14],
[feature = 'tourism_chalet'][zoom >= 17],
[feature = 'tourism_guest_house'][zoom >= 17],
[feature = 'tourism_camp_site'][zoom >= 17] {
text-name: "[name]";
Expand Down
2 changes: 1 addition & 1 deletion buildings.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
[amenity = 'place_of_worship'] {
polygon-fill: @building-major-fill;
polygon-clip: false;
[zoom >= 14] {
[zoom >= 15] {
line-width: .75;
line-clip: false;
line-color: @building-major-line;
Expand Down
6 changes: 0 additions & 6 deletions water.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,6 @@
}
}

// ircama: revised text size
.text[zoom >= 10] {
[feature = 'natural_water'],
[feature = 'landuse_reservoir'],
Expand All @@ -273,11 +272,6 @@
[zoom >= 17] {
text-name: "[name]";
text-size: 12;
[way_pixels <= 4000] { text-size: 10; }
[way_pixels > 20000][zoom >=10] { text-size: 15; }
[way_pixels > 60000][zoom >=11] { text-size: 17; }
[way_pixels > 200000][zoom >=12] { text-size: 21; }
[way_pixels > 500000][zoom >=13] { text-size: 25; }
text-fill: @water-text;
text-face-name: @oblique-fonts;
text-halo-radius: 1;
Expand Down