Update maki

css/feature-icons.css

@@ -22,8 +22,8 @@
 .feature-airport{background-position:-54px -72px;}
 .feature-heliport{background-position:-108px -72px;}
 .feature-rail{background-position:-162px -72px;}
-.feature-rail-underground{background-position:-216px -72px;}
-.feature-rail-above{background-position:-0px -96px;}
+.feature-rail-metro{background-position:-216px -72px;}
+.feature-rail-light{background-position:-0px -96px;}
 .feature-bus{background-position:-54px -96px;}
 .feature-fuel{background-position:-108px -96px;}
 .feature-parking{background-position:-162px -96px;}
@@ -101,9 +101,18 @@
 .feature-dog-park{background-position:-0px -456px;}
 .feature-lighthouse{background-position:-54px -456px;}
 .feature-clothing-store{background-position:-108px -456px;}
-.feature-london-underground{background-position:-162px -456px;}
-.feature-minefield{background-position:-216px -456px;}
-.feature-camera{background-position:-0px -480px;}
+.feature-polling-place{background-position:-162px -456px;}
+.feature-playground{background-position:-216px -456px;}
+.feature-entrance{background-position:-0px -480px;}
+.feature-heart{background-position:-54px -480px;}
+.feature-london-underground{background-position:-108px -480px;}
+.feature-minefield{background-position:-162px -480px;}
+.feature-rail-underground{background-position:-216px -480px;}
+.feature-rail-above{background-position:-0px -504px;}
+.feature-camera{background-position:-54px -504px;}
+.feature-laundry{background-position:-108px -504px;}
+.feature-car{background-position:-162px -504px;}
+.feature-suitcase{background-position:-216px -504px;}
 .preset-icon-line.feature-highway-motorway{background-position:-20px -25px;}
 .preset-icon-line.feature-highway-trunk{background-position:-80px -25px;}
 .preset-icon-line.feature-highway-primary{background-position:-140px -25px;}

data/presets/presets/amenity/car_rental.json

@@ -1,4 +1,5 @@
 {
+    "icon": "car",
     "geometry": [
         "point",
         "area"

data/presets/presets/amenity/car_sharing.json

@@ -1,4 +1,5 @@
 {
+    "icon": "car",
     "geometry": [
         "point",
         "area"

data/presets/presets/barrier/entrance.json

@@ -1,4 +1,5 @@
 {
+    "icon": "entrance",
     "geometry": [
         "vertex"
     ],

data/presets/presets/building/entrance.json

@@ -1,4 +1,5 @@
 {
+    "icon": "entrance",
     "geometry": [
         "vertex"
     ],

data/presets/presets/entrance.json

@@ -1,4 +1,5 @@
 {
+    "icon": "entrance",
     "geometry": [
         "vertex"
     ],
@@ -10,4 +11,4 @@
         "address"
     ],
     "name": "Entrance"
-}
+}

data/presets/presets/leisure/playground.json

@@ -1,4 +1,5 @@
 {
+    "icon": "playground",
     "geometry": [
         "point",
         "area"

data/presets/presets/office/travel_agent.json

@@ -1,5 +1,5 @@
 {
-    "icon": "commercial",
+    "icon": "suitcase",
     "fields": [
         "address",
         "opening_hours"

data/presets/presets/railway/subway_entrance.json

@@ -1,5 +1,5 @@
 {
-    "icon": "rail-underground",
+    "icon": "rail-metro",
     "geometry": [
         "point"
     ],

data/presets/presets/shop/car.json

@@ -1,5 +1,5 @@
 {
-    "icon": "shop",
+    "icon": "car",
     "fields": [
         "address",
         "opening_hours"

data/presets/presets/shop/laundry.json

@@ -1,5 +1,5 @@
 {
-    "icon": "shop",
+    "icon": "laundry",
     "fields": [
         "address",
         "building_area",

data/presets/presets/shop/travel_agency.json

@@ -1,5 +1,5 @@
 {
-    "icon": "shop",
+    "icon": "suitcase",
     "fields": [
         "address",
         "building_area",

package.json

@@ -23,7 +23,7 @@
     "d3": "3.3.8",
     "smash": "0.0",
     "uglify-js": "~2.2.5",
-    "maki": "0.3",
+    "maki": "0.4",
     "jshint": "2.3.0",
     "mocha": "~1.12",
     "mocha-phantomjs": "~3.1.0",