Skip to content

Commit

Permalink
Merge pull request #1093 from mkoniecz/ce
Browse files Browse the repository at this point in the history 
refactor and fix amenity-points
  • Loading branch information
@gravitystorm
gravitystorm committed Oct 29, 2014
2 parents b6db4ed + a239e3b commit 323b392
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 41 deletions.
100 changes: 61 additions & 39 deletions amenity-points.mss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
@landcover-wrap-width-size-bigger: 45;
@landcover-face-name: @oblique-fonts;

@standard-wrap-width: 30;

.points {
[feature = 'tourism_alpine_hut'][zoom >= 13] {
point-file: url('symbols/alpinehut.p.16.png');
Expand Down Expand Up @@ -425,6 +427,7 @@
[way_pixels > 48000] { text-size: 15; }
text-face-name: @oblique-fonts;
text-halo-radius: 1;
text-wrap-width: @standard-wrap-width;
text-placement: interior;
}

Expand All @@ -438,13 +441,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-wrap-width: @standard-wrap-width;
text-placement: interior;
[feature = 'amenity_bar'] {
text-dy: 11;
[feature = 'amenity_bar']{
text-dy: 13;
}
}
}
Expand All @@ -457,12 +460,13 @@
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-wrap-width: @standard-wrap-width;
text-placement: interior;
[feature = 'amenity_cinema'] {
text-dy: 14;
text-dy: 15;
}
}
}
Expand All @@ -474,7 +478,7 @@
text-dy: 9;
text-face-name: @book-fonts;
text-halo-radius: 1;
text-wrap-width: 34;
text-wrap-width: @standard-wrap-width;
text-placement: interior;
[access != ''][access != 'public'][access != 'yes'] {
text-fill: #66ccaf;
Expand All @@ -485,21 +489,21 @@
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;
text-wrap-width: @standard-wrap-width;
text-placement: interior;
}

[feature = 'amenity_fire_station'][zoom >= 17] {
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;
text-wrap-width: @standard-wrap-width;
text-placement: interior;
}

Expand All @@ -510,7 +514,7 @@
text-dy: 12;
text-face-name: @book-fonts;
text-halo-radius: 1;
text-wrap-width: 30;
text-wrap-width: @standard-wrap-width;
text-placement: interior;
}

Expand Down Expand Up @@ -541,6 +545,7 @@
text-dy: 7;
text-face-name: @book-fonts;
text-halo-radius: 1;
text-wrap-width: @standard-wrap-width;
text-placement: interior;
ele/text-name: "[ele]";
ele/text-size: 9;
Expand All @@ -559,10 +564,10 @@
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;
text-wrap-width: @standard-wrap-width;
text-placement: interior;
}

Expand All @@ -573,7 +578,7 @@
text-dy: 13;
text-face-name: @book-fonts;
text-halo-radius: 1;
text-wrap-width: 20;
text-wrap-width: @standard-wrap-width;
text-placement: interior;
}

Expand All @@ -584,7 +589,7 @@
text-dy: 15;
text-face-name: @book-fonts;
text-halo-radius: 1;
text-wrap-width: 20;
text-wrap-width: @standard-wrap-width;
text-placement: interior;
}

Expand All @@ -605,7 +610,7 @@
text-fill: @water-text;
text-face-name: @oblique-fonts;
text-halo-radius: 1;
text-wrap-width: 20;
text-wrap-width: @standard-wrap-width;
text-placement: interior;
}
}
Expand Down Expand Up @@ -688,11 +693,12 @@
[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;
text-halo-fill: rgba(255,255,255,0.6);
text-wrap-width: 30;
text-wrap-width: @standard-wrap-width;
text-placement: interior;
}
}
Expand Down Expand Up @@ -1024,7 +1030,7 @@
text-fill: #6699cc;
text-face-name: @book-fonts;
text-halo-radius: 1;
text-wrap-width: 20;
text-wrap-width: @standard-wrap-width;
text-placement: interior;
}

