CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-13 01:02:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show visual diff for standalone points (re: #6843)

Browse Source
This commit is contained in:
Quincy Morgan
2019-10-07 16:33:35 +02:00
parent f3e7bd9034
commit 2924d4619a
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
css/20_map.css
View File

@@ -356,6 +356,22 @@ g.vertex.highlighted .shadow {
fill: rgb(193, 84, 17);
}
.highlight-edited g.points g.node.point.added > path.shadow,
.highlight-edited g.points g.node.point.retagged > path.shadow,
.highlight-edited g.points g.node.point.moved > path.shadow {
stroke-opacity: 0.8;
stroke-width: 7;
}
.highlight-edited g.points g.node.point.added > path.shadow {
stroke: rgb(133, 255, 103);
}
.highlight-edited g.points g.node.point.retagged > path.shadow,
.highlight-edited g.points g.node.point.moved > path.shadow {
stroke: rgb(255, 126, 46);
}
.highlight-edited g.points g.node.point.retagged:not(.moved) > path.shadow {
stroke-opacity: 0.55;
}
/*Line-related visual diffs*/
/*Make the edited stroke line thin so that the original road color can show around it.*/

12
modules/svg/points.js
View File

@@ -2,7 +2,7 @@ import { geoScaleToZoom } from '../geo';
import { osmEntity } from '../osm';
import { svgPointTransform } from './helpers';
import { svgTagClasses } from './tag_classes';
import _isEqual from 'lodash-es/isEqual';
export function svgPoints(projection, context) {
@@ -71,6 +71,7 @@ export function svgPoints(projection, context) {
function drawPoints(selection, graph, entities, filter) {
var wireframe = context.surface().classed('fill-wireframe');
var zoom = geoScaleToZoom(projection.scale());
var base = context.history().base();
// Points with a direction will render as vertices at higher zooms..
function renderAsPoint(entity) {
@@ -125,6 +126,15 @@ export function svgPoints(projection, context) {
groups = groups
.merge(enter)
.attr('transform', svgPointTransform(projection))
.classed('added', function(d) {
return !base.entities[d.id]; // if it doesn't exist in the base graph, it's new
})
.classed('moved', function(d) {
return base.entities[d.id] && graph.entities[d.id].loc !== base.entities[d.id].loc;
})
.classed('retagged', function(d) {
return base.entities[d.id] && !_isEqual(graph.entities[d.id].tags, base.entities[d.id].tags);
})
.call(svgTagClasses());
groups.select('.shadow'); // propagate bound data