From c7186e2ee6b1c912e1982a455760f18d9f56a81f Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 8 Oct 2019 20:42:58 +0200 Subject: [PATCH] Replace usage of lodash isEqual (re: #6843) --- modules/svg/areas.js | 8 ++++---- modules/svg/lines.js | 8 ++++---- modules/svg/points.js | 6 +++--- modules/svg/vertices.js | 8 ++++---- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/modules/svg/areas.js b/modules/svg/areas.js index f0eb2c66c..9db1d2bd3 100644 --- a/modules/svg/areas.js +++ b/modules/svg/areas.js @@ -1,9 +1,9 @@ +import deepEqual from 'fast-deep-equal'; import { bisector as d3_bisector } from 'd3-array'; import { osmEntity, osmIsOldMultipolygonOuterMember } from '../osm'; import { svgPath, svgSegmentWay } from './helpers'; import { svgTagClasses } from './tag_classes'; -import _isEqual from 'lodash-es/isEqual'; import { svgTagPattern } from './tag_pattern'; export function svgAreas(projection, context) { @@ -49,7 +49,7 @@ export function svgAreas(projection, context) { var wayID = d.properties.entity.id; // if the whole line was edited, don't draw segment changes if (!base.entities[wayID] || - !_isEqual(graph.entities[wayID].nodes, base.entities[wayID].nodes)) { + !deepEqual(graph.entities[wayID].nodes, base.entities[wayID].nodes)) { return ''; } return d.properties.nodes.some(function(n) { @@ -191,12 +191,12 @@ export function svgAreas(projection, context) { .classed('geometry-edited', function(d) { return graph.entities[d.id] && base.entities[d.id] && - !_isEqual(graph.entities[d.id].nodes, base.entities[d.id].nodes); + !deepEqual(graph.entities[d.id].nodes, base.entities[d.id].nodes); }) .classed('retagged', function(d) { return graph.entities[d.id] && base.entities[d.id] && - !_isEqual(graph.entities[d.id].tags, base.entities[d.id].tags); + !deepEqual(graph.entities[d.id].tags, base.entities[d.id].tags); }) .call(svgTagClasses()) .attr('d', path); diff --git a/modules/svg/lines.js b/modules/svg/lines.js index ad1e7209d..7e07f93b9 100644 --- a/modules/svg/lines.js +++ b/modules/svg/lines.js @@ -1,3 +1,4 @@ +import deepEqual from 'fast-deep-equal'; import { range as d3_range } from 'd3-array'; import { @@ -8,7 +9,6 @@ import { svgTagClasses } from './tag_classes'; import { osmEntity, osmOldMultipolygonOuterMember } from '../osm'; import { utilArrayFlatten, utilArrayGroupBy } from '../util'; import { utilDetect } from '../util/detect'; -import _isEqual from 'lodash-es/isEqual'; export function svgLines(projection, context) { var detected = utilDetect(); @@ -60,7 +60,7 @@ export function svgLines(projection, context) { var wayID = d.properties.entity.id; // if the whole line was edited, don't draw segment changes if (!base.entities[wayID] || - !_isEqual(graph.entities[wayID].nodes, base.entities[wayID].nodes)) { + !deepEqual(graph.entities[wayID].nodes, base.entities[wayID].nodes)) { return ''; } return d.properties.nodes.some(function(n) { @@ -148,12 +148,12 @@ export function svgLines(projection, context) { .classed('geometry-edited', function(d) { return graph.entities[d.id] && base.entities[d.id] && - !_isEqual(graph.entities[d.id].nodes, base.entities[d.id].nodes); + !deepEqual(graph.entities[d.id].nodes, base.entities[d.id].nodes); }) .classed('retagged', function(d) { return graph.entities[d.id] && base.entities[d.id] && - !_isEqual(graph.entities[d.id].tags, base.entities[d.id].tags); + !deepEqual(graph.entities[d.id].tags, base.entities[d.id].tags); }) .call(svgTagClasses()) .merge(lines) diff --git a/modules/svg/points.js b/modules/svg/points.js index e744e8919..7ba4fdbc3 100644 --- a/modules/svg/points.js +++ b/modules/svg/points.js @@ -1,8 +1,8 @@ +import deepEqual from 'fast-deep-equal'; 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) { @@ -130,10 +130,10 @@ export function svgPoints(projection, context) { 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] && !_isEqual(graph.entities[d.id].loc, base.entities[d.id].loc); + return base.entities[d.id] && !deepEqual(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); + return base.entities[d.id] && !deepEqual(graph.entities[d.id].tags, base.entities[d.id].tags); }) .call(svgTagClasses()); diff --git a/modules/svg/vertices.js b/modules/svg/vertices.js index 5135a27f1..60241d32a 100644 --- a/modules/svg/vertices.js +++ b/modules/svg/vertices.js @@ -1,9 +1,9 @@ +import deepEqual from 'fast-deep-equal'; import { select as d3_select } from 'd3-selection'; import { geoScaleToZoom } from '../geo'; import { osmEntity } from '../osm'; import { svgPassiveVertex, svgPointTransform } from './helpers'; -import _isEqual from 'lodash-es/isEqual'; export function svgVertices(projection, context) { var radiuses = { @@ -134,10 +134,10 @@ export function svgVertices(projection, context) { 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] && !_isEqual(graph.entities[d.id].loc, base.entities[d.id].loc); + return base.entities[d.id] && !deepEqual(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); + return base.entities[d.id] && !deepEqual(graph.entities[d.id].tags, base.entities[d.id].tags); }) .call(updateAttributes); @@ -293,7 +293,7 @@ export function svgVertices(projection, context) { function isEditedEntity(entity, base, head) { return head.entities[entity.id] !== base.entities[entity.id] || - !_isEqual(head.entities[entity.id].tags, base.entities[entity.id].tags); + !deepEqual(head.entities[entity.id].tags, base.entities[entity.id].tags); }