major rewrite of amenity-points, labels are tied to icons with shield…

…s, a second pass of only icons fills up free space, dy was harmonized, restructuring of code to avoid repetition, fixes gravitystorm#234
nebulon42 · May 1, 2017 · fdb6d26 · fdb6d26
1 parent ac32087
commit fdb6d26
Show file tree

Hide file tree

Showing 143 changed files with 2,240 additions and 2,427 deletions.
diff --git a/amenity-points.mss b/amenity-points.mss
diff --git a/landcover.mss b/landcover.mss
diff --git a/placenames.mss b/placenames.mss
@@ -397,3 +397,22 @@
   }
 }
 
+.text-low-zoom[zoom < 10],
+.text[zoom >= 10] {
+  [feature = 'place_island'][zoom >= 7][way_pixels > 3000][way_pixels < 800000],
+  [feature = 'place_island'][zoom >= 16][way_pixels < 800000],
+  [feature = 'place_islet'][zoom >= 14][way_pixels > 3000][way_pixels < 800000],
+  [feature = 'place_islet'][zoom >= 17][way_pixels < 800000] {
+    text-name: "[name]";
+    text-fill: #000;
+    text-size: @standard-text-size;
+    [way_pixels > 12000] { text-size: 12; }
+    [way_pixels > 48000] { text-size: 15; }
+    text-face-name: @oblique-fonts;
+    text-halo-radius: @standard-halo-radius;
+    text-halo-fill: @standard-halo-fill;
+    text-wrap-width: @standard-wrap-width;
+    text-placement: interior;
+  }
+}
+
diff --git a/project.mml b/project.mml
diff --git a/symbols/aerodrome.12.svg b/symbols/aerodrome.12.svg
diff --git a/symbols/archaeological_site.svg b/symbols/archaeological_site.svg
diff --git a/symbols/arts_centre.svg b/symbols/arts_centre.svg
diff --git a/symbols/artwork.svg b/symbols/artwork.svg
diff --git a/symbols/atm.svg b/symbols/atm.svg
diff --git a/symbols/bank.svg b/symbols/bank.svg
diff --git a/symbols/bar.svg b/symbols/bar.svg
diff --git a/symbols/bench.svg b/symbols/bench.svg
diff --git a/symbols/bicycle_parking.svg b/symbols/bicycle_parking.svg
diff --git a/symbols/biergarten.svg b/symbols/biergarten.svg
diff --git a/symbols/buddhist.svg b/symbols/buddhist.svg
diff --git a/symbols/bus_stop.12.svg b/symbols/bus_stop.12.svg
diff --git a/symbols/cafe.svg b/symbols/cafe.svg
diff --git a/symbols/camping.svg b/symbols/camping.svg
diff --git a/symbols/car_wash.svg b/symbols/car_wash.svg
diff --git a/symbols/caravan_park.svg b/symbols/caravan_park.svg
diff --git a/symbols/charging_station.svg b/symbols/charging_station.svg
diff --git a/symbols/christian.9.svg b/symbols/christian.9.svg
diff --git a/symbols/christian.svg b/symbols/christian.svg