Expand All @@ -1034,7 +1040,7 @@
text-fill: #6699cc;
text-face-name: @book-fonts;
text-halo-radius: 1;
text-wrap-width: 20;
text-wrap-width: @standard-wrap-width;
text-placement: interior;
text-dy: 6;
}
Expand All @@ -1043,15 +1049,16 @@
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-wrap-width: @standard-wrap-width;
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 +1069,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-wrap-width: @standard-wrap-width;
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,8 +1087,9 @@
text-name: "[name]";
text-size: 9;
text-fill: black;
text-dy: 9;
text-dy: 12;
text-halo-radius: 1;
text-wrap-width: @standard-wrap-width;
text-placement: interior;
text-face-name: @book-fonts;
}
Expand All @@ -1093,20 +1102,25 @@
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-wrap-width: @standard-wrap-width;
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-wrap-width: @standard-wrap-width;
text-placement: interior;
}

Expand All @@ -1117,6 +1131,7 @@
text-dy: 10;
text-face-name: @book-fonts;
text-halo-radius: 1;
text-wrap-width: @standard-wrap-width;
text-placement: interior;
}

Expand All @@ -1127,10 +1142,14 @@
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-wrap-width: @standard-wrap-width;
text-placement: interior;
[feature = 'highway_bus_stop'] {
text-dy: 9;
}
}
}

Expand All @@ -1141,7 +1160,7 @@
text-dy: 15;
text-face-name: @book-fonts;
text-halo-radius: 1;
text-wrap-width: 70;
text-wrap-width: @standard-wrap-width;
text-placement: interior;
}

Expand All @@ -1153,6 +1172,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;
text-face-name: @landcover-face-name;
text-halo-radius: 1;
text-halo-fill: rgba(255,255,255,0.6);
Expand All @@ -1170,7 +1190,7 @@
text-fill: #0066ff;
text-face-name: @book-fonts;
text-halo-radius: 1;
text-wrap-width: 70;
text-wrap-width: @standard-wrap-width;
text-placement: interior;
}

Expand All @@ -1180,7 +1200,7 @@
text-fill: @marina-text;
text-face-name: @book-fonts;
text-halo-radius: 1;
text-wrap-width: 30;
text-wrap-width: @standard-wrap-width;
text-placement: interior;
[zoom >= 17] {
text-size: 10;
Expand Down Expand Up @@ -1208,10 +1228,11 @@
[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;
text-wrap-width: @standard-wrap-width;
text-placement: interior;
}

Expand All @@ -1222,6 +1243,7 @@
text-dy: 16;
text-face-name: @book-fonts;
text-halo-radius: 1;
text-wrap-width: @standard-wrap-width;
text-placement: interior;
}

Expand Down Expand Up @@ -1305,7 +1327,7 @@
text-dy: 16;
text-face-name: @book-fonts;
text-halo-radius: 2;
text-wrap-width: 12;
text-wrap-width: @standard-wrap-width;
text-placement: interior;
}

Expand All @@ -1316,7 +1338,7 @@
text-dy: 12;
text-face-name: @book-fonts;
text-halo-radius: 1;
text-wrap-width: 20;
text-wrap-width: @standard-wrap-width;
text-placement: interior;
}

Expand All @@ -1327,7 +1349,7 @@
text-dy: 10;
text-face-name: @book-fonts;
text-halo-radius: 2;
text-wrap-width: 24;
text-wrap-width: @standard-wrap-width;
text-placement: interior;
}

Expand All @@ -1338,7 +1360,7 @@
text-fill: #da0092;
text-face-name: @book-fonts;
text-halo-radius: 1;
text-wrap-width: 12;
text-wrap-width: @standard-wrap-width;
text-placement: interior;
}

Expand All @@ -1361,7 +1383,7 @@
text-fill: #939;
text-face-name: @book-fonts;
text-halo-radius: 1;
text-wrap-width: 12;
text-wrap-width: @standard-wrap-width;
text-placement: interior;
}
}
Expand All @@ -1375,7 +1397,7 @@
text-fill: #939;
text-face-name: @book-fonts;
text-halo-radius: 1;
text-wrap-width: 20;
text-wrap-width: @standard-wrap-width;
text-placement: interior;
}
}
Expand Down Expand Up @@ -1422,7 +1444,7 @@
text-fill: #aa66cc;
text-face-name: @book-fonts;
text-halo-radius: 1;
text-wrap-width: 10;
text-wrap-width: @standard-wrap-width;
text-placement: interior;
}

Expand Down
Loading

0 comments on commit 323b392

Please sign in to comment.