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

refactor and fix amenity-points #1093

Merged
merged 2 commits into from
Oct 29, 2014
Merged

refactor and fix amenity-points #1093

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fd489b
tweak text-dy so tall names are appearing
matkoniecz Oct 25, 2014
a239e3b
add standard text-wrap-width
matkoniecz Oct 26, 2014
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
42 changes: 25 additions & 17 deletions amenity-points.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,13 +438,13 @@
text-name: "[name]";
text-fill: #734a08;
text-size: 10;
text-dy: 9;
text-dy: 11;
text-face-name: @bold-fonts;
text-halo-radius: 1;
text-wrap-width: 34;
text-placement: interior;
[feature = 'amenity_bar'] {
text-dy: 11;
[feature = 'amenity_bar']{
text-dy: 13;
}
}
}
Expand All @@ -457,12 +457,12 @@
text-name: "[name]";
text-size: 10;
text-fill: #734a08;
text-dy: 12;
text-dy: 13;
text-face-name: @bold-fonts;
text-halo-radius: 1;
text-placement: interior;
[feature = 'amenity_cinema'] {
text-dy: 14;
text-dy: 15;
}
}
}
Expand All @@ -485,7 +485,7 @@
text-name: "[name]";
text-size: 10;
text-fill: #734a08;
text-dy: 10;
text-dy: 11;
text-face-name: @book-fonts;
text-halo-radius: 1;
text-wrap-width: 30;
Expand All @@ -496,7 +496,7 @@
text-name: "[name]";
text-size: 10;
text-fill: #734a08;
text-dy: 9;
text-dy: 11;
text-face-name: @book-fonts;
text-halo-radius: 1;
text-wrap-width: 30;
Expand Down Expand Up @@ -559,7 +559,7 @@
text-name: "[name]";
text-size: 10;
text-fill: brown;
text-dy: 9;
text-dy: 11;
text-face-name: @book-fonts;
text-halo-radius: 1;
text-wrap-width: 20;
Expand Down Expand Up @@ -688,6 +688,7 @@
[zoom >= 17] {
text-name: "[name]";
text-size: 11;
text-dy: 13;
text-fill: darken(@park, 60%);
text-face-name: @book-fonts;
text-halo-radius: 1;
Expand Down Expand Up @@ -1043,15 +1044,15 @@
text-name: "[name]";
text-size: 9;
text-fill: #6699cc;
text-dy: 10;
text-dy: 11;
text-face-name: @book-fonts;
text-halo-radius: 1;
text-placement: interior;
[zoom >= 16] {
ele/text-name: "[ele]";
ele/text-size: 8;
ele/text-fill: #6699cc;
ele/text-dy: 22;
ele/text-dy: 23;
ele/text-face-name: @oblique-fonts;
ele/text-halo-radius: 1;
ele/text-placement: interior;
Expand All @@ -1062,14 +1063,14 @@
text-name: "[name]";
text-size: 9;
text-fill: #6699cc;
text-dy: 10;
text-dy: 11;
text-face-name: @book-fonts;
text-halo-radius: 1;
text-placement: interior;
ele/text-name: "[ele]";
ele/text-size: 8;
ele/text-fill: #6699cc;
ele/text-dy: 22;
ele/text-dy: 23;
ele/text-face-name: @oblique-fonts;
ele/text-halo-radius: 1;
ele/text-placement: interior;
Expand All @@ -1079,7 +1080,7 @@
text-name: "[name]";
text-size: 9;
text-fill: black;
text-dy: 9;
text-dy: 12;
text-halo-radius: 1;
text-placement: interior;
text-face-name: @book-fonts;
Expand All @@ -1093,18 +1094,21 @@
text-name: "[name]";
text-size: 10;
text-fill: #0066ff;
text-dy: 11;
text-dy: 13;
text-face-name: @book-fonts;
text-halo-radius: 1;
text-placement: interior;
[feature = 'tourism_chalet'] {
text-dy: 11;
}
}
}

[feature = 'amenity_embassy'][zoom >= 17] {
text-name: "[name]";
text-size: 9;
text-fill: #0066ff;
text-dy: 8;
text-dy: 9;
text-face-name: @book-fonts;
text-halo-radius: 1;
text-placement: interior;
Expand All @@ -1127,10 +1131,13 @@
text-name: "[name]";
text-size: 9;
text-fill: @transportation-text;
text-dy: 9;
text-dy: 11;
text-face-name: @book-fonts;
text-halo-radius: 1;
text-placement: interior;
[feature = 'highway_bus_stop'] {
text-dy: 9;
}
}
}

Expand All @@ -1153,6 +1160,7 @@
[way_pixels > 12000] { text-size: @landcover-font-size-big; }
[way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
text-fill: darken(@campsite, 50%);
text-dy: 15;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this also sufficient for the larger font sizes?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably no, my script was checking only for rendering of nodes. I am planning on making next one that will be able to do the same with areas.

text-face-name: @landcover-face-name;
text-halo-radius: 1;
text-halo-fill: rgba(255,255,255,0.6);
Expand Down Expand Up @@ -1208,7 +1216,7 @@
[feature = 'tourism_museum'][zoom >= 17] {
text-name: "[name]";
text-size: 10;
text-dy: 10;
text-dy: 11;
text-fill: #734a08;
text-face-name: @book-fonts;
text-halo-radius: 1;
Expand Down
4 changes: 2 additions & 2 deletions roads.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1809,9 +1809,9 @@
[zoom >= 17] {
text-size: 11;
/* Offset name on traffic_signals on zoomlevels where they are displayed
in order not to hide the icon */
in order not to hide the text */
[highway = 'traffic_signals'] {
text-dy: 11;
text-dy: 13;
}
}
}
Expand Down