diff --git a/css/app.css b/css/app.css
index 46259f552..5bc40610c 100644
--- a/css/app.css
+++ b/css/app.css
@@ -236,7 +236,7 @@ ul.toggle-list {
ul.toggle-list li a {
position: relative;
- padding: 5px 10px 5px 25px;
+ padding: 5px 10px 5px 30px;
display:block;
border-top: 1px solid #ccc;
}
@@ -275,13 +275,13 @@ ul.link-list li:last-child {
content: "";
display: inline-block;
border-radius: 50%;
- height: 12px;
- width: 12px;
+ height: 16px;
+ width: 16px;
margin-right: 10px;
border: 1px solid #CCC;
position: absolute;
left: 5px;
- top: 8px;
+ top: 5px;
}
.toggle-list a:hover::before {
@@ -293,6 +293,19 @@ ul.link-list li:last-child {
box-shadow: inset 0 0 0 2px white;
}
+.toggle-list.check-list a::before {
+ border-radius: 2px;
+}
+
+.toggle-list.check-list a:hover::before {
+ background: white url(img/sprite.svg) no-repeat -480px -0px;
+ box-shadow: none;
+}
+
+.toggle-list.check-list a.selected::before {
+ background: white url(img/sprite.svg) no-repeat -480px -20px;
+}
+
/* Utility Classes
------------------------------------------------------- */
.fillL {
@@ -1121,20 +1134,20 @@ input[type=number] {
border-bottom: 1px solid #CCC;
color: #7092FF;
width: 100%;
- padding-left: 25px;
+ padding-left: 30px;
}
.radio-wrap button::before {
content: "";
display: inline-block;
border-radius: 50%;
- height: 12px;
- width: 12px;
+ height: 16px;
+ width: 16px;
margin-right: 10px;
border: 1px solid #CCC;
position: absolute;
left: 5px;
- top: 8px;
+ top: 5px;
}
.radio-wrap button:hover::before {
diff --git a/dist/img/sprite.svg b/dist/img/sprite.svg
index 3d3b656ce..72cd9275a 100644
--- a/dist/img/sprite.svg
+++ b/dist/img/sprite.svg
@@ -38,6 +38,7 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
+<<<<<<< HEAD
inkscape:zoom="9.3884297"
inkscape:cx="235.04931"
inkscape:cy="525.74069"
@@ -47,6 +48,17 @@
inkscape:window-width="1280"
inkscape:window-height="756"
inkscape:window-x="35"
+=======
+ inkscape:zoom="16"
+ inkscape:cx="471.57386"
+ inkscape:cy="545.41375"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer12"
+ showgrid="true"
+ inkscape:window-width="1280"
+ inkscape:window-height="756"
+ inkscape:window-x="56"
+>>>>>>> 4de0eada5fb19a83c198473774bbda001c6166f6
inkscape:window-y="0"
inkscape:window-maximized="0"
fit-margin-top="0"
@@ -228,7 +240,7 @@
image/svg+xml
-
+
@@ -377,6 +389,7 @@
id="path3769"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccccc" />
+<<<<<<< HEAD
+=======
+>>>>>>> 4de0eada5fb19a83c198473774bbda001c6166f6
+=======
+ style="color:#000000;fill:#1c1c1c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 406 3 L 406 4 L 408 6.40625 L 408 8 L 412 8 L 412 6.40625 L 414 4 L 414 3 L 413 3 L 411 5 L 409 5 L 407 3 L 406 3 z M 407 9 L 406 10 L 403 10 L 402 11 L 403 12 L 406 12 L 406 13 L 404 14 L 403 15 L 403 16 L 404 16 L 406 15 L 408 17 L 412 17 L 414 15 L 416 16 L 417 16 L 417 15 L 416 14 L 414 13 L 414 12 L 417 12 L 418 11 L 417 10 L 414 10 L 413 9 L 407 9 z "
+ transform="translate(25,-3.0624999e-6)"
+ id="rect14284" />
+
+
+
+
+
+>>>>>>> 4de0eada5fb19a83c198473774bbda001c6166f6
diff --git a/js/id/core/connection.js b/js/id/core/connection.js
index d4116b992..e265436e4 100644
--- a/js/id/core/connection.js
+++ b/js/id/core/connection.js
@@ -100,11 +100,7 @@ iD.Connection = function() {
id: iD.Entity.id.fromOSM(nodeStr, attrs.id.nodeValue),
loc: [parseFloat(attrs.lon.nodeValue), parseFloat(attrs.lat.nodeValue)],
version: attrs.version.nodeValue,
- changeset: attrs.changeset.nodeValue,
user: attrs.user && attrs.user.nodeValue,
- uid: attrs.uid && attrs.uid.nodeValue,
- visible: attrs.visible.nodeValue,
- timestamp: attrs.timestamp.nodeValue,
tags: getTags(obj)
});
},
@@ -114,11 +110,7 @@ iD.Connection = function() {
return new iD.Way({
id: iD.Entity.id.fromOSM(wayStr, attrs.id.nodeValue),
version: attrs.version.nodeValue,
- changeset: attrs.changeset.nodeValue,
user: attrs.user && attrs.user.nodeValue,
- uid: attrs.uid && attrs.uid.nodeValue,
- visible: attrs.visible.nodeValue,
- timestamp: attrs.timestamp.nodeValue,
tags: getTags(obj),
nodes: getNodes(obj)
});
@@ -129,11 +121,7 @@ iD.Connection = function() {
return new iD.Relation({
id: iD.Entity.id.fromOSM(relationStr, attrs.id.nodeValue),
version: attrs.version.nodeValue,
- changeset: attrs.changeset.nodeValue,
user: attrs.user && attrs.user.nodeValue,
- uid: attrs.uid && attrs.uid.nodeValue,
- visible: attrs.visible.nodeValue,
- timestamp: attrs.timestamp.nodeValue,
tags: getTags(obj),
members: getMembers(obj)
});
diff --git a/js/id/renderer/map.js b/js/id/renderer/map.js
index 08c1271b3..1394c75a0 100644
--- a/js/id/renderer/map.js
+++ b/js/id/renderer/map.js
@@ -1,7 +1,9 @@
iD.Map = function(context) {
var dimensions = [1, 1],
dispatch = d3.dispatch('move', 'drawn'),
- projection = d3.geo.mercator().scale(512 / Math.PI),
+ projection = d3.geo.mercator()
+ .scale(512 / Math.PI)
+ .precision(0),
roundedProjection = iD.svg.RoundProjection(projection),
zoom = d3.behavior.zoom()
.translate(projection.translate())
diff --git a/js/id/ui/background.js b/js/id/ui/background.js
index 5fa0bf25a..56f239f4c 100644
--- a/js/id/ui/background.js
+++ b/js/id/ui/background.js
@@ -240,12 +240,12 @@ iD.ui.Background = function(context) {
var overlayList = content
.append('ul')
- .attr('class', 'toggle-list');
+ .attr('class', 'toggle-list check-list');
var gpxLayerItem = content
.append('ul')
.style('display', iD.detect().filedrop ? 'block' : 'none')
- .attr('class', 'toggle-list')
+ .attr('class', 'toggle-list check-list')
.append('li')
.append('a')
.classed('layer-toggle-gpx', true)