Merge pull request #3712 from pnorman/amenity_point_unification

Use ST_PointOnSurface for amenity points
gravitystorm · Apr 4, 2019 · fee9ce2 · fee9ce2
2 parents 712afb8 + 4ad2b6e
commit fee9ce2
Show file tree

Hide file tree

Showing 4 changed files with 207 additions and 584 deletions.
diff --git a/amenity-points.mss b/amenity-points.mss
@@ -39,8 +39,7 @@
 @standard-line-spacing-size: -1.5; // -0.15 em
 @standard-font: @book-fonts;
 
-/* Note that .points is also used in water-features.mss */
-.points {
+#amenity-points {
   [feature = 'tourism_alpine_hut'][zoom >= 13],
   [feature = 'tourism_wilderness_hut'][zoom >= 13],
   [feature = 'amenity_shelter'][zoom >= 16] {
@@ -1787,9 +1786,9 @@
   }
 }
 
-/* Note that .text is also used in water.mss */
+/* Note that these layers are also used in water.mss */
 .text-low-zoom[zoom < 10],
-.text[zoom >= 10] {
+#text-point[zoom >= 10] {
   [feature = 'natural_cape'][zoom >= 4][way_pixels > 3000][way_pixels < 800000],
   [feature = 'natural_cape'][zoom >= 16][way_pixels < 800000],
   [feature = 'place_island'][zoom >= 4][way_pixels > 3000][way_pixels < 800000],