Merge branch 'svg-prison' of https://github.com/nebulon42/openstreetm…

…ap-carto
matthijsmelissen · Jan 30, 2015 · 055e0c7 · 055e0c7
2 parents abb9c9f + ed53c6b
commit 055e0c7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/amenity-points.mss b/amenity-points.mss
@@ -360,8 +360,10 @@
   }
 
   [feature = 'amenity_prison'][zoom >= 17] {
-    point-file: url('symbols/amenity_prison.p.20.png');
-    point-placement: interior;
+    marker-file: url('symbols/prison.16.svg');
+    marker-fill: #734a08;
+    marker-placement: interior;
+    marker-clip: false;
   }
 
   [feature = 'tourism_viewpoint'][zoom >= 16] {
@@ -1501,7 +1503,7 @@
     text-name: "[name]";
     text-size: 10;
     text-fill: #734a08;
-    text-dy: 16;
+    text-dy: 12;
     text-face-name: @book-fonts;
     text-halo-radius: 1;
     text-wrap-width: @standard-wrap-width;

diff --git a/symbols/amenity_prison.p.20.png b/symbols/amenity_prison.p.20.png
diff --git a/symbols/prison.16.svg b/symbols/prison.16.svg