Merge branch 'computer-icon' of https://github.com/kocio-pl/openstree…

…tmap-carto Conflicts: project.mml project.yaml
bencollinsuk · Jul 19, 2015 · ec3fbdc · ec3fbdc
2 parents d01355e + c6889a0
commit ec3fbdc
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 8 deletions.
diff --git a/amenity-points.mss b/amenity-points.mss
@@ -518,6 +518,13 @@
     }
   }
 
+  [feature = 'shop_computer'][zoom >= 17] {
+    marker-file: url('symbols/computer-14.svg');
+    marker-placement: interior;
+    marker-clip: false;
+    marker-fill: @shop-icon;
+  }
+
   [feature = 'shop_convenience'][zoom >= 17] {
     marker-file: url('symbols/shop_convenience.svg');
     marker-placement: interior;
@@ -1894,6 +1901,7 @@
   [feature = 'shop_beverages'],
   [feature = 'shop_books'],
   [feature = 'shop_clothes'],
+  [feature = 'shop_computer'],
   [feature = 'shop_fashion'],
   [feature = 'shop_convenience'],
   [feature = 'shop_confectionery'],