diff --git a/css/20_map.css b/css/20_map.css
index 44c4f50ae..98674d62e 100644
--- a/css/20_map.css
+++ b/css/20_map.css
@@ -142,7 +142,7 @@ g.vertex.selected .shadow {
/* lines */
-.preset-icon .icon.other-line {
+.preset-icon .icon.iD-other-line {
color: #fff;
fill: #777;
}
diff --git a/css/30_highways.css b/css/30_highways.css
index 44b158f2f..3c29ad85d 100644
--- a/css/30_highways.css
+++ b/css/30_highways.css
@@ -42,8 +42,8 @@ path.stroke.tag-highway {
stroke-width: 5;
}
-.preset-icon .icon.highway-motorway,
-.preset-icon .icon.highway-motorway-link {
+.preset-icon .icon.iD-highway-motorway,
+.preset-icon .icon.iD-highway-motorway-link {
color: #CF2081;
fill: #70372f;
}
@@ -58,8 +58,8 @@ path.casing.tag-motorway {
stroke:#70372f;
}
-.preset-icon .icon.highway-trunk,
-.preset-icon .icon.highway-trunk-link {
+.preset-icon .icon.iD-highway-trunk,
+.preset-icon .icon.iD-highway-trunk-link {
color: #DD2F22;
fill: #70372f;
}
@@ -74,8 +74,8 @@ path.casing.tag-trunk {
stroke:#70372f;
}
-.preset-icon .icon.highway-primary,
-.preset-icon .icon.highway-primary-link {
+.preset-icon .icon.iD-highway-primary,
+.preset-icon .icon.iD-highway-primary-link {
color: #F99806;
fill: #70372f;
}
@@ -90,8 +90,8 @@ path.casing.tag-primary {
stroke:#70372f;
}
-.preset-icon .icon.highway-secondary,
-.preset-icon .icon.highway-secondary-link {
+.preset-icon .icon.iD-highway-secondary,
+.preset-icon .icon.iD-highway-secondary-link {
color: #F3F312;
fill: #70372f;
}
@@ -106,8 +106,8 @@ path.casing.tag-secondary {
stroke:#70372f;
}
-.preset-icon .icon.highway-tertiary,
-.preset-icon .icon.highway-tertiary-link {
+.preset-icon .icon.iD-highway-tertiary,
+.preset-icon .icon.iD-highway-tertiary-link {
color: #FFF9B3;
fill: #70372f;
}
@@ -122,8 +122,8 @@ path.casing.tag-tertiary {
stroke:#70372f;
}
-.legacy-carto .preset-icon .icon.highway-motorway,
-.legacy-carto .preset-icon .icon.highway-motorway-link {
+.legacy-carto .preset-icon .icon.iD-highway-motorway,
+.legacy-carto .preset-icon .icon.iD-highway-motorway-link {
color: #58a9ed;
fill: #2c5476;
}
@@ -138,8 +138,8 @@ path.casing.tag-tertiary {
stroke:#2c5476;
}
-.legacy-carto .preset-icon .icon.highway-trunk,
-.legacy-carto .preset-icon .icon.highway-trunk-link {
+.legacy-carto .preset-icon .icon.iD-highway-trunk,
+.legacy-carto .preset-icon .icon.iD-highway-trunk-link {
color: #8cd05f;
fill: #46682f;
}
@@ -154,8 +154,8 @@ path.casing.tag-tertiary {
stroke:#46682f;
}
-.legacy-carto .preset-icon .icon.highway-primary,
-.legacy-carto .preset-icon .icon.highway-primary-link {
+.legacy-carto .preset-icon .icon.iD-highway-primary,
+.legacy-carto .preset-icon .icon.iD-highway-primary-link {
color: #e06d5f;
fill: #70372f;
}
@@ -170,8 +170,8 @@ path.casing.tag-tertiary {
stroke:#70372f;
}
-.legacy-carto .preset-icon .icon.highway-secondary,
-.legacy-carto .preset-icon .icon.highway-secondary-link {
+.legacy-carto .preset-icon .icon.iD-highway-secondary,
+.legacy-carto .preset-icon .icon.iD-highway-secondary-link {
color: #eab056;
fill: #75582b;
}
@@ -186,8 +186,8 @@ path.casing.tag-tertiary {
stroke:#75582b;
}
-.legacy-carto .preset-icon .icon.highway-tertiary,
-.legacy-carto .preset-icon .icon.highway-tertiary-link {
+.legacy-carto .preset-icon .icon.iD-highway-tertiary,
+.legacy-carto .preset-icon .icon.iD-highway-tertiary-link {
color: #ffff7e;
fill: #7f7f3f;
}
@@ -202,7 +202,7 @@ path.casing.tag-tertiary {
stroke:#7f7f3f;
}
-.preset-icon .icon.highway-residential {
+.preset-icon .icon.iD-highway-residential {
color: #fff;
fill: #444;
}
@@ -215,7 +215,7 @@ path.casing.tag-residential {
stroke:#444;
}
-.preset-icon .icon.highway-unclassified {
+.preset-icon .icon.iD-highway-unclassified {
color: #dcd9b9;
fill: #444;
}
@@ -398,7 +398,7 @@ path.stroke.tag-steps {
}
-.preset-icon .icon.highway-living-street {
+.preset-icon .icon.iD-highway-living-street {
color: #bbb;
fill: #ddd;
}
@@ -411,8 +411,8 @@ path.casing.tag-living_street {
stroke: #fff;
}
-.preset-icon .icon.highway-footway.tag-highway-corridor,
-.preset-icon .icon.highway-footway.tag-highway-pedestrian {
+.preset-icon .icon.iD-highway-footway.tag-highway-corridor,
+.preset-icon .icon.iD-highway-footway.tag-highway-pedestrian {
color: #8cd05f;
fill: #fff;
}
@@ -442,7 +442,7 @@ path.casing.tag-pedestrian.tag-unpaved {
stroke-dasharray: none;
}
-.preset-icon .icon.highway-road {
+.preset-icon .icon.iD-highway-road {
color: #9e9e9e;
fill: #666;
}
@@ -455,7 +455,7 @@ path.casing.tag-road {
stroke:#666;
}
-.preset-icon .icon.highway-service {
+.preset-icon .icon.iD-highway-service {
color: #fff;
fill: #666;
}
@@ -470,8 +470,8 @@ path.casing.tag-service {
/* special service roads and bus guideways */
/* with `service=* tag` (e.g. parking_aisle, alley, drive-through */
-.preset-icon .icon.highway-bus_guideway,
-.preset-icon .icon.highway-service.tag-service {
+.preset-icon .icon.iD-highway-bus_guideway,
+.preset-icon .icon.iD-highway-service.tag-service {
color: #dcd9b9;
fill: #666;
}
@@ -486,7 +486,7 @@ path.casing.tag-service.tag-service {
stroke: #666;
}
-.preset-icon .icon.highway-track {
+.preset-icon .icon.iD-highway-track {
color: #eaeaea;
fill: #c5b59f;
}
@@ -531,8 +531,8 @@ path.casing.tag-highway-bridleway.tag-unpaved {
stroke-dasharray: none;
}
-.preset-icon .icon.category-path,
-.preset-icon .icon.highway-path {
+.preset-icon .icon.iD-category-path,
+.preset-icon .icon.iD-highway-path {
color: #746f6f;
fill: #c5b59f;
}
@@ -542,7 +542,7 @@ path.stroke.tag-highway-path {
.preset-icon .icon.tag-route-foot,
.preset-icon .icon.tag-route-hiking,
-.preset-icon .icon.highway-footway {
+.preset-icon .icon.iD-highway-footway {
color: #ae8681;
fill: #fff;
}
@@ -550,7 +550,7 @@ path.stroke.tag-highway-footway {
stroke: #ae8681;
}
-.preset-icon .icon.highway-footway.tag-crossing {
+.preset-icon .icon.iD-highway-footway.tag-crossing {
color: #444;
}
path.stroke.tag-highway-footway.tag-crossing {
@@ -562,7 +562,7 @@ path.stroke.tag-highway-footway.tag-crossing {
}
.preset-icon .icon.tag-route-bicycle,
-.preset-icon .icon.highway-cycleway {
+.preset-icon .icon.iD-highway-cycleway {
color: #58a9ed;
fill: #fff;
}
@@ -571,7 +571,7 @@ path.stroke.tag-highway-cycleway {
}
.preset-icon .icon.tag-route-horse,
-.preset-icon .icon.highway-bridleway {
+.preset-icon .icon.iD-highway-bridleway {
color: #e06d5f;
fill: #fff;
}
@@ -579,7 +579,7 @@ path.stroke.tag-highway-bridleway {
stroke: #e06d5f;
}
-.preset-icon .icon.highway-steps {
+.preset-icon .icon.iD-highway-steps {
color: #81d25c;
fill: #fff;
}
diff --git a/css/40_railways.css b/css/40_railways.css
index b43311555..943e66916 100644
--- a/css/40_railways.css
+++ b/css/40_railways.css
@@ -86,7 +86,7 @@ path.stroke.tag-railway-subway {
/* railway platforms - like sidewalks */
-.preset-icon .icon.highway-footway.tag-railway-platform {
+.preset-icon .icon.iD-highway-footway.tag-railway-platform {
color: #ae8681;
fill: #dcd9b9;
}
diff --git a/css/45_waterways.css b/css/45_waterways.css
index ee18b7d77..d838378f2 100644
--- a/css/45_waterways.css
+++ b/css/45_waterways.css
@@ -4,7 +4,7 @@
color: #77d3de;
fill: #77d3de;
}
-.preset-icon .icon.category-water,
+.preset-icon .icon.iD-category-water,
.preset-icon .icon.tag-route-ferry,
.preset-icon .icon.tag-type-waterway,
.preset-icon .icon.tag-waterway {
diff --git a/css/80_app.css b/css/80_app.css
index e49a92987..46eaa1da2 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -996,13 +996,11 @@ a.hide-toggle {
position: absolute;
top: 7px;
left: 7px;
- height: 42px;
- width: 42px;
margin: auto;
}
[dir='rtl'] .preset-icon-frame {
- left: auto;
- right: 7px;
+ left: auto;
+ right: 7px;
}
.preset-icon-frame .icon {
diff --git a/package.json b/package.json
index 1b1b750f9..1a519ce79 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,6 @@
"dist": "npm-run-all -p dist:**",
"dist:mapillary": "shx mkdir -p dist/mapillary-js && shx cp -R node_modules/mapillary-js/dist/* dist/mapillary-js/",
"dist:min": "uglifyjs dist/iD.js -c warnings=false -m -o dist/iD.min.js",
- "old:svg:id": "node svg/spriteify.js --svg svg/iD-sprite.src.svg --json svg/iD-sprite.json > dist/img/iD-sprite.svg",
"dist:svg:id": "svg-sprite --symbol --symbol-dest . --shape-id-generator \"iD-%s\" --symbol-sprite dist/img/iD-sprite.svg 'svg/iD-sprite/**/*.svg'",
"dist:svg:community": "svg-sprite --symbol --symbol-dest . --shape-id-generator \"community-%s\" --symbol-sprite dist/img/community-sprite.svg node_modules/osm-community-index/dist/img/*.svg",
"dist:svg:fa": "svg-sprite --symbol --symbol-dest . --symbol-sprite dist/img/fa-sprite.svg svg/fontawesome/*.svg",
diff --git a/svg/iD-sprite.json b/svg/iD-sprite.json
deleted file mode 100644
index e23de6703..000000000
--- a/svg/iD-sprite.json
+++ /dev/null
@@ -1,375 +0,0 @@
-{
- "icon-alert": { "viewBox": "0 0 20 20" },
- "icon-point": { "viewBox": "20 0 20 20" },
- "icon-line": { "viewBox": "40 0 20 20" },
- "icon-area": { "viewBox": "60 0 20 20" },
- "icon-relation": { "viewBox": "80 0 20 20" },
- "icon-vertex": { "viewBox": "100 0 20 20" },
- "icon-undo": { "viewBox": "120 0 20 20" },
- "icon-redo": { "viewBox": "140 0 20 20" },
- "icon-apply": { "viewBox": "160 0 20 20" },
- "icon-close": { "viewBox": "180 0 20 20" },
- "icon-save": { "viewBox": "200 0 20 20" },
- "icon-load": { "viewBox": "220 0 20 20" },
- "icon-plus": { "viewBox": "240 0 20 20" },
- "icon-minus": { "viewBox": "260 0 20 20" },
- "icon-search": { "viewBox": "280 0 20 20" },
- "icon-layers": { "viewBox": "300 0 20 20" },
- "icon-avatar": { "viewBox": "320 0 20 20" },
- "icon-nearby": { "viewBox": "340 0 20 20" },
- "icon-geolocate": { "viewBox": "360 0 20 20" },
- "icon-out-link": { "viewBox": "380 0 20 20" },
- "icon-bug": { "viewBox": "400 0 20 20" },
- "icon-translate": { "viewBox": "420 0 20 20" },
- "icon-inspect": { "viewBox": "440 0 20 20" },
- "icon-help": { "viewBox": "460 0 20 20" },
- "icon-data": { "viewBox": "480 0 20 20" },
- "icon-full-screen": { "viewBox": "500 0 20 20" },
- "icon-collapse-screen": { "viewBox": "520 0 20 20" },
- "icon-backward": { "viewBox": "540 0 20 20" },
- "icon-forward": { "viewBox": "560 0 20 20" },
- "icon-up": { "viewBox": "580 0 20 20" },
- "icon-down": { "viewBox": "600 0 20 20" },
- "icon-more": { "viewBox": "620 0 20 20" },
- "icon-no": { "viewBox": "640 0 20 20" },
- "icon-edit": { "viewBox": "660 0 20 20" },
-
- "icon-alert-shape": { "fill": "currentColor" },
- "icon-point-shape": { "fill": "currentColor" },
- "icon-line-shape": { "fill": "currentColor" },
- "icon-area-shape": { "fill": "currentColor" },
- "icon-area-fill": { "fill": "currentColor" },
- "icon-relation-shape": { "fill": "currentColor" },
- "icon-vertex-shape": { "fill": "currentColor" },
- "icon-undo-shape": { "fill": "currentColor" },
- "icon-redo-shape": { "fill": "currentColor" },
- "icon-apply-shape": { "fill": "currentColor" },
- "icon-close-shape": { "fill": "currentColor" },
- "icon-save-shape1": { "fill": "currentColor" },
- "icon-save-shape2": { "fill": "currentColor" },
- "icon-load-shape1": { "fill": "currentColor" },
- "icon-load-shape2": { "fill": "currentColor" },
- "icon-out-link-shape": { "fill": "currentColor" },
- "icon-plus-shape": { "fill": "currentColor" },
- "icon-minus-shape": { "fill": "currentColor" },
- "icon-search-shape": { "fill": "currentColor" },
- "icon-layers-shape": { "fill": "currentColor" },
- "icon-avatar-shape": { "fill": "currentColor" },
- "icon-nearby-shape1": { "fill": "currentColor" },
- "icon-nearby-shape2": { "fill": "currentColor" },
- "icon-geolocate-shape": { "fill": "currentColor" },
- "icon-bug-shape": { "fill": "currentColor" },
- "icon-translate-shape": { "fill": "currentColor" },
- "icon-inspect-shape": { "fill": "currentColor" },
- "icon-help-shape": { "fill": "currentColor" },
- "icon-data-shape": { "fill": "currentColor" },
- "icon-full-screen-shape": { "fill": "currentColor" },
- "icon-collapse-screen-shape": { "fill": "currentColor" },
- "icon-backward-shape": { "fill": "currentColor" },
- "icon-forward-shape": { "fill": "currentColor" },
- "icon-up-shape": { "fill": "currentColor" },
- "icon-down-shape": { "fill": "currentColor" },
- "icon-more-shape": { "fill": "currentColor" },
- "icon-no-shape": { "fill": "currentColor" },
- "icon-edit-shape": { "fill": "currentColor" },
-
- "highway-motorway": { "viewBox": "0 20 60 60" },
- "highway-trunk": { "viewBox": "60 20 60 60" },
- "highway-primary": { "viewBox": "120 20 60 60" },
- "highway-secondary": { "viewBox": "180 20 60 60" },
- "highway-tertiary": { "viewBox": "240 20 60 60" },
- "highway-motorway-link": { "viewBox": "300 20 60 60" },
- "highway-trunk-link": { "viewBox": "360 20 60 60" },
- "highway-primary-link": { "viewBox": "420 20 60 60" },
- "highway-secondary-link": { "viewBox": "480 20 60 60" },
- "highway-tertiary-link": { "viewBox": "540 20 60 60" },
- "highway-residential": { "viewBox": "600 20 60 60" },
- "highway-unclassified": { "viewBox": "660 20 60 60" },
- "highway-service": { "viewBox": "720 20 60 60" },
- "highway-bus_guideway": { "viewBox": "780 20 60 60" },
- "highway-road": { "viewBox": "0 80 60 60" },
- "highway-track": { "viewBox": "60 80 60 60" },
- "highway-living-street": { "viewBox": "120 80 60 60" },
- "highway-path": { "viewBox": "180 80 60 60" },
- "highway-cycleway": { "viewBox": "240 80 60 60" },
- "highway-footway": { "viewBox": "300 80 60 60" },
- "highway-bridleway": { "viewBox": "360 80 60 60" },
- "highway-steps": { "viewBox": "420 80 60 60" },
-
- "highway-motorway-casing1": { "fill": "inherit" },
- "highway-motorway-stroke1": { "fill": "currentColor" },
- "highway-motorway-stroke2": { "fill": "currentColor" },
- "highway-trunk-casing1": { "fill": "inherit" },
- "highway-trunk-stroke1": { "fill": "currentColor" },
- "highway-trunk-stroke2": { "fill": "currentColor" },
- "highway-primary-casing1": { "fill": "inherit" },
- "highway-primary-stroke1": { "fill": "currentColor" },
- "highway-primary-stroke2": { "fill": "currentColor" },
- "highway-secondary-casing1": { "fill": "inherit" },
- "highway-secondary-stroke1": { "fill": "currentColor" },
- "highway-secondary-stroke2": { "fill": "currentColor" },
- "highway-tertiary-casing1": { "fill": "inherit" },
- "highway-tertiary-stroke1": { "fill": "currentColor" },
- "highway-tertiary-stroke2": { "fill": "currentColor" },
-
- "highway-motorway-link-casing1": { "fill": "inherit" },
- "highway-motorway-link-casing2": { "fill": "inherit" },
- "highway-motorway-link-stroke1": { "fill": "currentColor" },
- "highway-motorway-link-stroke2": { "fill": "currentColor" },
- "highway-motorway-link-stroke3": { "fill": "currentColor" },
- "highway-trunk-link-casing1": { "fill": "inherit" },
- "highway-trunk-link-casing2": { "fill": "inherit" },
- "highway-trunk-link-stroke1": { "fill": "currentColor" },
- "highway-trunk-link-stroke2": { "fill": "currentColor" },
- "highway-trunk-link-stroke3": { "fill": "currentColor" },
- "highway-primary-link-casing1": { "fill": "inherit" },
- "highway-primary-link-casing2": { "fill": "inherit" },
- "highway-primary-link-stroke1": { "fill": "currentColor" },
- "highway-primary-link-stroke2": { "fill": "currentColor" },
- "highway-primary-link-stroke3": { "fill": "currentColor" },
- "highway-secondary-link-casing1": { "fill": "inherit" },
- "highway-secondary-link-casing2": { "fill": "inherit" },
- "highway-secondary-link-stroke1": { "fill": "currentColor" },
- "highway-secondary-link-stroke2": { "fill": "currentColor" },
- "highway-secondary-link-stroke3": { "fill": "currentColor" },
- "highway-tertiary-link-casing1": { "fill": "inherit" },
- "highway-tertiary-link-casing2": { "fill": "inherit" },
- "highway-tertiary-link-stroke1": { "fill": "currentColor" },
- "highway-tertiary-link-stroke2": { "fill": "currentColor" },
- "highway-tertiary-link-stroke3": { "fill": "currentColor" },
-
- "highway-residential-casing1": { "fill": "inherit" },
- "highway-residential-stroke1": { "fill": "currentColor" },
- "highway-unclassified-casing1": { "fill": "inherit" },
- "highway-unclassified-stroke1": { "fill": "currentColor" },
- "highway-service-casing1": { "fill": "inherit" },
- "highway-service-stroke1": { "fill": "currentColor" },
- "highway-bus_guideway-casing1": { "fill": "inherit" },
- "highway-bus_guideway-stroke1": { "fill": "currentColor" },
- "highway-road-casing1": { "fill": "inherit" },
- "highway-road-stroke1": { "fill": "currentColor" },
- "highway-track-casing1": { "fill": "inherit" },
- "highway-track-stroke1": { "fill": "currentColor" },
- "highway-track-stroke2": { "fill": "currentColor" },
- "highway-living-street-casing1": { "fill": "inherit" },
- "highway-living-street-stroke1": { "fill": "currentColor" },
- "highway-path-dashes": { "fill": "inherit" },
- "highway-path-stroke1": { "fill": "currentColor" },
- "highway-path-stroke2": { "fill": "currentColor" },
- "highway-cycleway-dashes": { "fill": "inherit" },
- "highway-cycleway-stroke1": { "fill": "currentColor" },
- "highway-cycleway-stroke2": { "fill": "currentColor" },
- "highway-footway-dashes": { "fill": "inherit" },
- "highway-footway-stroke1": { "fill": "currentColor" },
- "highway-footway-stroke2": { "fill": "currentColor" },
- "highway-bridleway-dashes": { "fill": "inherit" },
- "highway-bridleway-stroke1": { "fill": "currentColor" },
- "highway-bridleway-stroke2": { "fill": "currentColor" },
- "highway-steps-dashes": { "fill": "inherit" },
- "highway-steps-stroke1": { "fill": "currentColor" },
- "highway-steps-stroke2": { "fill": "currentColor" },
- "highway-steps-stroke3": { "fill": "currentColor" },
-
- "railway-rail": { "viewBox": "480 80 60 60" },
- "railway-disused": { "viewBox": "540 80 60 60" },
- "railway-abandoned": { "viewBox": "600 80 60 60" },
- "railway-subway": { "viewBox": "660 80 60 60" },
- "railway-light-rail": { "viewBox": "720 80 60 60" },
- "railway-monorail": { "viewBox": "0 140 60 60" },
-
- "railway-rail-dashes": { "fill": "inherit" },
- "railway-rail-stroke": { "fill": "currentColor" },
- "railway-disused-dashes": { "fill": "inherit" },
- "railway-disused-stroke": { "fill": "currentColor" },
- "railway-abandoned-dashes": { "fill": "inherit" },
- "railway-abandoned-stroke": { "fill": "currentColor" },
- "railway-subway-dashes": { "fill": "inherit" },
- "railway-subway-stroke": { "fill": "currentColor" },
- "railway-light-rail-dashes": { "fill": "inherit" },
- "railway-light-rail-stroke": { "fill": "currentColor" },
- "railway-monorail-dashes": { "fill": "inherit" },
- "railway-monorail-stroke": { "fill": "currentColor" },
-
- "waterway-river": { "viewBox": "60 140 60 60" },
- "waterway-stream": { "viewBox": "120 140 60 60" },
- "waterway-canal": { "viewBox": "180 140 60 60" },
- "waterway-ditch": { "viewBox": "240 140 60 60" },
-
- "waterway-river-stroke1": { "fill": "currentColor" },
- "waterway-river-stroke2": { "fill": "currentColor" },
- "waterway-river-stroke3": { "fill": "currentColor" },
- "waterway-stream-stroke1": { "fill": "currentColor" },
- "waterway-stream-stroke2": { "fill": "currentColor" },
- "waterway-stream-stroke3": { "fill": "currentColor" },
- "waterway-canal-stroke1": { "fill": "currentColor" },
- "waterway-canal-stroke2": { "fill": "currentColor" },
- "waterway-canal-stroke3": { "fill": "currentColor" },
- "waterway-ditch-stroke1": { "fill": "currentColor" },
- "waterway-ditch-stroke2": { "fill": "currentColor" },
-
- "power-line": { "viewBox": "300 140 60 60" },
- "other-line": { "viewBox": "360 140 60 60" },
-
- "power-line-stroke": { "fill": "currentColor" },
- "other-line-casing1": { "fill": "inherit" },
- "other-line-stroke1": { "fill": "currentColor" },
-
- "category-roads": { "viewBox": "420 140 60 60" },
- "category-rail": { "viewBox": "480 140 60 60" },
- "category-path": { "viewBox": "540 140 60 60" },
- "category-water": { "viewBox": "600 140 60 60" },
-
- "category-path-stroke": { "fill": "currentColor" },
- "category-water-stroke1": { "fill": "currentColor" },
- "category-water-stroke2": { "fill": "currentColor" },
-
- "ferry-line": { "viewBox": "660 140 60 60" },
- "pipeline-line": { "viewBox": "720 140 60 60" },
- "piste-line": { "viewBox": "780 140 60 60" },
-
- "ferry-line-dashes": { "fill": "inherit" },
- "ferry-line-stroke1": { "fill": "currentColor" },
- "ferry-line-stroke2": { "fill": "currentColor" },
- "pipeline-line-stroke": { "fill": "currentColor" },
- "piste-line-dashes": { "fill": "inherit" },
- "piste-line-stroke1": { "fill": "currentColor" },
- "piste-line-stroke2": { "fill": "currentColor" },
-
- "relation": { "viewBox": "0 200 60 60" },
- "boundary": { "viewBox": "60 200 60 60" },
- "route": { "viewBox": "120 200 60 60" },
- "route-road": { "viewBox": "180 200 60 60" },
- "route-bicycle": { "viewBox": "240 200 60 60" },
- "route-foot": { "viewBox": "300 200 60 60" },
- "route-horse": { "viewBox": "360 200 60 60" },
- "route-bus": { "viewBox": "420 200 60 60" },
- "route-train": { "viewBox": "480 200 60 60" },
- "route-detour": { "viewBox": "540 200 60 60" },
- "route-tram": { "viewBox": "600 200 60 60" },
- "route-ferry": { "viewBox": "660 200 60 60" },
- "route-pipeline": { "viewBox": "720 200 60 60" },
- "route-power": { "viewBox": "780 200 60 60" },
- "route-water": { "viewBox": "840 200 60 60" },
- "route-master": { "viewBox": "0 260 60 60" },
- "route-light-rail": { "viewBox": "600 260 60 60" },
- "route-piste": { "viewBox": "660 260 60 60" },
- "route-line": { "viewBox": "720 260 60 60" },
- "route-subway": { "viewBox": "780 260 60 60" },
-
- "route-bicycle-stroke": { "fill": "currentColor" },
- "route-foot-stroke": { "fill": "currentColor" },
- "route-horse-stroke": { "fill": "currentColor" },
- "route-ferry-stroke": { "fill": "currentColor" },
- "route-water-stroke1": { "fill": "currentColor" },
- "route-water-stroke2": { "fill": "currentColor" },
- "route-piste-stroke": { "fill": "currentColor" },
-
- "restriction-no-straight-on": { "viewBox": "60 260 60 60" },
- "restriction-no-u-turn": { "viewBox": "120 260 60 60" },
- "restriction-no-left-turn": { "viewBox": "180 260 60 60" },
- "restriction-no-right-turn": { "viewBox": "240 260 60 60" },
- "restriction-only-straight-on": { "viewBox": "300 260 60 60" },
- "restriction-only-left-turn": { "viewBox": "360 260 60 60" },
- "restriction-only-right-turn": { "viewBox": "420 260 60 60" },
- "restriction-only-u-turn": { "viewBox": "440 400 60 60" },
-
- "restriction": { "viewBox": "480 260 60 60" },
- "multipolygon": { "viewBox": "540 260 60 60" },
-
- "turn-yes": { "viewBox": "200 320 44 24" },
- "turn-no": { "viewBox": "244 320 44 24" },
- "turn-only": { "viewBox": "288 320 44 24" },
- "turn-yes-u": { "viewBox": "200 344 32 32" },
- "turn-no-u": { "viewBox": "232 344 32 32" },
- "turn-only-u": { "viewBox": "264 344 32 32" },
- "turn-shadow": { "viewBox": "296 344 37 11" },
-
- "turn-shadow-shape": { "fill": "currentColor" },
-
- "preset-icon-frame": { "viewBox": "340 320 45 45" },
-
- "operation-delete": { "viewBox": "200 380 20 20" },
- "operation-circularize": { "viewBox": "220 380 20 20" },
- "operation-straighten": { "viewBox": "240 380 20 20" },
- "operation-split": { "viewBox": "260 380 20 20" },
- "operation-disconnect": { "viewBox": "280 380 20 20" },
- "operation-reverse": { "viewBox": "300 380 20 20" },
- "operation-move": { "viewBox": "320 380 20 20" },
- "operation-merge": { "viewBox": "340 380 20 20" },
- "operation-orthogonalize": { "viewBox": "360 380 20 20" },
- "operation-rotate": { "viewBox": "380 380 20 20" },
- "operation-simplify": { "viewBox": "400 380 20 20" },
- "operation-smooth": { "viewBox": "420 380 20 20" },
- "operation-continue": { "viewBox": "440 380 20 20" },
- "operation-reflect-long": { "viewBox": "460 380 20 20" },
- "operation-reflect-short": { "viewBox": "480 380 20 20" },
- "operation-layers": { "viewBox": "500 380 20 20" },
- "operation-copy": { "viewBox": "520 380 20 20" },
- "operation-paste": { "viewBox": "540 380 20 20" },
-
- "operation-delete-shape": { "fill": "inherit" },
- "operation-circularize-shape": { "fill": "inherit" },
- "operation-circularize-shape2": { "fill": "currentColor" },
- "operation-straighten-shape": { "fill": "inherit" },
- "operation-straighten-shape2": { "fill": "currentColor" },
- "operation-split-shape": { "fill": "inherit" },
- "operation-disconnect-shape": { "fill": "inherit" },
- "operation-disconnect-shape2": { "fill": "currentColor" },
- "operation-reverse-shape": { "fill": "inherit" },
- "operation-move-shape": { "fill": "inherit" },
- "operation-move-shape2": { "fill": "currentColor" },
- "operation-merge-shape": { "fill": "inherit" },
- "operation-orthogonalize-shape": { "fill": "inherit" },
- "operation-orthogonalize-shape2": { "fill": "currentColor" },
- "operation-rotate-shape": { "fill": "inherit" },
- "operation-rotate-shape2": { "fill": "currentColor" },
- "operation-simplify-shape": { "fill": "inherit" },
- "operation-simplify-shape2": { "fill": "currentColor" },
- "operation-smooth-shape": { "fill": "inherit" },
- "operation-smooth-shape2": { "fill": "currentColor" },
- "operation-continue-shape": { "fill": "inherit" },
- "operation-continue-shape2": { "fill": "currentColor" },
- "operation-reflect-long-shape": { "fill": "inherit" },
- "operation-reflect-long-shape2": { "fill": "currentColor" },
- "operation-reflect-short-shape": { "fill": "inherit" },
- "operation-reflect-short-shape2": { "fill": "currentColor" },
- "operation-layers-shape": { "fill": "inherit" },
- "operation-copy-shape": { "fill": "inherit" },
- "operation-copy-shape2": { "fill": "inherit" },
- "operation-paste-shape": { "fill": "inherit" },
- "operation-paste-shape2": { "fill": "inherit" },
- "operation-paste-shape3": { "fill": "inherit" },
-
- "logo-twitter": { "viewBox": "200 400 60 60" },
- "logo-facebook": { "viewBox": "260 400 60 60" },
- "logo-google": { "viewBox": "320 400 60 60" },
-
- "logo-twitter-shape": { "fill": "currentColor" },
- "logo-facebook-shape": { "fill": "currentColor" },
- "logo-google-shape": { "fill": "currentColor" },
-
- "logo-osm": { "viewBox": "200 460 100 100" },
- "logo-walkthrough": { "viewBox": "300 460 100 100" },
- "logo-features": { "viewBox": "400 460 100 100" },
- "logo-restore": { "viewBox": "500 460 100 100" },
- "logo-reset": { "viewBox": "600 460 100 100" },
-
- "logo-osm-shape": { "fill": "currentColor" },
- "logo-walkthrough-shape": { "fill": "currentColor" },
- "logo-features-shape1": { "fill": "currentColor" },
- "logo-features-shape2": { "fill": "currentColor" },
- "logo-features-shape3": { "fill": "currentColor" },
- "logo-restore-shape": { "fill": "currentColor" },
- "logo-reset-shape": { "fill": "currentColor" },
-
- "poi-images": { "viewBox": "0 320 200 80" },
- "landuse-images": { "viewBox": "0 400 200 80" },
- "feature-images": { "viewBox": "0 480 200 80" },
- "building-images": { "viewBox": "700 480 200 80" },
-
- "walkthrough-mouse": { "viewBox": "397 411 25 43" },
-
- "walkthrough-mouse-shape": { "fill": "#000000" },
- "walkthrough-mouse-left": { "fill": "inherit" },
- "walkthrough-mouse-right": { "fill": "currentColor" }
-}
diff --git a/svg/iD-sprite.src.idraw b/svg/iD-sprite.src.idraw
deleted file mode 100644
index 2fedb677e..000000000
Binary files a/svg/iD-sprite.src.idraw and /dev/null differ
diff --git a/svg/iD-sprite.src.svg b/svg/iD-sprite.src.svg
deleted file mode 100644
index 11d9e235e..000000000
--- a/svg/iD-sprite.src.svg
+++ /dev/null
@@ -1,1367 +0,0 @@
-
-
-
diff --git a/svg/iD-sprite/graphics/preset-icon-frame.svg b/svg/iD-sprite/graphics/preset-icon-frame.svg
index 4c7e7368e..b14ba48f7 100644
--- a/svg/iD-sprite/graphics/preset-icon-frame.svg
+++ b/svg/iD-sprite/graphics/preset-icon-frame.svg
@@ -1,20 +1,20 @@
diff --git a/svg/iD-sprite/presets/boundary.svg b/svg/iD-sprite/presets/boundary.svg
index 1f75b3142..3c14f55e0 100644
--- a/svg/iD-sprite/presets/boundary.svg
+++ b/svg/iD-sprite/presets/boundary.svg
@@ -1,18 +1,18 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/category-path.svg b/svg/iD-sprite/presets/category-path.svg
index 9807c1e67..8d4070adf 100644
--- a/svg/iD-sprite/presets/category-path.svg
+++ b/svg/iD-sprite/presets/category-path.svg
@@ -1,5 +1,5 @@
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/category-rail.svg b/svg/iD-sprite/presets/category-rail.svg
index 984c4071d..b9369f2a2 100644
--- a/svg/iD-sprite/presets/category-rail.svg
+++ b/svg/iD-sprite/presets/category-rail.svg
@@ -1,5 +1,5 @@
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/category-roads.svg b/svg/iD-sprite/presets/category-roads.svg
index 071ccfdc7..e298e81a2 100644
--- a/svg/iD-sprite/presets/category-roads.svg
+++ b/svg/iD-sprite/presets/category-roads.svg
@@ -1,5 +1,5 @@
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/category-water.svg b/svg/iD-sprite/presets/category-water.svg
index 5fa4d6df3..47da3fd11 100644
--- a/svg/iD-sprite/presets/category-water.svg
+++ b/svg/iD-sprite/presets/category-water.svg
@@ -1,6 +1,6 @@
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/ferry-line.svg b/svg/iD-sprite/presets/ferry-line.svg
index d3fc47061..962c9c240 100644
--- a/svg/iD-sprite/presets/ferry-line.svg
+++ b/svg/iD-sprite/presets/ferry-line.svg
@@ -1,9 +1,9 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/highway-bridleway.svg b/svg/iD-sprite/presets/highway-bridleway.svg
index fe828d4a8..b778cb320 100644
--- a/svg/iD-sprite/presets/highway-bridleway.svg
+++ b/svg/iD-sprite/presets/highway-bridleway.svg
@@ -1,9 +1,9 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/highway-bus-guideway.svg b/svg/iD-sprite/presets/highway-bus-guideway.svg
index b803b617d..16391772f 100644
--- a/svg/iD-sprite/presets/highway-bus-guideway.svg
+++ b/svg/iD-sprite/presets/highway-bus-guideway.svg
@@ -1,13 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/highway-cycleway.svg b/svg/iD-sprite/presets/highway-cycleway.svg
index 04e8e65a6..1388dc50e 100644
--- a/svg/iD-sprite/presets/highway-cycleway.svg
+++ b/svg/iD-sprite/presets/highway-cycleway.svg
@@ -1,9 +1,9 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/highway-footway.svg b/svg/iD-sprite/presets/highway-footway.svg
index f00631100..8f690d238 100644
--- a/svg/iD-sprite/presets/highway-footway.svg
+++ b/svg/iD-sprite/presets/highway-footway.svg
@@ -1,9 +1,9 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/highway-living-street.svg b/svg/iD-sprite/presets/highway-living-street.svg
index 8954ab0f9..d653566ae 100644
--- a/svg/iD-sprite/presets/highway-living-street.svg
+++ b/svg/iD-sprite/presets/highway-living-street.svg
@@ -1,15 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/highway-motorway-link.svg b/svg/iD-sprite/presets/highway-motorway-link.svg
index 1ac2ea938..f47c5ce1e 100644
--- a/svg/iD-sprite/presets/highway-motorway-link.svg
+++ b/svg/iD-sprite/presets/highway-motorway-link.svg
@@ -7,22 +7,22 @@
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/highway-motorway.svg b/svg/iD-sprite/presets/highway-motorway.svg
index fffb3cc4d..ebd83a1cc 100644
--- a/svg/iD-sprite/presets/highway-motorway.svg
+++ b/svg/iD-sprite/presets/highway-motorway.svg
@@ -1,12 +1,12 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/highway-path.svg b/svg/iD-sprite/presets/highway-path.svg
index 82443531b..3c9fb869a 100644
--- a/svg/iD-sprite/presets/highway-path.svg
+++ b/svg/iD-sprite/presets/highway-path.svg
@@ -1,9 +1,9 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/highway-primary-link.svg b/svg/iD-sprite/presets/highway-primary-link.svg
index b848ec033..f28f5cbf2 100644
--- a/svg/iD-sprite/presets/highway-primary-link.svg
+++ b/svg/iD-sprite/presets/highway-primary-link.svg
@@ -7,21 +7,21 @@
+
+
+
+
+
+
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/highway-primary.svg b/svg/iD-sprite/presets/highway-primary.svg
index 31281258f..8c48e1cec 100644
--- a/svg/iD-sprite/presets/highway-primary.svg
+++ b/svg/iD-sprite/presets/highway-primary.svg
@@ -1,12 +1,12 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/highway-residential.svg b/svg/iD-sprite/presets/highway-residential.svg
index aab994cb9..2423fb241 100644
--- a/svg/iD-sprite/presets/highway-residential.svg
+++ b/svg/iD-sprite/presets/highway-residential.svg
@@ -1,15 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/highway-road.svg b/svg/iD-sprite/presets/highway-road.svg
index 031ce0634..72eaef359 100644
--- a/svg/iD-sprite/presets/highway-road.svg
+++ b/svg/iD-sprite/presets/highway-road.svg
@@ -1,11 +1,11 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/highway-secondary-link.svg b/svg/iD-sprite/presets/highway-secondary-link.svg
index e2361874f..1aa50ac40 100644
--- a/svg/iD-sprite/presets/highway-secondary-link.svg
+++ b/svg/iD-sprite/presets/highway-secondary-link.svg
@@ -7,21 +7,21 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/highway-secondary.svg b/svg/iD-sprite/presets/highway-secondary.svg
index a7b7d43fe..f0e1f2387 100644
--- a/svg/iD-sprite/presets/highway-secondary.svg
+++ b/svg/iD-sprite/presets/highway-secondary.svg
@@ -1,12 +1,12 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/highway-service.svg b/svg/iD-sprite/presets/highway-service.svg
index 5ae813ca3..e2d02d260 100644
--- a/svg/iD-sprite/presets/highway-service.svg
+++ b/svg/iD-sprite/presets/highway-service.svg
@@ -1,13 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/highway-steps.svg b/svg/iD-sprite/presets/highway-steps.svg
index ea59a4759..8ec6f5885 100644
--- a/svg/iD-sprite/presets/highway-steps.svg
+++ b/svg/iD-sprite/presets/highway-steps.svg
@@ -1,10 +1,10 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/highway-tertiary-link.svg b/svg/iD-sprite/presets/highway-tertiary-link.svg
index 92ca37e14..b7ccebc18 100644
--- a/svg/iD-sprite/presets/highway-tertiary-link.svg
+++ b/svg/iD-sprite/presets/highway-tertiary-link.svg
@@ -7,19 +7,19 @@
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/highway-tertiary.svg b/svg/iD-sprite/presets/highway-tertiary.svg
index f990a4441..63b383b42 100644
--- a/svg/iD-sprite/presets/highway-tertiary.svg
+++ b/svg/iD-sprite/presets/highway-tertiary.svg
@@ -1,12 +1,12 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/highway-track.svg b/svg/iD-sprite/presets/highway-track.svg
index 83c6300bb..89958082c 100644
--- a/svg/iD-sprite/presets/highway-track.svg
+++ b/svg/iD-sprite/presets/highway-track.svg
@@ -1,14 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/highway-trunk-link.svg b/svg/iD-sprite/presets/highway-trunk-link.svg
index bec29286e..0028e07ee 100644
--- a/svg/iD-sprite/presets/highway-trunk-link.svg
+++ b/svg/iD-sprite/presets/highway-trunk-link.svg
@@ -7,24 +7,24 @@
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/highway-trunk.svg b/svg/iD-sprite/presets/highway-trunk.svg
index eb5807c90..dc295bd32 100644
--- a/svg/iD-sprite/presets/highway-trunk.svg
+++ b/svg/iD-sprite/presets/highway-trunk.svg
@@ -1,12 +1,12 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/highway-unclassified.svg b/svg/iD-sprite/presets/highway-unclassified.svg
index 19e26d53d..2ceff69db 100644
--- a/svg/iD-sprite/presets/highway-unclassified.svg
+++ b/svg/iD-sprite/presets/highway-unclassified.svg
@@ -1,11 +1,11 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/multipolygon.svg b/svg/iD-sprite/presets/multipolygon.svg
index 0f6424b8b..de102ab90 100644
--- a/svg/iD-sprite/presets/multipolygon.svg
+++ b/svg/iD-sprite/presets/multipolygon.svg
@@ -1,20 +1,20 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/other-line.svg b/svg/iD-sprite/presets/other-line.svg
index 86efcc5af..79b401464 100644
--- a/svg/iD-sprite/presets/other-line.svg
+++ b/svg/iD-sprite/presets/other-line.svg
@@ -1,9 +1,9 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/pipeline-line.svg b/svg/iD-sprite/presets/pipeline-line.svg
index 51557cfee..7aa41868d 100644
--- a/svg/iD-sprite/presets/pipeline-line.svg
+++ b/svg/iD-sprite/presets/pipeline-line.svg
@@ -1,12 +1,12 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/piste-line.svg b/svg/iD-sprite/presets/piste-line.svg
index 93b6af45c..1b4c703f2 100644
--- a/svg/iD-sprite/presets/piste-line.svg
+++ b/svg/iD-sprite/presets/piste-line.svg
@@ -1,9 +1,9 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/power-line.svg b/svg/iD-sprite/presets/power-line.svg
index 143ff297a..eb83c42f6 100644
--- a/svg/iD-sprite/presets/power-line.svg
+++ b/svg/iD-sprite/presets/power-line.svg
@@ -1,9 +1,9 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/railway-abandoned.svg b/svg/iD-sprite/presets/railway-abandoned.svg
index cce58d938..571a1e8f9 100644
--- a/svg/iD-sprite/presets/railway-abandoned.svg
+++ b/svg/iD-sprite/presets/railway-abandoned.svg
@@ -1,19 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/railway-disused.svg b/svg/iD-sprite/presets/railway-disused.svg
index af212ca9d..08a5cc4ab 100644
--- a/svg/iD-sprite/presets/railway-disused.svg
+++ b/svg/iD-sprite/presets/railway-disused.svg
@@ -1,22 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/railway-light-rail.svg b/svg/iD-sprite/presets/railway-light-rail.svg
index e44411449..ad54846b9 100644
--- a/svg/iD-sprite/presets/railway-light-rail.svg
+++ b/svg/iD-sprite/presets/railway-light-rail.svg
@@ -1,13 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/railway-monorail.svg b/svg/iD-sprite/presets/railway-monorail.svg
index 3d0ad26a1..809f90914 100644
--- a/svg/iD-sprite/presets/railway-monorail.svg
+++ b/svg/iD-sprite/presets/railway-monorail.svg
@@ -1,10 +1,10 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/railway-rail.svg b/svg/iD-sprite/presets/railway-rail.svg
index 1719b3707..afb6864c1 100644
--- a/svg/iD-sprite/presets/railway-rail.svg
+++ b/svg/iD-sprite/presets/railway-rail.svg
@@ -1,9 +1,9 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/railway-subway.svg b/svg/iD-sprite/presets/railway-subway.svg
index 67288aa5f..4f70688bd 100644
--- a/svg/iD-sprite/presets/railway-subway.svg
+++ b/svg/iD-sprite/presets/railway-subway.svg
@@ -1,13 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/railway-tram.svg b/svg/iD-sprite/presets/railway-tram.svg
index 30be971f8..bfb92be43 100644
--- a/svg/iD-sprite/presets/railway-tram.svg
+++ b/svg/iD-sprite/presets/railway-tram.svg
@@ -1,14 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/relation.svg b/svg/iD-sprite/presets/relation.svg
index a2dc02000..cf018f140 100644
--- a/svg/iD-sprite/presets/relation.svg
+++ b/svg/iD-sprite/presets/relation.svg
@@ -1,27 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/restriction-no-left-turn.svg b/svg/iD-sprite/presets/restriction-no-left-turn.svg
index 47ecd1277..0af919a78 100644
--- a/svg/iD-sprite/presets/restriction-no-left-turn.svg
+++ b/svg/iD-sprite/presets/restriction-no-left-turn.svg
@@ -1,6 +1,6 @@
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/restriction-no-right-turn.svg b/svg/iD-sprite/presets/restriction-no-right-turn.svg
index 7f8d11f1c..d58619366 100644
--- a/svg/iD-sprite/presets/restriction-no-right-turn.svg
+++ b/svg/iD-sprite/presets/restriction-no-right-turn.svg
@@ -1,6 +1,6 @@
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/restriction-no-straight-on.svg b/svg/iD-sprite/presets/restriction-no-straight-on.svg
index f90391e2f..8dad3dc32 100644
--- a/svg/iD-sprite/presets/restriction-no-straight-on.svg
+++ b/svg/iD-sprite/presets/restriction-no-straight-on.svg
@@ -1,6 +1,6 @@
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/restriction-no-u-turn.svg b/svg/iD-sprite/presets/restriction-no-u-turn.svg
index 50371cff1..a1c3eb741 100644
--- a/svg/iD-sprite/presets/restriction-no-u-turn.svg
+++ b/svg/iD-sprite/presets/restriction-no-u-turn.svg
@@ -1,6 +1,6 @@
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/restriction-only-left-turn.svg b/svg/iD-sprite/presets/restriction-only-left-turn.svg
index 7b7feb9be..8c08d6bfa 100644
--- a/svg/iD-sprite/presets/restriction-only-left-turn.svg
+++ b/svg/iD-sprite/presets/restriction-only-left-turn.svg
@@ -1,5 +1,5 @@
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/restriction-only-right-turn.svg b/svg/iD-sprite/presets/restriction-only-right-turn.svg
index edc410414..e803043b2 100644
--- a/svg/iD-sprite/presets/restriction-only-right-turn.svg
+++ b/svg/iD-sprite/presets/restriction-only-right-turn.svg
@@ -1,5 +1,5 @@
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/restriction-only-straight-on.svg b/svg/iD-sprite/presets/restriction-only-straight-on.svg
index 3abc1ddfc..a34d45262 100644
--- a/svg/iD-sprite/presets/restriction-only-straight-on.svg
+++ b/svg/iD-sprite/presets/restriction-only-straight-on.svg
@@ -1,5 +1,5 @@
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/restriction-only-u-turn.svg b/svg/iD-sprite/presets/restriction-only-u-turn.svg
index 0169acf23..b4df5cd3e 100644
--- a/svg/iD-sprite/presets/restriction-only-u-turn.svg
+++ b/svg/iD-sprite/presets/restriction-only-u-turn.svg
@@ -1,5 +1,5 @@
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/restriction.svg b/svg/iD-sprite/presets/restriction.svg
index 3a598bd73..f732c27fa 100644
--- a/svg/iD-sprite/presets/restriction.svg
+++ b/svg/iD-sprite/presets/restriction.svg
@@ -1,5 +1,5 @@
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/route-bicycle.svg b/svg/iD-sprite/presets/route-bicycle.svg
index ace6da0e2..9c25ff0da 100644
--- a/svg/iD-sprite/presets/route-bicycle.svg
+++ b/svg/iD-sprite/presets/route-bicycle.svg
@@ -1,21 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/route-bus.svg b/svg/iD-sprite/presets/route-bus.svg
index d5b12648a..b68d6dffa 100644
--- a/svg/iD-sprite/presets/route-bus.svg
+++ b/svg/iD-sprite/presets/route-bus.svg
@@ -1,21 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/route-detour.svg b/svg/iD-sprite/presets/route-detour.svg
index 22aa2463c..93dc5137e 100644
--- a/svg/iD-sprite/presets/route-detour.svg
+++ b/svg/iD-sprite/presets/route-detour.svg
@@ -1,23 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/route-ferry.svg b/svg/iD-sprite/presets/route-ferry.svg
index 70c9890fe..3c8ba1f75 100644
--- a/svg/iD-sprite/presets/route-ferry.svg
+++ b/svg/iD-sprite/presets/route-ferry.svg
@@ -1,21 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/route-foot.svg b/svg/iD-sprite/presets/route-foot.svg
index c62a329e6..0fef5de75 100644
--- a/svg/iD-sprite/presets/route-foot.svg
+++ b/svg/iD-sprite/presets/route-foot.svg
@@ -1,21 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/route-horse.svg b/svg/iD-sprite/presets/route-horse.svg
index 15e2d3fa5..717a2e456 100644
--- a/svg/iD-sprite/presets/route-horse.svg
+++ b/svg/iD-sprite/presets/route-horse.svg
@@ -1,21 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/route-light-rail.svg b/svg/iD-sprite/presets/route-light-rail.svg
index 17ac56ffc..e25e204f1 100644
--- a/svg/iD-sprite/presets/route-light-rail.svg
+++ b/svg/iD-sprite/presets/route-light-rail.svg
@@ -1,25 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/route-line.svg b/svg/iD-sprite/presets/route-line.svg
index 23134bd88..ecfb9a9e6 100644
--- a/svg/iD-sprite/presets/route-line.svg
+++ b/svg/iD-sprite/presets/route-line.svg
@@ -1,21 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/route-master.svg b/svg/iD-sprite/presets/route-master.svg
index 10dbe5bbb..204c2c993 100644
--- a/svg/iD-sprite/presets/route-master.svg
+++ b/svg/iD-sprite/presets/route-master.svg
@@ -1,52 +1,52 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/route-pipeline.svg b/svg/iD-sprite/presets/route-pipeline.svg
index a13bd95aa..9ab78c031 100644
--- a/svg/iD-sprite/presets/route-pipeline.svg
+++ b/svg/iD-sprite/presets/route-pipeline.svg
@@ -1,25 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/route-piste.svg b/svg/iD-sprite/presets/route-piste.svg
index 21b959d1b..9cc4cd626 100644
--- a/svg/iD-sprite/presets/route-piste.svg
+++ b/svg/iD-sprite/presets/route-piste.svg
@@ -1,21 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/route-power.svg b/svg/iD-sprite/presets/route-power.svg
index fe0b5bc89..baf9121ac 100644
--- a/svg/iD-sprite/presets/route-power.svg
+++ b/svg/iD-sprite/presets/route-power.svg
@@ -1,22 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/route-road.svg b/svg/iD-sprite/presets/route-road.svg
index 7873f89c0..6ab66d4e6 100644
--- a/svg/iD-sprite/presets/route-road.svg
+++ b/svg/iD-sprite/presets/route-road.svg
@@ -1,21 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/route-subway.svg b/svg/iD-sprite/presets/route-subway.svg
index 338bc741d..b39b0e6cd 100644
--- a/svg/iD-sprite/presets/route-subway.svg
+++ b/svg/iD-sprite/presets/route-subway.svg
@@ -1,25 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/route-train.svg b/svg/iD-sprite/presets/route-train.svg
index bee1b2f25..78feb1f20 100644
--- a/svg/iD-sprite/presets/route-train.svg
+++ b/svg/iD-sprite/presets/route-train.svg
@@ -1,21 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/route-tram.svg b/svg/iD-sprite/presets/route-tram.svg
index 63ef6638f..d54b356cb 100644
--- a/svg/iD-sprite/presets/route-tram.svg
+++ b/svg/iD-sprite/presets/route-tram.svg
@@ -1,26 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/route-water.svg b/svg/iD-sprite/presets/route-water.svg
index da4f32f18..3031ca461 100644
--- a/svg/iD-sprite/presets/route-water.svg
+++ b/svg/iD-sprite/presets/route-water.svg
@@ -1,22 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/route.svg b/svg/iD-sprite/presets/route.svg
index 5ec6f518b..fc3f06416 100644
--- a/svg/iD-sprite/presets/route.svg
+++ b/svg/iD-sprite/presets/route.svg
@@ -1,20 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/waterway-canal.svg b/svg/iD-sprite/presets/waterway-canal.svg
index a7b02b973..7597c84db 100644
--- a/svg/iD-sprite/presets/waterway-canal.svg
+++ b/svg/iD-sprite/presets/waterway-canal.svg
@@ -1,9 +1,9 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/waterway-ditch.svg b/svg/iD-sprite/presets/waterway-ditch.svg
index 2b4d6be6c..ddc97838a 100644
--- a/svg/iD-sprite/presets/waterway-ditch.svg
+++ b/svg/iD-sprite/presets/waterway-ditch.svg
@@ -1,9 +1,9 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/waterway-river.svg b/svg/iD-sprite/presets/waterway-river.svg
index cc6affd7c..dad12e25d 100644
--- a/svg/iD-sprite/presets/waterway-river.svg
+++ b/svg/iD-sprite/presets/waterway-river.svg
@@ -1,9 +1,9 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/waterway-stream.svg b/svg/iD-sprite/presets/waterway-stream.svg
index 4e08fd7e3..698401bfb 100644
--- a/svg/iD-sprite/presets/waterway-stream.svg
+++ b/svg/iD-sprite/presets/waterway-stream.svg
@@ -1,9 +1,9 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/svg/spriteify.js b/svg/spriteify.js
deleted file mode 100755
index e1e5a3779..000000000
--- a/svg/spriteify.js
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/usr/bin/env node
-'use strict';
-
-const argv = require('minimist')(process.argv.slice(2));
-if (argv.help || argv.h || !argv.svg) {
- return help();
-}
-const fs = require('fs');
-const json = (argv.json ? JSON.parse(fs.readFileSync(argv.json)) : {});
-const xml2js = require('xml2js');
-
-
-xmlToJs(argv.svg, function(err, obj) {
- if (err) throw (err);
- jsToXml(obj, function (err) {
- if (err) console.log(err);
- });
-});
-
-
-function xmlToJs(filename, cb) {
- fs.readFile(filename, 'utf8', function(err, xmlStr) {
- if (err) throw (err);
-
- const opts = {
- explicitArray: true,
- explicitCharkey: true,
- explicitChildren: true,
- preserveChildrenOrder: true,
- normalize: true,
- attrkey: '#attr',
- childkey: '#child',
- charkey: '#char'
- };
- const parser = new xml2js.Parser(opts);
-
- parser.parseString(xmlStr, function (err, obj) {
- cb(err, obj);
- });
- });
-}
-
-
-function jsToXml(obj, cb) {
- var src = transform(obj.svg);
- var builder = require('xmlbuilder');
- var doc = builder.create('svg',
- { version: '1.0', encoding: 'UTF-8' },
- { pubID: '-//W3C//DTD SVG 1.1//EN', sysID: 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'}
- );
-
- doc = build(doc, src);
- process.stdout.write(doc.end({ pretty: true }), 'utf8', cb);
-}
-
-
-function transform(source) {
- var target = {};
- target['#name'] = source['#name'];
-
- if (source['#char'] !== undefined) {
- target['#char'] = source['#char'];
- }
- if (source['#attr'] !== undefined) {
- var id = source['#attr'].id;
- var replace = (id && json[id] !== undefined) ? json[id] : {};
-
- target['#attr'] = Object.assign(source['#attr'], replace);
- if (replace.viewBox !== undefined) {
- target['#name'] = 'symbol';
- }
-
- }
- if (source['#child'] !== undefined && source['#child'].constructor === Array) {
- target['#child'] = [];
- for (var i = 0; i < source['#child'].length; i++) {
- target['#child'].push(transform(source['#child'][i]));
- }
- }
-
- return target;
-}
-
-
-function build(doc, source) {
- if (source['#name']) {
- var isRoot = (source['#name'] === 'svg');
-
- if (!isRoot) {
- doc = doc.ele(source['#name']);
- }
- if (source['#attr']) {
- doc = doc.att(source['#attr']);
- }
- if (source['#char']) {
- doc = doc.txt(source['#char']);
- }
- if (source['#child'] && source['#child'].constructor === Array) {
- for (var i = 0; i < source['#child'].length; i++) {
- doc = build(doc, source['#child'][i]);
- }
- }
-
- if (isRoot) {
- doc = doc.att({
- 'version': "1.1",
- 'xmlns': "http://www.w3.org/2000/svg",
- 'xmlns:xlink': "http://www.w3.org/1999/xlink"
- });
- } else {
- doc = doc.up();
- }
- }
- return doc;
-}
-
-
-function help() {
- console.log('usage:');
- console.log(' spriteify --svg source.svg --json source.json > destination.svg');
- console.log('');
-}
-