Merge branch 'input-text-style' of https://github.com/51114u9/iD into 51114u9-input-text-style

css/20_map.css

@@ -32,7 +32,7 @@ g.point .stroke {
 g.point .shadow {
     fill: none;
     stroke: #f6634f;
-    stroke-width: 8;
+    stroke-width: 16;
     stroke-opacity: 0;
 }
 
@@ -74,6 +74,7 @@ g.midpoint .fill {
 
 g.vertex .shadow,
 g.midpoint .shadow {
+    stroke-width: 16;
     fill: #f6634f;
     fill-opacity: 0;
 }
@@ -141,7 +142,7 @@ path.stroke {
 
 path.shadow {
     stroke: #f6634f;
-    stroke-width: 10;
+    stroke-width: 16;
     stroke-opacity: 0;
 }
 

css/30_highways.css

@@ -1,39 +1,44 @@
 /* highways */
 
+.preset-icon .icon.tag-highway.other-line {
+    color: #fff;
+    fill: #777;
+}
+path.casing.tag-highway {
+    stroke: #444;
+}
+path.stroke.tag-highway {
+    stroke: #ccc;
+}
+
 /* highway areas */
+
 path.stroke.area.tag-highway {
-    stroke:#fff;
+    stroke: #fff;
     stroke-dasharray: none;
     stroke-width: 2;
 }
 
 /* wide highways */
 
-.preset-icon .icon.tag-highway.other-line {
-    color: #fff;
-    fill: #777;
-}
-
 path.shadow.tag-highway {
-    stroke-width:16;
+    stroke-width: 20;
 }
 path.casing.tag-highway {
-    stroke:#444;
-    stroke-width:10;
+    stroke-width: 10;
 }
 path.stroke.tag-highway {
-    stroke:#ccc;
-    stroke-width:8;
+    stroke-width: 8;
 }
 
 .low-zoom path.shadow.tag-highway {
-    stroke-width:12;
+    stroke-width: 16;
 }
 .low-zoom path.casing.tag-highway {
-    stroke-width:6;
+    stroke-width: 7;
 }
 .low-zoom path.stroke.tag-highway {
-    stroke-width:4;
+    stroke-width: 5;
 }
 
 .preset-icon .icon.highway-motorway,
@@ -224,33 +229,54 @@ path.casing.tag-unclassified {
 
 
 /* narrow highways */
-path.stroke.tag-highway-living_street,
-path.stroke.tag-highway-service,
-path.stroke.tag-highway-track,
-path.stroke.tag-highway-path,
-path.stroke.tag-highway-footway,
-path.stroke.tag-highway-cycleway,
-path.stroke.tag-highway-bridleway,
-path.stroke.tag-highway-corridor,
-path.stroke.tag-highway-pedestrian,
-path.stroke.tag-highway-steps,
-path.stroke.tag-highway-road,
-path.stroke.tag-living_street,
-path.stroke.tag-service,
-path.stroke.tag-track,
-path.stroke.tag-path,
-path.stroke.tag-footway,
-path.stroke.tag-cycleway,
-path.stroke.tag-bridleway,
-path.stroke.tag-corridor,
-path.stroke.tag-pedestrian,
-path.stroke.tag-steps,
-path.stroke.tag-road {
-    stroke-width:4;
+
+path.shadow.tag-highway-living_street,
+path.shadow.tag-highway-service,
+path.shadow.tag-highway-track,
+path.shadow.tag-highway-road,
+path.shadow.tag-living_street,
+path.shadow.tag-service,
+path.shadow.tag-track,
+path.shadow.tag-road {
+    stroke-width: 16;
 }
 path.casing.tag-highway-living_street,
 path.casing.tag-highway-service,
 path.casing.tag-highway-track,
+path.casing.tag-highway-road,
+path.casing.tag-living_street,
+path.casing.tag-service,
+path.casing.tag-track,
+path.casing.tag-road {
+    stroke-width: 7;
+}
+path.stroke.tag-highway-living_street,
+path.stroke.tag-highway-service,
+path.stroke.tag-highway-track,
+path.stroke.tag-highway-road,
+path.stroke.tag-living_street,
+path.stroke.tag-service,
+path.stroke.tag-track,
+path.stroke.tag-road {
+    stroke-width: 5;
+}
+
+path.shadow.tag-highway-path,
+path.shadow.tag-highway-footway,
+path.shadow.tag-highway-cycleway,
+path.shadow.tag-highway-bridleway,
+path.shadow.tag-highway-corridor,
+path.shadow.tag-highway-pedestrian,
+path.shadow.tag-highway-steps,
+path.shadow.tag-path,
+path.shadow.tag-footway,
+path.shadow.tag-cycleway,
+path.shadow.tag-bridleway,
+path.shadow.tag-corridor,
+path.shadow.tag-pedestrian,
+path.shadow.tag-steps {
+    stroke-width: 16;
+}
 path.casing.tag-highway-path,
 path.casing.tag-highway-footway,
 path.casing.tag-highway-cycleway,
@@ -258,48 +284,79 @@ path.casing.tag-highway-bridleway,
 path.casing.tag-highway-corridor,
 path.casing.tag-highway-pedestrian,
 path.casing.tag-highway-steps,
-path.casing.tag-highway-road,
-path.casing.tag-living_street,
-path.casing.tag-service,
-path.casing.tag-track,
 path.casing.tag-path,
 path.casing.tag-footway,
 path.casing.tag-cycleway,
 path.casing.tag-bridleway,
 path.casing.tag-corridor,
 path.casing.tag-pedestrian,
-path.casing.tag-steps,
-path.casing.tag-road {
-    stroke-width:6;
+path.casing.tag-steps {
+    stroke-width: 5;
+}
+path.stroke.tag-highway-path,
+path.stroke.tag-highway-footway,
+path.stroke.tag-highway-cycleway,
+path.stroke.tag-highway-bridleway,
+path.stroke.tag-highway-corridor,
+path.stroke.tag-highway-pedestrian,
+path.stroke.tag-highway-steps,
+path.stroke.tag-path,
+path.stroke.tag-footway,
+path.stroke.tag-cycleway,
+path.stroke.tag-bridleway,
+path.stroke.tag-corridor,
+path.stroke.tag-pedestrian,
+path.stroke.tag-steps {
+    stroke-width: 3;
 }
 
-.low-zoom path.stroke.tag-highway-living_street,
-.low-zoom path.stroke.tag-highway-service,
-.low-zoom path.stroke.tag-highway-track,
-.low-zoom path.stroke.tag-highway-path,
-.low-zoom path.stroke.tag-highway-footway,
-.low-zoom path.stroke.tag-highway-cycleway,
-.low-zoom path.stroke.tag-highway-bridleway,
-.low-zoom path.stroke.tag-highway-corridor,
-.low-zoom path.stroke.tag-highway-pedestrian,
-.low-zoom path.stroke.tag-highway-steps,
-.low-zoom path.stroke.tag-highway-road,
-.low-zoom path.stroke.tag-living_street,
-.low-zoom path.stroke.tag-service,
-.low-zoom path.stroke.tag-track,
-.low-zoom path.stroke.tag-path,
-.low-zoom path.stroke.tag-footway,
-.low-zoom path.stroke.tag-cycleway,
-.low-zoom path.stroke.tag-bridleway,
-.low-zoom path.stroke.tag-corridor,
-.low-zoom path.stroke.tag-pedestrian,
-.low-zoom path.stroke.tag-steps,
-.low-zoom path.stroke.tag-road {
-    stroke-width:2;
+.low-zoom path.shadow.tag-highway-living_street,
+.low-zoom path.shadow.tag-highway-service,
+.low-zoom path.shadow.tag-highway-track,
+.low-zoom path.shadow.tag-highway-road,
+.low-zoom path.shadow.tag-living_street,
+.low-zoom path.shadow.tag-service,
+.low-zoom path.shadow.tag-track,
+.low-zoom path.shadow.tag-road {
+    stroke-width: 12;
 }
 .low-zoom path.casing.tag-highway-living_street,
 .low-zoom path.casing.tag-highway-service,
 .low-zoom path.casing.tag-highway-track,
+.low-zoom path.casing.tag-highway-road,
+.low-zoom path.casing.tag-living_street,
+.low-zoom path.casing.tag-service,
+.low-zoom path.casing.tag-track,
+.low-zoom path.casing.tag-road {
+    stroke-width: 5;
+}
+.low-zoom path.stroke.tag-highway-living_street,
+.low-zoom path.stroke.tag-highway-service,
+.low-zoom path.stroke.tag-highway-track,
+.low-zoom path.stroke.tag-highway-road,
+.low-zoom path.stroke.tag-living_street,
+.low-zoom path.stroke.tag-service,
+.low-zoom path.stroke.tag-track,
+.low-zoom path.stroke.tag-road {
+    stroke-width: 3;
+}
+
+.low-zoom path.shadow.tag-highway-path,
+.low-zoom path.shadow.tag-highway-footway,
+.low-zoom path.shadow.tag-highway-cycleway,
+.low-zoom path.shadow.tag-highway-bridleway,
+.low-zoom path.shadow.tag-highway-corridor,
+.low-zoom path.shadow.tag-highway-pedestrian,
+.low-zoom path.shadow.tag-highway-steps,
+.low-zoom path.shadow.tag-path,
+.low-zoom path.shadow.tag-footway,
+.low-zoom path.shadow.tag-cycleway,
+.low-zoom path.shadow.tag-bridleway,
+.low-zoom path.shadow.tag-corridor,
+.low-zoom path.shadow.tag-pedestrian,
+.low-zoom path.shadow.tag-steps {
+    stroke-width: 12;
+}
 .low-zoom path.casing.tag-highway-path,
 .low-zoom path.casing.tag-highway-footway,
 .low-zoom path.casing.tag-highway-cycleway,
@@ -307,20 +364,32 @@ path.casing.tag-road {
 .low-zoom path.casing.tag-highway-corridor,
 .low-zoom path.casing.tag-highway-pedestrian,
 .low-zoom path.casing.tag-highway-steps,
-.low-zoom path.casing.tag-highway-road,
-.low-zoom path.casing.tag-living_street,
-.low-zoom path.casing.tag-service,
-.low-zoom path.casing.tag-track,
 .low-zoom path.casing.tag-path,
 .low-zoom path.casing.tag-footway,
 .low-zoom path.casing.tag-cycleway,
 .low-zoom path.casing.tag-bridleway,
 .low-zoom path.casing.tag-corridor,
 .low-zoom path.casing.tag-pedestrian,
-.low-zoom path.casing.tag-steps,
-.low-zoom path.casing.tag-road {
-    stroke-width:4;
+.low-zoom path.casing.tag-steps {
+    stroke-width: 3;
 }
+.low-zoom path.stroke.tag-highway-path,
+.low-zoom path.stroke.tag-highway-footway,
+.low-zoom path.stroke.tag-highway-cycleway,
+.low-zoom path.stroke.tag-highway-bridleway,
+.low-zoom path.stroke.tag-highway-corridor,
+.low-zoom path.stroke.tag-highway-pedestrian,
+.low-zoom path.stroke.tag-highway-steps,
+.low-zoom path.stroke.tag-path,
+.low-zoom path.stroke.tag-footway,
+.low-zoom path.stroke.tag-cycleway,
+.low-zoom path.stroke.tag-bridleway,
+.low-zoom path.stroke.tag-corridor,
+.low-zoom path.stroke.tag-pedestrian,
+.low-zoom path.stroke.tag-steps {
+    stroke-width: 1;
+}
+
 
 .preset-icon .icon.highway-living-street {
     color: #bbb;
@@ -347,6 +416,12 @@ path.stroke.tag-pedestrian {
     stroke:#fff;
     stroke-dasharray: 2, 8;
 }
+.low-zoom path.stroke.tag-highway-corridor,
+.low-zoom path.stroke.tag-highway-pedestrian,
+.low-zoom path.stroke.tag-corridor,
+.low-zoom path.stroke.tag-pedestrian {
+    stroke-dasharray: 1, 4;
+}
 path.casing.tag-highway-corridor,
 path.casing.tag-highway-pedestrian,
 path.casing.tag-corridor,
@@ -406,6 +481,13 @@ path.stroke.tag-highway-bridleway {
     stroke-linecap: butt;
     stroke-dasharray: 6, 6;
 }
+.low-zoom path.stroke.tag-highway-path,
+.low-zoom path.stroke.tag-highway-footway,
+.low-zoom path.stroke.tag-highway-cycleway,
+.low-zoom path.stroke.tag-highway-bridleway {
+    stroke-linecap: butt;
+    stroke-dasharray: 3, 3;
+}
 
 path.casing.tag-highway-path,
 path.casing.tag-highway-path.tag-unpaved {
@@ -450,6 +532,9 @@ path.stroke.tag-highway-footway.tag-crossing {
     stroke: #444;
     stroke-dasharray: 6, 4;
 }
+.low-zoom path.stroke.tag-highway-footway.tag-crossing {
+    stroke-dasharray: 3, 2;
+}
 
 .preset-icon .icon.tag-route-bicycle,
 .preset-icon .icon.highway-cycleway {
@@ -478,6 +563,9 @@ path.stroke.tag-highway-steps {
     stroke-linecap: butt;
     stroke-dasharray: 3, 3;
 }
+.low-zoom path.stroke.tag-highway-steps {
+    stroke-dasharray: 2, 2;
+}
 path.casing.tag-highway-steps,
 path.casing.tag-highway-steps.tag-unpaved {
     stroke: #fff;

css/35_aeroways.css

@@ -7,23 +7,32 @@ path.stroke.area.tag-aeroway {
     stroke-width: 2;
 }
 
-/* lines */
-path.stroke.tag-aeroway-taxiway,
-path.stroke.tag-taxiway {
-    stroke-width: 4;
+/* narrow aeroways (taxiway) */
+
+path.shadow.tag-aeroway-taxiway,
+path.shadow.tag-taxiway {
+    stroke-width: 16;
 }
 path.casing.tag-aeroway-taxiway,
 path.casing.tag-taxiway {
-    stroke-width: 6;
+    stroke-width: 7;
+}
+path.stroke.tag-aeroway-taxiway,
+path.stroke.tag-taxiway {
+    stroke-width: 5;
 }
 
-.low-zoom path.stroke.tag-aeroway-taxiway,
-.low-zoom path.stroke.tag-taxiway {
-    stroke-width: 2;
+.low-zoom path.shadow.tag-aeroway-taxiway,
+.low-zoom path.shadow.tag-taxiway {
+    stroke-width: 12;
 }
 .low-zoom path.casing.tag-aeroway-taxiway,
 .low-zoom path.casing.tag-taxiway {
-    stroke-width: 4;
+    stroke-width: 5;
+}
+.low-zoom path.stroke.tag-aeroway-taxiway,
+.low-zoom path.stroke.tag-taxiway {
+    stroke-width: 3;
 }
 
 .preset-icon .icon.tag-aeroway-taxiway,
@@ -40,6 +49,9 @@ path.casing.tag-taxiway {
     stroke: #666;
 }
 
+
+/* wide aeroways (runway) */
+
 .preset-icon .icon.tag-aeroway-runway,
 .preset-icon .icon.tag-runway {
     color: #444;
@@ -48,17 +60,29 @@ path.casing.tag-taxiway {
 path.shadow.tag-aeroway-runway {
     stroke-width: 20;
 }
+path.casing.tag-aeroway-runway {
+    stroke-width: 10;
+    stroke: #000;
+    stroke-linecap: square;
+}
 path.stroke.tag-aeroway-runway {
     stroke: #fff;
     stroke-width: 2;
     stroke-linecap: butt;
     stroke-dasharray: 24, 48;
 }
-path.casing.tag-aeroway-runway {
-    stroke-width: 10;
-    stroke: #000;
-    stroke-linecap: square;
+
+.low-zoom path.shadow.tag-aeroway-runway {
+    stroke-width: 16;
 }
+.low-zoom path.casing.tag-aeroway-runway {
+    stroke-width: 7;
+}
+.low-zoom path.stroke.tag-aeroway-runway {
+    stroke-width: 2;
+    stroke-dasharray: 12, 24;
+}
+
 path.fill.tag-aeroway-runway {
     stroke: rgba(0, 0, 0, 0.6);
     fill: rgba(0, 0, 0, 0.6);

css/40_railways.css

@@ -8,48 +8,77 @@
     color: #555;
     fill: #eee;
 }
+
+/* narrow widths */
+
+path.shadow.tag-railway {
+    stroke-width: 16;
+}
+path.casing.tag-railway {
+    stroke-width: 7;
+}
 path.stroke.tag-railway {
-    stroke: #eee;
     stroke-width: 2;
     stroke-linecap: butt;
     stroke-dasharray: 12,12;
 }
+
+.low-zoom path.shadow.tag-railway {
+    stroke-width: 12;
+}
+.low-zoom path.casing.tag-railway {
+    stroke-width: 5;
+}
+.low-zoom path.stroke.tag-railway {
+    stroke-width: 2;
+    stroke-dasharray: 6,6;
+}
+
+
+/* styles */
+
 path.casing.tag-railway {
     stroke: #555;
-    stroke-width: 4;
 }
+path.stroke.tag-railway {
+    stroke: #eee;
+}
+
 
 .preset-icon .icon.tag-railway-disused,
 .preset-icon .icon.tag-railway-abandoned {
     color: #999;
     fill: #eee;
 }
-path.stroke.tag-railway-abandoned {
-    stroke: #eee;
-}
 path.casing.tag-railway-abandoned {
     stroke: #999;
 }
+path.stroke.tag-railway-abandoned {
+    stroke: #eee;
+}
+
 
 .preset-icon .icon.tag-railway-subway {
     color: #222;
     fill: #bbb;
 }
-path.stroke.tag-railway-subway {
-    stroke: #bbb;
-}
 path.casing.tag-railway-subway {
     stroke: #222;
 }
+path.stroke.tag-railway-subway {
+    stroke: #bbb;
+}
 
+
+path.casing.tag-railway-platform {
+    stroke: none;
+}
 path.stroke.tag-railway-platform {
     stroke: #999;
     stroke-width: 4;
     stroke-dasharray: none;
 }
-path.casing.tag-railway-platform {
-    stroke: none;
-}
+
 
 .area.stroke.tag-railway {
     stroke: white;

css/45_waterways.css

@@ -15,35 +15,72 @@ path.fill.tag-waterway {
     stroke: rgba(119, 211, 222, 0.3);
     fill: rgba(119, 211, 222, 0.3);
 }
-
+path.casing.tag-waterway {
+    stroke: #3d6c71;
+}
 path.stroke.tag-waterway {
     stroke: #77d3de;
-    stroke-width: 2;
+}
+
+
+/* narrow waterways (default) */
+
+path.shadow.tag-waterway {
+    stroke-width: 16;
 }
 path.casing.tag-waterway {
-    stroke: #77d3de;
-    stroke-width: 4;
+    stroke-width: 7;
+}
+path.stroke.tag-waterway {
+    stroke-width: 5;
 }
 
-path.stroke.tag-waterway-river {
-    stroke-width: 4;
+.low-zoom path.shadow.tag-waterway {
+    stroke-width: 12;
 }
-path.casing.tag-waterway-river {
-    stroke-width: 6;
+.low-zoom path.casing.tag-waterway {
+    stroke-width: 5;
 }
-
-.preset-icon .icon.tag-waterway-ditch {
-    color: #6591ff;
-}
-path.stroke.tag-waterway-ditch {
-    stroke: #6591ff;
-    stroke-width: 1;
-}
-path.casing.tag-waterway-ditch {
-    stroke: #6591ff;
+.low-zoom path.stroke.tag-waterway {
     stroke-width: 3;
 }
 
+
+/* wide waterways (river) */
+
+path.shadow.tag-waterway-river {
+    stroke-width: 20;
+}
+path.casing.tag-waterway-river {
+    stroke-width: 10;
+}
+path.stroke.tag-waterway-river {
+    stroke-width: 8;
+}
+
+.low-zoom path.shadow.tag-waterway-river {
+    stroke-width: 16;
+}
+.low-zoom path.casing.tag-waterway-river {
+    stroke-width: 7;
+}
+.low-zoom path.stroke.tag-waterway-river {
+    stroke-width: 5;
+}
+
+
+/* ditch */
+
+.preset-icon .icon.tag-waterway-ditch {
+    color: #8eabf3;
+}
+path.stroke.tag-waterway-ditch {
+    stroke: #8eabf3;
+}
+
+
+/* waterway areas */
+
 path.area.stroke.tag-waterway-dock,
 path.area.stroke.tag-waterway-boatyard,
 path.area.stroke.tag-waterway-fuel {

css/50_misc.css

@@ -48,7 +48,6 @@ path.stroke.tag-barrier {
 
 /* bridges */
 path.casing.tag-bridge {
-    stroke-width: 16;
     stroke-opacity: 0.6;
     stroke: #000;
     stroke-linecap: butt;
@@ -58,6 +57,29 @@ path.casing.tag-bridge {
 path.shadow.tag-bridge {
     stroke-width: 22;
 }
+path.casing.tag-bridge {
+    stroke-width: 16;
+}
+.low-zoom path.shadow.tag-bridge {
+    stroke-width: 14;
+}
+.low-zoom path.casing.tag-bridge {
+    stroke-width: 10;
+}
+
+path.shadow.line.tag-railway.tag-bridge,
+path.shadow.tag-highway-living_street.tag-bridge,
+path.shadow.tag-highway-path.tag-bridge,
+path.shadow.tag-highway-corridor.tag-bridge,
+path.shadow.line.tag-highway-pedestrian.tag-bridge,
+path.shadow.tag-highway-service.tag-bridge,
+path.shadow.tag-highway-track.tag-bridge,
+path.shadow.tag-highway-steps.tag-bridge,
+path.shadow.tag-highway-footway.tag-bridge,
+path.shadow.tag-highway-cycleway.tag-bridge,
+path.shadow.tag-highway-bridleway.tag-bridge {
+    stroke-width: 17;
+}
 path.casing.line.tag-railway.tag-bridge,
 path.casing.tag-highway-living_street.tag-bridge,
 path.casing.tag-highway-path.tag-bridge,
@@ -71,39 +93,6 @@ path.casing.tag-highway-cycleway.tag-bridge,
 path.casing.tag-highway-bridleway.tag-bridge {
     stroke-width: 10;
 }
-path.shadow.line.tag-railway.tag-bridge,
-path.shadow.tag-highway-living_street.tag-bridge,
-path.shadow.tag-highway-path.tag-bridge,
-path.shadow.tag-highway-corridor.tag-bridge,
-path.shadow.line.tag-highway-pedestrian.tag-bridge,
-path.shadow.tag-highway-service.tag-bridge,
-path.shadow.tag-highway-track.tag-bridge,
-path.shadow.tag-highway-steps.tag-bridge,
-path.shadow.tag-highway-footway.tag-bridge,
-path.shadow.tag-highway-cycleway.tag-bridge,
-path.shadow.tag-highway-bridleway.tag-bridge {
-    stroke-width: 17;
-}
-.low-zoom path.casing.tag-bridge {
-    stroke-width: 10;
-}
-.low-zoom path.shadow.tag-bridge {
-    stroke-width: 14;
-}
-
-.low-zoom path.casing.line.tag-railway.tag-bridge,
-.low-zoom path.casing.tag-highway-living_street.tag-bridge,
-.low-zoom path.casing.tag-highway-path.tag-bridge,
-.low-zoom path.casing.tag-highway-corridor.tag-bridge,
-.low-zoom path.casing.line.tag-highway-pedestrian.tag-bridge,
-.low-zoom path.casing.tag-highway-service.tag-bridge,
-.low-zoom path.casing.tag-highway-track.tag-bridge,
-.low-zoom path.casing.tag-highway-steps.tag-bridge,
-.low-zoom path.casing.tag-highway-footway.tag-bridge,
-.low-zoom path.casing.tag-highway-cycleway.tag-bridge,
-.low-zoom path.casing.tag-highway-bridleway.tag-bridge {
-    stroke-width: 6;
-}
 
 .low-zoom path.shadow.line.tag-railway.tag-bridge,
 .low-zoom path.shadow.tag-highway-living_street.tag-bridge,
@@ -116,7 +105,20 @@ path.shadow.tag-highway-bridleway.tag-bridge {
 .low-zoom path.shadow.tag-highway-footway.tag-bridge,
 .low-zoom path.shadow.tag-highway-cycleway.tag-bridge,
 .low-zoom path.shadow.tag-highway-bridleway.tag-bridge {
-    stroke-width: 13;
+    stroke-width: 14;
+}
+.low-zoom path.casing.line.tag-railway.tag-bridge,
+.low-zoom path.casing.tag-highway-living_street.tag-bridge,
+.low-zoom path.casing.tag-highway-path.tag-bridge,
+.low-zoom path.casing.tag-highway-corridor.tag-bridge,
+.low-zoom path.casing.line.tag-highway-pedestrian.tag-bridge,
+.low-zoom path.casing.tag-highway-service.tag-bridge,
+.low-zoom path.casing.tag-highway-track.tag-bridge,
+.low-zoom path.casing.tag-highway-steps.tag-bridge,
+.low-zoom path.casing.tag-highway-footway.tag-bridge,
+.low-zoom path.casing.tag-highway-cycleway.tag-bridge,
+.low-zoom path.casing.tag-highway-bridleway.tag-bridge {
+    stroke-width: 6;
 }
 
 
@@ -132,6 +134,10 @@ path.casing.tag-tunnel {
 
 
 /* embankments / cuttings */
+path.shadow.tag-embankment,
+path.shadow.tag-cutting {
+    stroke-width: 28;
+}
 path.casing.tag-embankment,
 path.casing.tag-cutting {
     stroke-opacity: 0.5;
@@ -141,20 +147,14 @@ path.casing.tag-cutting {
     stroke-linecap: butt;
 }
 
-path.shadow.tag-embankment,
-path.shadow.tag-cutting {
-    stroke-width: 28;
-}
-
-.low-zoom path.casing.tag-embankment,
-.low-zoom path.casing.tag-cutting {
-    stroke-width: 10;
-}
-
 .low-zoom path.shadow.tag-embankment,
 .low-zoom path.shadow.tag-cutting {
     stroke-width: 14;
 }
+.low-zoom path.casing.tag-embankment,
+.low-zoom path.casing.tag-cutting {
+    stroke-width: 10;
+}
 
 
 /* Surface - unpaved */

css/70_fills.css

@@ -10,15 +10,15 @@
 
 .low-zoom.fill-wireframe path.shadow,
 .fill-wireframe path.shadow {
-    stroke-width: 8 !important;
+    stroke-width: 12;
 }
 
 .fill-wireframe path.shadow.related:not(.selected),
 .fill-wireframe path.shadow.hover:not(.selected) {
-    stroke-opacity: 0.4 !important;
+    stroke-opacity: 0.4;
 }
 .fill-wireframe path.shadow.selected {
-    stroke-opacity: 0.6 !important;
+    stroke-opacity: 0.6;
 }
 
 .fill-wireframe .point,

css/80_app.css

@@ -188,12 +188,12 @@ input[type=email] {
     text-overflow: ellipsis;
 }
 [dir='rtl'] textarea,
-input[type=text],
-input[type=search],
-input[type=number],
-input[type=url],
-input[type=tel],
-input[type=email] {
+[dir='rtl'] input[type=text],
+[dir='rtl'] input[type=search],
+[dir='rtl'] input[type=number],
+[dir='rtl'] input[type=url],
+[dir='rtl'] input[type=tel],
+[dir='rtl'] input[type=email] {
     padding:5px 10px 5px 25px;
 }
 

data/presets.yaml

@@ -316,6 +316,9 @@ en:
           anticlockwise: Counterclockwise
           # direction=clockwise
           clockwise: Clockwise
+      club:
+        # club=*
+        label: Type
       collection_times:
         # collection_times=*
         label: Collection Times
@@ -1435,6 +1438,21 @@ en:
       amenity:
         # amenity=*
         name: Amenity
+      amenity/animal_boarding:
+        # amenity=animal_boarding
+        name: Animal Boarding Facility
+        # 'terms: boarding,cat,dog,horse,kitten,pet boarding,pet care,pet hotel,puppy,reptile'
+        terms: '<translate with synonyms or related terms for ''Animal Boarding Facility'', separated by commas>'
+      amenity/animal_breeding:
+        # amenity=animal_breeding
+        name: Animal Breeding Facility
+        # 'terms: breeding,bull,cat,cow,dog,horse,husbandry,kitten,livestock,pet breeding,puppy,reptile'
+        terms: '<translate with synonyms or related terms for ''Animal Breeding Facility'', separated by commas>'
+      amenity/animal_shelter:
+        # amenity=animal_shelter
+        name: Animal Shelter
+        # 'terms: adoption,aspca,cat,dog,horse,kitten,pet care,pet rescue,puppy,raptor,reptile,rescue,spca'
+        terms: '<translate with synonyms or related terms for ''Animal Shelter'', separated by commas>'
       amenity/arts_centre:
         # amenity=arts_centre
         name: Arts Center
@@ -1589,6 +1607,10 @@ en:
         name: Drinking Water
         # 'terms: fountain,potable'
         terms: '<translate with synonyms or related terms for ''Drinking Water'', separated by commas>'
+      amenity/driving_school:
+        # amenity=driving_school
+        name: Driving School
+        terms: '<translate with synonyms or related terms for ''Driving School'', separated by commas>'
       amenity/embassy:
         # amenity=embassy
         name: Embassy
@@ -1929,6 +1951,10 @@ en:
         # amenity=water_point
         name: RV Drinking Water
         terms: '<translate with synonyms or related terms for ''RV Drinking Water'', separated by commas>'
+      amenity/watering_place:
+        # amenity=watering_place
+        name: Animal Watering Place
+        terms: '<translate with synonyms or related terms for ''Animal Watering Place'', separated by commas>'
       area:
         # area=yes
         name: Area
@@ -2166,6 +2192,11 @@ en:
         name: Camp Pitch
         # 'terms: tent,rv'
         terms: '<translate with synonyms or related terms for ''Camp Pitch'', separated by commas>'
+      club:
+        # club=*
+        name: Club
+        # 'terms: social'
+        terms: '<translate with synonyms or related terms for ''Club'', separated by commas>'
       craft:
         # craft=*
         name: Craft
@@ -3017,6 +3048,11 @@ en:
         # 'leisure=pitch, sport=cricket'
         name: Cricket Field
         terms: '<translate with synonyms or related terms for ''Cricket Field'', separated by commas>'
+      leisure/pitch/equestrian:
+        # 'leisure=pitch, sport=equestrian'
+        name: Riding Arena
+        # 'terms: dressage,equestrian,horse,horseback,riding'
+        terms: '<translate with synonyms or related terms for ''Riding Arena'', separated by commas>'
       leisure/pitch/rugby_league:
         # 'leisure=pitch, sport=rugby_league'
         name: Rugby League Field
@@ -3483,15 +3519,20 @@ en:
         name: Neighborhood
         # 'terms: neighbourhood'
         terms: '<translate with synonyms or related terms for ''Neighborhood'', separated by commas>'
+      place/quarter:
+        # place=quarter
+        name: Sub-Borough / Quarter
+        # 'terms: boro,borough,quarter'
+        terms: '<translate with synonyms or related terms for ''Sub-Borough / Quarter'', separated by commas>'
       place/square:
         # place=square
         name: Square
         terms: '<translate with synonyms or related terms for ''Square'', separated by commas>'
       place/suburb:
         # place=suburb
-        name: Borough
-        # 'terms: Boro,Quarter'
-        terms: '<translate with synonyms or related terms for ''Borough'', separated by commas>'
+        name: Borough / Suburb
+        # 'terms: boro,borough,quarter'
+        terms: '<translate with synonyms or related terms for ''Borough / Suburb'', separated by commas>'
       place/town:
         # place=town
         name: Town
@@ -3880,6 +3921,11 @@ en:
         name: Garden Center
         # 'terms: landscape,mulch,shrub,tree'
         terms: '<translate with synonyms or related terms for ''Garden Center'', separated by commas>'
+      shop/gas:
+        # shop=gas
+        name: Bottled Gas Shop
+        # 'terms: cng,lpg,natural gas,propane,refill,tank'
+        terms: '<translate with synonyms or related terms for ''Bottled Gas Shop'', separated by commas>'
       shop/gift:
         # shop=gift
         name: Gift Shop
@@ -4022,10 +4068,14 @@ en:
         # shop=pawnbroker
         name: Pawn Shop
         terms: '<translate with synonyms or related terms for ''Pawn Shop'', separated by commas>'
+      shop/perfumery:
+        # shop=perfumery
+        name: Perfume Store
+        terms: '<translate with synonyms or related terms for ''Perfume Store'', separated by commas>'
       shop/pet:
         # shop=pet
         name: Pet Store
-        # 'terms: cat,dog,fish'
+        # 'terms: animal,cat,dog,fish,kitten,puppy,reptile'
         terms: '<translate with synonyms or related terms for ''Pet Store'', separated by commas>'
       shop/photo:
         # shop=photo

data/presets/fields.json

@@ -401,6 +401,11 @@
                 }
             }
         },
+        "club": {
+            "key": "club",
+            "type": "typeCombo",
+            "label": "Type"
+        },
         "collection_times": {
             "key": "collection_times",
             "type": "text",

data/presets/fields/club.json

@@ -0,0 +1,5 @@
+{
+    "key": "club",
+    "type": "typeCombo",
+    "label": "Type"
+}

data/presets/presets.json

@@ -564,6 +564,98 @@
             "name": "Swimming Pool",
             "searchable": false
         },
+        "amenity/animal_boarding": {
+            "icon": "veterinary",
+            "fields": [
+                "operator",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "boarding",
+                "cat",
+                "dog",
+                "horse",
+                "kitten",
+                "pet boarding",
+                "pet care",
+                "pet hotel",
+                "puppy",
+                "reptile"
+            ],
+            "tags": {
+                "amenity": "animal_boarding"
+            },
+            "name": "Animal Boarding Facility"
+        },
+        "amenity/animal_breeding": {
+            "icon": "veterinary",
+            "fields": [
+                "operator",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "breeding",
+                "bull",
+                "cat",
+                "cow",
+                "dog",
+                "horse",
+                "husbandry",
+                "kitten",
+                "livestock",
+                "pet breeding",
+                "puppy",
+                "reptile"
+            ],
+            "tags": {
+                "amenity": "animal_breeding"
+            },
+            "name": "Animal Breeding Facility"
+        },
+        "amenity/animal_shelter": {
+            "icon": "veterinary",
+            "fields": [
+                "operator",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "adoption",
+                "aspca",
+                "cat",
+                "dog",
+                "horse",
+                "kitten",
+                "pet care",
+                "pet rescue",
+                "puppy",
+                "raptor",
+                "reptile",
+                "rescue",
+                "spca"
+            ],
+            "tags": {
+                "amenity": "animal_shelter"
+            },
+            "name": "Animal Shelter"
+        },
         "amenity/arts_centre": {
             "icon": "theatre",
             "fields": [
@@ -1201,6 +1293,23 @@
             ],
             "name": "Drinking Water"
         },
+        "amenity/driving_school": {
+            "icon": "car",
+            "fields": [
+                "operator",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "amenity": "driving_school"
+            },
+            "name": "Driving School"
+        },
         "amenity/embassy": {
             "icon": "embassy",
             "fields": [
@@ -2776,6 +2885,18 @@
             },
             "name": "RV Drinking Water"
         },
+        "amenity/watering_place": {
+            "icon": "drinking-water",
+            "geometry": [
+                "area",
+                "vertex",
+                "point"
+            ],
+            "tags": {
+                "amenity": "watering_place"
+            },
+            "name": "Animal Watering Place"
+        },
         "area": {
             "name": "Area",
             "tags": {
@@ -3660,6 +3781,27 @@
             },
             "name": "Camp Pitch"
         },
+        "club": {
+            "icon": "heart",
+            "fields": [
+                "club",
+                "operator",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "club": "*"
+            },
+            "terms": [
+                "social"
+            ],
+            "name": "Club"
+        },
         "craft": {
             "icon": "poi-tool",
             "fields": [
@@ -7253,6 +7395,30 @@
             "terms": [],
             "name": "Cricket Field"
         },
+        "leisure/pitch/equestrian": {
+            "icon": "horse-riding",
+            "fields": [
+                "surface",
+                "lit",
+                "building"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "leisure": "pitch",
+                "sport": "equestrian"
+            },
+            "terms": [
+                "dressage",
+                "equestrian",
+                "horse",
+                "horseback",
+                "riding"
+            ],
+            "name": "Riding Arena"
+        },
         "leisure/pitch/rugby_league": {
             "icon": "america-football",
             "fields": [
@@ -9028,6 +9194,25 @@
             ],
             "name": "Neighborhood"
         },
+        "place/quarter": {
+            "icon": "triangle-stroked",
+            "fields": [
+                "population"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "place": "quarter"
+            },
+            "terms": [
+                "boro",
+                "borough",
+                "quarter"
+            ],
+            "name": "Sub-Borough / Quarter"
+        },
         "place/square": {
             "icon": "poi-foot",
             "geometry": [
@@ -9052,10 +9237,11 @@
                 "place": "suburb"
             },
             "terms": [
-                "Boro",
-                "Quarter"
+                "boro",
+                "borough",
+                "quarter"
             ],
-            "name": "Borough"
+            "name": "Borough / Suburb"
         },
         "place/town": {
             "icon": "town",
@@ -10648,6 +10834,31 @@
             },
             "name": "Garden Center"
         },
+        "shop/gas": {
+            "icon": "shop",
+            "fields": [
+                "operator",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "cng",
+                "lpg",
+                "natural gas",
+                "propane",
+                "refill",
+                "tank"
+            ],
+            "tags": {
+                "shop": "gas"
+            },
+            "name": "Bottled Gas Shop"
+        },
         "shop/gift": {
             "icon": "gift",
             "fields": [
@@ -11248,6 +11459,23 @@
             },
             "name": "Pawn Shop"
         },
+        "shop/perfumery": {
+            "icon": "shop",
+            "fields": [
+                "operator",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "shop": "perfumery"
+            },
+            "name": "Perfume Store"
+        },
         "shop/pet": {
             "icon": "dog-park",
             "fields": [
@@ -11261,9 +11489,13 @@
                 "area"
             ],
             "terms": [
+                "animal",
                 "cat",
                 "dog",
-                "fish"
+                "fish",
+                "kitten",
+                "puppy",
+                "reptile"
             ],
             "tags": {
                 "shop": "pet"

data/presets/presets/amenity/animal_boarding.json

@@ -0,0 +1,29 @@
+{
+    "icon": "veterinary",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "boarding",
+        "cat",
+        "dog",
+        "horse",
+        "kitten",
+        "pet boarding",
+        "pet care",
+        "pet hotel",
+        "puppy",
+        "reptile"
+    ],
+    "tags": {
+        "amenity": "animal_boarding"
+    },
+    "name": "Animal Boarding Facility"
+}

data/presets/presets/amenity/animal_breeding.json

@@ -0,0 +1,31 @@
+{
+    "icon": "veterinary",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "breeding",
+        "bull",
+        "cat",
+        "cow",
+        "dog",
+        "horse",
+        "husbandry",
+        "kitten",
+        "livestock",
+        "pet breeding",
+        "puppy",
+        "reptile"
+    ],
+    "tags": {
+        "amenity": "animal_breeding"
+    },
+    "name": "Animal Breeding Facility"
+}

data/presets/presets/amenity/animal_shelter.json

@@ -0,0 +1,32 @@
+{
+    "icon": "veterinary",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "adoption",
+        "aspca",
+        "cat",
+        "dog",
+        "horse",
+        "kitten",
+        "pet care",
+        "pet rescue",
+        "puppy",
+        "raptor",
+        "reptile",
+        "rescue",
+        "spca"
+    ],
+    "tags": {
+        "amenity": "animal_shelter"
+    },
+    "name": "Animal Shelter"
+}

data/presets/presets/amenity/driving_school.json

@@ -0,0 +1,17 @@
+{
+    "icon": "car",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "amenity": "driving_school"
+    },
+    "name": "Driving School"
+}

data/presets/presets/amenity/watering_place.json

@@ -0,0 +1,12 @@
+{
+    "icon": "drinking-water",
+    "geometry": [
+        "area",
+        "vertex",
+        "point"
+    ],
+    "tags": {
+        "amenity": "watering_place"
+    },
+    "name": "Animal Watering Place"
+}

data/presets/presets/club.json

@@ -0,0 +1,21 @@
+{
+    "icon": "heart",
+    "fields": [
+        "club",
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "club": "*"
+    },
+    "terms": [
+        "social"
+    ],
+    "name": "Club"
+}

data/presets/presets/leisure/pitch/equestrian.json

@@ -0,0 +1,24 @@
+{
+    "icon": "horse-riding",
+    "fields": [
+        "surface",
+        "lit",
+        "building"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "leisure": "pitch",
+        "sport": "equestrian"
+    },
+    "terms": [
+        "dressage",
+        "equestrian",
+        "horse",
+        "horseback",
+        "riding"
+    ],
+    "name": "Riding Arena"
+}

data/presets/presets/place/quarter.json

@@ -0,0 +1,19 @@
+{
+    "icon": "triangle-stroked",
+    "fields": [
+        "population"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "place": "quarter"
+    },
+    "terms": [
+        "boro",
+        "borough",
+        "quarter"
+    ],
+    "name": "Sub-Borough / Quarter"
+}

data/presets/presets/place/suburb.json

@@ -11,8 +11,9 @@
         "place": "suburb"
     },
     "terms": [
-        "Boro",
-        "Quarter"
+        "boro",
+        "borough",
+        "quarter"
     ],
-    "name": "Borough"
+    "name": "Borough / Suburb"
 }

data/presets/presets/shop/gas.json

@@ -0,0 +1,25 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "cng",
+        "lpg",
+        "natural gas",
+        "propane",
+        "refill",
+        "tank"
+    ],
+    "tags": {
+        "shop": "gas"
+    },
+    "name": "Bottled Gas Shop"
+}

data/presets/presets/shop/perfumery.json

@@ -0,0 +1,17 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "perfumery"
+    },
+    "name": "Perfume Store"
+}

data/presets/presets/shop/pet.json

@@ -11,9 +11,13 @@
         "area"
     ],
     "terms": [
+        "animal",
         "cat",
         "dog",
-        "fish"
+        "fish",
+        "kitten",
+        "puppy",
+        "reptile"
     ],
     "tags": {
         "shop": "pet"

data/taginfo.json

@@ -143,6 +143,18 @@
             "key": "amenity",
             "value": "swimming_pool"
         },
+        {
+            "key": "amenity",
+            "value": "animal_boarding"
+        },
+        {
+            "key": "amenity",
+            "value": "animal_breeding"
+        },
+        {
+            "key": "amenity",
+            "value": "animal_shelter"
+        },
         {
             "key": "amenity",
             "value": "arts_centre"
@@ -271,6 +283,10 @@
             "key": "amenity",
             "value": "drinking_water"
         },
+        {
+            "key": "amenity",
+            "value": "driving_school"
+        },
         {
             "key": "amenity",
             "value": "embassy"
@@ -547,6 +563,10 @@
             "key": "amenity",
             "value": "water_point"
         },
+        {
+            "key": "amenity",
+            "value": "watering_place"
+        },
         {
             "key": "area",
             "value": "yes"
@@ -776,6 +796,9 @@
             "key": "camp_site",
             "value": "camp_pitch"
         },
+        {
+            "key": "club"
+        },
         {
             "key": "craft"
         },
@@ -1543,6 +1566,10 @@
             "key": "sport",
             "value": "cricket"
         },
+        {
+            "key": "sport",
+            "value": "equestrian"
+        },
         {
             "key": "sport",
             "value": "rugby_league"
@@ -1959,6 +1986,10 @@
             "key": "place",
             "value": "neighbourhood"
         },
+        {
+            "key": "place",
+            "value": "quarter"
+        },
         {
             "key": "place",
             "value": "square"
@@ -2306,6 +2337,10 @@
             "key": "shop",
             "value": "garden_centre"
         },
+        {
+            "key": "shop",
+            "value": "gas"
+        },
         {
             "key": "shop",
             "value": "gift"
@@ -2434,6 +2469,10 @@
             "key": "shop",
             "value": "pawnbroker"
         },
+        {
+            "key": "shop",
+            "value": "perfumery"
+        },
         {
             "key": "shop",
             "value": "pet"

dist/locales/en.json

@@ -1003,6 +1003,9 @@
                         "anticlockwise": "Counterclockwise"
                     }
                 },
+                "club": {
+                    "label": "Type"
+                },
                 "collection_times": {
                     "label": "Collection Times"
                 },
@@ -2000,6 +2003,18 @@
                     "name": "Swimming Pool",
                     "terms": ""
                 },
+                "amenity/animal_boarding": {
+                    "name": "Animal Boarding Facility",
+                    "terms": "boarding,cat,dog,horse,kitten,pet boarding,pet care,pet hotel,puppy,reptile"
+                },
+                "amenity/animal_breeding": {
+                    "name": "Animal Breeding Facility",
+                    "terms": "breeding,bull,cat,cow,dog,horse,husbandry,kitten,livestock,pet breeding,puppy,reptile"
+                },
+                "amenity/animal_shelter": {
+                    "name": "Animal Shelter",
+                    "terms": "adoption,aspca,cat,dog,horse,kitten,pet care,pet rescue,puppy,raptor,reptile,rescue,spca"
+                },
                 "amenity/arts_centre": {
                     "name": "Arts Center",
                     "terms": ""
@@ -2128,6 +2143,10 @@
                     "name": "Drinking Water",
                     "terms": "fountain,potable"
                 },
+                "amenity/driving_school": {
+                    "name": "Driving School",
+                    "terms": ""
+                },
                 "amenity/embassy": {
                     "name": "Embassy",
                     "terms": ""
@@ -2404,6 +2423,10 @@
                     "name": "RV Drinking Water",
                     "terms": ""
                 },
+                "amenity/watering_place": {
+                    "name": "Animal Watering Place",
+                    "terms": ""
+                },
                 "area": {
                     "name": "Area",
                     "terms": ""
@@ -2636,6 +2659,10 @@
                     "name": "Camp Pitch",
                     "terms": "tent,rv"
                 },
+                "club": {
+                    "name": "Club",
+                    "terms": "social"
+                },
                 "craft": {
                     "name": "Craft",
                     "terms": ""
@@ -3408,6 +3435,10 @@
                     "name": "Cricket Field",
                     "terms": ""
                 },
+                "leisure/pitch/equestrian": {
+                    "name": "Riding Arena",
+                    "terms": "dressage,equestrian,horse,horseback,riding"
+                },
                 "leisure/pitch/rugby_league": {
                     "name": "Rugby League Field",
                     "terms": ""
@@ -3832,13 +3863,17 @@
                     "name": "Neighborhood",
                     "terms": "neighbourhood"
                 },
+                "place/quarter": {
+                    "name": "Sub-Borough / Quarter",
+                    "terms": "boro,borough,quarter"
+                },
                 "place/square": {
                     "name": "Square",
                     "terms": ""
                 },
                 "place/suburb": {
-                    "name": "Borough",
-                    "terms": "Boro,Quarter"
+                    "name": "Borough / Suburb",
+                    "terms": "boro,borough,quarter"
                 },
                 "place/town": {
                     "name": "Town",
@@ -4188,6 +4223,10 @@
                     "name": "Garden Center",
                     "terms": "landscape,mulch,shrub,tree"
                 },
+                "shop/gas": {
+                    "name": "Bottled Gas Shop",
+                    "terms": "cng,lpg,natural gas,propane,refill,tank"
+                },
                 "shop/gift": {
                     "name": "Gift Shop",
                     "terms": "souvenir"
@@ -4316,9 +4355,13 @@
                     "name": "Pawn Shop",
                     "terms": ""
                 },
+                "shop/perfumery": {
+                    "name": "Perfume Store",
+                    "terms": ""
+                },
                 "shop/pet": {
                     "name": "Pet Store",
-                    "terms": "cat,dog,fish"
+                    "terms": "animal,cat,dog,fish,kitten,puppy,reptile"
                 },
                 "shop/photo": {
                     "name": "Photography Store",

modules/behavior/breathe.js

@@ -94,8 +94,8 @@ export function behaviorBreathe() {
                 p.tag = tag;
                 p.from.opacity = opacity * 0.6;
                 p.to.opacity = opacity * 1.25;
-                p.from.width = width * 0.9;
-                p.to.width = width * (tag === 'circle' ? 1.5 : 1.25);
+                p.from.width = width * 0.7;
+                p.to.width = width * (tag === 'circle' ? 1.5 : 1);
                 params[d.id] = p;
             });
     }

modules/osm/tags.js

@@ -35,6 +35,9 @@ export var osmOneWayTags = {
         'yes': true
     },
     'waterway': {
+        'canal': true,
+        'ditch': true,
+        'drain': true,
         'river': true,
         'stream': true
     }

package.json

@@ -59,7 +59,7 @@
     "npm-run-all": "~4.0.0",
     "phantomjs-prebuilt": "~2.1.11",
     "request": "~2.81.0",
-    "rollup": "0.41.5",
+    "rollup": "0.41.6",
     "rollup-plugin-commonjs": "8.0.2",
     "rollup-plugin-json": "2.0.2",
     "rollup-plugin-node-resolve": "2.0.0",