diff --git a/css/map.css b/css/map.css
index ab2a352c9..0b2da4397 100644
--- a/css/map.css
+++ b/css/map.css
@@ -17,11 +17,11 @@ g.point .shadow {
-moz-transition: fill 100ms linear;
}
.behavior-hover g.point.hover:not(.selected) .shadow {
- fill: #E96666;
- fill-opacity: 0.3;
+ fill: #f6634f;
+ fill-opacity: 0.5;
}
g.point.selected .shadow {
- fill: #E96666;
+ fill: #f6634f;
fill-opacity: 0.7;
}
@@ -30,8 +30,10 @@ g.point.selected .shadow {
g.vertex .fill {
fill:white;
}
+
g.vertex .stroke {
- stroke:#333;
+ stroke:black;
+ stroke-opacity: .5;
stroke-width:2;
fill:white;
}
@@ -60,69 +62,72 @@ svg[data-zoom="17"] g.vertex .fill {
transform:scale(0.7, 0.7);
}
-g.vertex.shared .shadow {
+g.vertex.sha#f6634f .shadow {
-webkit-transform:scale(1.2, 1.2);
-moz-transform:scale(1.2, 1.2);
transform:scale(1.2, 1.2);
}
-g.vertex.shared .fill,
-g.vertex.shared .stroke {
+g.vertex.sha#f6634f .fill,
+g.vertex.sha#f6634f .stroke {
-webkit-transform:scale(1.1, 1.1);
-moz-transform:scale(1.1, 1.1);
transform:scale(1.1, 1.1);
}
-svg[data-zoom="16"] g.vertex.shared .shadow {
+svg[data-zoom="16"] g.vertex.sha#f6634f .shadow {
-webkit-transform:scale(0.9, 0.9);
-moz-transform:scale(0.9, 0.9);
transform:scale(0.9, 0.9);
}
-svg[data-zoom="16"] g.vertex.shared .fill,
-svg[data-zoom="16"] g.vertex.shared .stroke {
+svg[data-zoom="16"] g.vertex.sha#f6634f .fill,
+svg[data-zoom="16"] g.vertex.sha#f6634f .stroke {
-webkit-transform:scale(0.8, 0.8);
-moz-transform:scale(0.8, 0.8);
transform:scale(0.8, 0.8);
}
-svg[data-zoom="17"] g.vertex.shared .shadow {
+svg[data-zoom="17"] g.vertex.sha#f6634f .shadow {
-webkit-transform:scale(1, 1);
-moz-transform:scale(1, 1);
transform:scale(1, 1);
}
-svg[data-zoom="17"] g.vertex.shared .fill,
-svg[data-zoom="17"] g.vertex.shared .stroke {
+svg[data-zoom="17"] g.vertex.sha#f6634f .fill,
+svg[data-zoom="17"] g.vertex.sha#f6634f .stroke {
-webkit-transform:scale(0.9, 0.9);
-moz-transform:scale(0.9, 0.9);
transform:scale(0.9, 0.9);
}
-g.vertex.shared .fill {
+g.vertex.sha#f6634f .fill {
fill:#aaa;
}
g.vertex .shadow {
fill: none;
pointer-events: all;
- stroke-width: 10;
+ stroke-width: 20;
-webkit-transition: -webkit-transform 100ms linear;
transition: transform 100ms linear;
-moz-transition: fill 100ms linear;
}
.behavior-hover g.vertex.hover:not(.selected) .shadow {
- fill: #E96666;
+ fill: #f6634f;
fill-opacity: 0.3;
-}
+}
g.vertex.selected .shadow {
- fill: #E96666;
- fill-opacity: 0.7;
+ fill: #f6634f;
+ fill-opacity: 0.5;
}
/* midpoints */
g.midpoint .fill {
- fill:#aaa;
+ fill:#ddd;
+ stroke:black;
+ stroke-opacity: .5;
+ opacity: .5;
}
.behavior-hover g.midpoint .fill.hover:not(.selected) {
- fill:#fff;
- stroke:#000;
+ fill:white;
+ opacity: .75;
}
g.midpoint .shadow {
@@ -134,7 +139,7 @@ g.midpoint .shadow {
-moz-transition: fill 100ms linear;
}
.behavior-hover g.midpoint .shadow.hover:not(.selected) {
- fill:#E96666;
+ fill:#f6634f;
fill-opacity: 0.3;
}
@@ -146,8 +151,8 @@ path.line {
}
path.stroke {
- stroke: #222;
- stroke-width: 2;
+ stroke: black;
+ stroke-width: 4;
}
path.shadow {
@@ -157,12 +162,12 @@ path.shadow {
}
.behavior-hover path.shadow.hover:not(.selected) {
- stroke: #E96666;
+ stroke: #f6634f;
stroke-opacity: 0.3;
}
path.shadow.selected {
- stroke: #E96666;
+ stroke: #f6634f;
stroke-opacity: 0.7;
}
@@ -191,31 +196,31 @@ path.area.stroke.selected {
path.area.stroke.tag-natural,
path.multipolygon.tag-natural {
- stroke: #ADD6A5;
+ stroke: #b6e199;
stroke-width:1;
}
path.area.fill.tag-natural,
path.multipolygon.tag-natural {
- fill: #ADD6A5;
+ fill: #b6e199;
}
path.area.stroke.tag-natural-water,
path.multipolygon.tag-natural-water {
- stroke: #6382FF;
+ stroke: #77d3de;
}
path.area.fill.tag-natural-water,
path.multipolygon.tag-natural-water {
- fill: #ADBEFF;
+ fill: #77d3de;
}
path.area.stroke.tag-building,
path.multipolygon.tag-building {
- stroke: #9E176A;
+ stroke: #e06e5f;
stroke-width: 1;
}
path.area.fill.tag-building,
path.multipolygon.tag-building {
- fill: #ff6ec7;
+ fill: #e06e5f;
}
path.area.stroke.tag-landuse,
@@ -228,7 +233,7 @@ path.multipolygon.tag-natural-wood,
path.multipolygon.tag-natural-tree,
path.multipolygon.tag-natural-grassland,
path.multipolygon.tag-leisure-park {
- stroke: #006B34;
+ stroke: #8cd05f;
stroke-width: 1;
}
path.area.fill.tag-landuse,
@@ -241,18 +246,18 @@ path.multipolygon.tag-natural-wood,
path.multipolygon.tag-natural-tree,
path.multipolygon.tag-natural-grassland,
path.multipolygon.tag-leisure-park {
- fill: #189E59;
+ fill: #8cd05f;
fill-opacity: 0.2;
}
path.area.stroke.tag-amenity-parking,
path.multipolygon.tag-amenity-parking {
- stroke: #beb267;
+ stroke: #aaa;
stroke-width: 1;
}
path.area.fill.tag-amenity-parking,
path.multipolygon.tag-amenity-parking {
- fill: #edecc0;
+ fill: #aaa;
}
path.multipolygon.tag-boundary {
@@ -286,56 +291,57 @@ svg[data-zoom="16"] path.stroke.tag-highway {
path.stroke.tag-highway-motorway,
path.stroke.tag-highway-motorway_link,
path.stroke.tag-construction-motorway {
- stroke:#809bc0;
+ stroke:#58a9ed;
}
+
path.casing.tag-highway-motorway,
path.casing.tag-highway-motorway_link,
path.casing.tag-construction-motorway {
- stroke:#506077;
+ stroke:#2c5476;
}
path.stroke.tag-highway-trunk,
path.stroke.tag-highway-trunk_link,
path.stroke.tag-construction-trunk {
- stroke:#97d397;
+ stroke:#8cd05f;
}
path.casing.tag-highway-trunk,
path.casing.tag-highway-trunk_link,
path.casing.tag-construction-trunk {
- stroke:#477147;
+ stroke:#46682f;
}
path.stroke.tag-highway-primary,
path.stroke.tag-highway-primary_link,
path.stroke.tag-construction-primary {
- stroke:#ec989a;
+ stroke:#e06d5f;
}
path.casing.tag-highway-primary,
path.casing.tag-highway-primary_link,
path.casing.tag-construction-primary {
- stroke:#8d4346;
+ stroke:#70372f;
}
path.stroke.tag-highway-secondary,
path.stroke.tag-highway-secondary_link,
path.stroke.tag-construction-secondary {
- stroke:#fecc8b;
+ stroke:#eab056;
}
path.casing.tag-highway-secondary,
path.casing.tag-highway-secondary_link,
path.casing.tag-construction-secondary {
- stroke:#a37b48;
+ stroke:#75582b;
}
path.stroke.tag-highway-tertiary,
path.stroke.tag-highway-tertiary_link,
path.stroke.tag-construction-tertiary {
- stroke:#ffffb3;
+ stroke:#ffff7e;
}
path.casing.tag-highway-tertiary,
path.casing.tag-highway-tertiary_link,
path.casing.tag-construction-tertiary {
- stroke:#bbb;
+ stroke:#7f7f3f;
}
path.stroke.tag-highway-unclassified,
@@ -372,7 +378,7 @@ path.stroke.tag-highway-pedestrian {
shapeRendering: auto;
}
path.casing.tag-highway-pedestrian {
- stroke:#84C382;
+ stroke:#8cd05f;
stroke-width:6 !important;
}
@@ -445,17 +451,17 @@ svg[data-zoom="16"] path.casing.tag-highway-bridleway {
}
path.stroke.tag-highway-footway {
- stroke: #996600;
+ stroke: #ae8681;
}
path.stroke.tag-highway-cycleway {
- stroke: #69f;
+ stroke: #58a9ed;
}
path.stroke.tag-highway-bridleway {
- stroke: green;
+ stroke: #e06d5f;
}
path.stroke.tag-highway-steps {
- stroke: #ff6257;
+ stroke: #81d25c;
stroke-width: 4;
stroke-linecap: butt;
stroke-dasharray: 3, 3;
@@ -467,7 +473,7 @@ path.casing.tag-highway-steps {
path.casing.tag-bridge-yes {
stroke-width: 14;
- stroke: #000;
+ stroke: #333;
}
path.stroke.tag-highway-construction,
@@ -511,12 +517,16 @@ path.casing.tag-railway-subway {
/* waterways */
+path.area.fill.tag-waterway {
+ fill: #77d3de;
+}
+
path.stroke.tag-waterway {
- stroke: #10539a;
+ stroke: #77d3de;
stroke-width: 2;
}
path.casing.tag-waterway {
- stroke: #6AA2FF;
+ stroke: #77d3de;
stroke-width: 4;
}
@@ -535,11 +545,11 @@ svg[data-zoom="16"] path.casing.tag-waterway-river {
}
path.stroke.tag-waterway-ditch {
- stroke: #10539a;
+ stroke: #6591ff;
stroke-width: 1;
}
path.casing.tag-waterway-ditch {
- stroke: #999692;
+ stroke: #6591ff;
stroke-width: 3;
}
@@ -568,17 +578,22 @@ path.casing.tag-boundary {
path.casing.tag-boundary-protected_area,
path.casing.tag-boundary-national_park {
- stroke: #4D9849;
+ stroke: #b0e298;
}
text {
font-size:10px;
pointer-events: none;
+ color: #222;
+ opacity: 1;
}
.oneway .textpath {
pointer-events: none;
+ font-size: 7px;
+ baseline-shift: 2px;
+ opacity: .7;
}
text.tag-oneway {
@@ -606,7 +621,7 @@ text.pathlabel,
text.pointlabel {
font-size: 12px;
font-weight: bold;
- fill: black;
+ fill: #333;
text-anchor: middle;
pointer-events: none;
}
@@ -632,7 +647,8 @@ text.pointlabel {
text.point {
- font-size: 9px;
+ font-size: 10px;
+ baseline-shift: 2px;
}
/* Cursors */
diff --git a/icons/tree.png b/icons/tree.png
index 7575bd63b..d88c945d4 100644
Binary files a/icons/tree.png and b/icons/tree.png differ
diff --git a/icons/unknown.png b/icons/unknown.png
index 404602aa4..03fff0c0e 100644
Binary files a/icons/unknown.png and b/icons/unknown.png differ
diff --git a/img/source/sprite.svg b/img/source/sprite.svg
index 29e87e2b8..64f682c3d 100644
--- a/img/source/sprite.svg
+++ b/img/source/sprite.svg
@@ -39,12 +39,12 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="1"
- inkscape:cx="329.64693"
- inkscape:cy="58.693021"
+ inkscape:zoom="0.5"
+ inkscape:cx="279.87773"
+ inkscape:cy="136.54467"
inkscape:document-units="px"
inkscape:current-layer="layer1"
- showgrid="false"
+ showgrid="true"
inkscape:window-width="1280"
inkscape:window-height="700"
inkscape:window-x="48"
@@ -186,7 +186,7 @@
image/svg+xml
-
+
@@ -195,11 +195,200 @@
inkscape:groupmode="layer"
id="layer1"
transform="translate(-25,-62.362183)"
- style="display:inline">
+ style="display:none">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ fix misalignment
+
+
+
+
+ RESET
+ style="display:inline;fill:#1a1a1a;fill-opacity:1"
+ transform="translate(505,-653.36218)">
+ style="display:inline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;overflow:visible;enable-background:accumulate" />
-
-
-
-
-
-
-
-
-
-
-
-
-
+ style="opacity:0.50000000000000000;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="opacity:0.50000000000000000;fill:#000000;fill-opacity:1;display:inline">
+ style="opacity:0.50000000000000000;fill:#000000;fill-opacity:1;display:inline">
@@ -778,9 +932,9 @@
inkscape:connector-curvature="0"
id="path58971"
d="m 35,44 c 0,1 0,4 0,4 0,0 0,0.5 -0.5,0.5 -0.5,0 -0.429283,-0.27516 -0.5,-0.5 -0.304688,-0.96875 -0.867187,-2.36459 -1,-3 -0.204595,-0.97885 -0.666667,-1 -1,-1 -1,0 -1,1 -1,1 l 1,4 0,3 C 32,52 31.5,51.5 30.5,50.5 29.945312,49.94531 29.257659,49.7508 28.8125,50.00781 28.377049,50.25922 28.150942,50.89541 28.5,51.5 28.853553,52.11237 32,56 32,56 c 1,1 2,1 4,1 2.666667,0 1,0 3,0 2,0 2.288488,-2.86546 3,-5 1,-3 1.5,-5 1.5,-5 0.113427,-0.42332 -0.04289,-0.846 -0.5,-1 -0.880461,-0.29662 -1.36006,0.35278 -1.5,1 -0.25,1.15625 -0.5,2 -0.5,2 -0.09375,0.31383 0.0013,0.5 -0.5,0.5 C 39.99086,49.5 40,49 40,49 c 0,0 0,-2.66667 0,-4 0,-1 -1,-1 -1,-1 0,0 -1,0 -1,1 0,1 0,1.66667 0,3 0,0 0.01305,0.5 -0.5,0.5 C 36.998673,48.5 37,48 37,48 c 0,0 0,-3 0,-4 0,-1 -1,-1 -1,-1 0,0 -1,0 -1,1 z"
- style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate" />
+ style="opacity:0.50000000000000000;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate" />
+ transform="translate(25,-3.0625001e-6)" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- fix misalignment
-
-
-
-
- RESET
diff --git a/js/id/svg/lines.js b/js/id/svg/lines.js
index 83c533255..624237d93 100644
--- a/js/id/svg/lines.js
+++ b/js/id/svg/lines.js
@@ -1,6 +1,6 @@
iD.svg.Lines = function(projection) {
- var arrowtext = '►\u3000\u3000',
+ var arrowtext = '►\u3000\u3000\u3000',
alength;
var highway_stack = {
diff --git a/js/id/svg/midpoints.js b/js/id/svg/midpoints.js
index 935f84719..c721f191c 100644
--- a/js/id/svg/midpoints.js
+++ b/js/id/svg/midpoints.js
@@ -38,7 +38,7 @@ iD.svg.Midpoints = function(projection) {
.attr('class', 'midpoint');
group.append('circle')
- .attr('r', 7)
+ .attr('r', 8)
.attr('class', 'shadow');
group.append('circle')
diff --git a/js/id/svg/vertices.js b/js/id/svg/vertices.js
index ba28c968a..f7090d892 100644
--- a/js/id/svg/vertices.js
+++ b/js/id/svg/vertices.js
@@ -26,7 +26,7 @@ iD.svg.Vertices = function(projection) {
.attr('class', 'shadow');
group.append('circle')
- .attr('r', 6)
+ .attr('r', 4)
.attr('class', 'stroke');
group.append('circle')