Do point hover scaling without r.

This commit is contained in:
Tom MacWright
2013-01-04 12:05:20 -05:00
parent 4a7bd26be8
commit 1c90441881
2 changed files with 23 additions and 20 deletions
+11 -4
View File
@@ -18,22 +18,29 @@ g.point.selected circle {
}
/* interactive elements */
circle.vertex {
g.vertex circle {
fill:white;
stroke:#333;
fill-opacity:1;
stroke-width:2;
stroke-opacity: 1;
-webkit-transition: -webkit-transform 50ms linear;
transition: transform 50ms linear;
-moz-transition: stroke 50ms linear;
-webkit-transform:scale(1, 1);
-moz-transform:scale(1, 1);
transform:scale(1, 1);
}
circle.vertex.shared {
g.vertex.shared circle {
fill:#aff;
}
circle.vertex.hover {
g.vertex.hover circle {
-webkit-transform:scale(2, 2);
}
circle.vertex.selected {
g.vertex circle.selected {
fill: #ffff00;
}
+12 -16
View File
@@ -138,29 +138,28 @@ iD.Map = function() {
return handles;
}
function pointTransform(entity) {
return 'translate(' + iD.util.geo.roundCoords(projection(entity.loc)) + ')';
}
function drawVertices(vertices, parentStructure, filter) {
function shared(d) { return parentStructure[d.id] > 1; }
var circles = g.hit.selectAll('circle.vertex')
var circles = g.hit.selectAll('g.vertex')
.filter(filter)
.data(vertices, key);
circles.exit().remove();
circles.enter().insert('circle', ':first-child')
.attr('class', 'node vertex');
circles.enter()
.insert('g', ':first-child')
.attr('class', 'node vertex')
.append('circle')
.attr('r', 4);
circles.attr('transform', function(entity) {
var p = projection(entity.loc);
return 'translate(' + [~~p[0], ~~p[1]] +
')';
})
circles.attr('transform', pointTransform)
.classed('shared', shared)
.classed('hover', classHover);
circles.transition().duration(50).attr('r', function(d) {
return d.id === hover ? 8: 4;
});
}
function drawAccuracyHandles(waynodes, filter) {
@@ -170,10 +169,7 @@ iD.Map = function() {
handles.exit().remove();
handles.enter().append('circle')
.attr({ r: 3, 'class': 'accuracy-handle' });
handles.attr('transform', function(entity) {
var p = projection(entity.loc);
return 'translate(' + [~~p[0], ~~p[1]] + ')';
});
handles.attr('transform', pointTransform);
}
function editOff() {