CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-25 17:37:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Convert lodah-es and d3 to named imports for core

Browse Source
This commit is contained in:
Bryan Housel
2017-09-24 22:52:12 -04:00
parent 75d2c45fd6
commit 78908bfaa1
5 changed files with 160 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/graph.js
+19 -15
View File
@@ -1,6 +1,10 @@
import _ from 'lodash';
import _assign from 'lodash-es/assign';
import _difference from 'lodash-es/difference';
import _includes from 'lodash-es/includes';
import _without from 'lodash-es/without';
import { debug } from '../index';
import { utilGetPrototypeOf } from '../util/index';
import { utilGetPrototypeOf } from '../util';
export function coreGraph(other, mutable) {
@@ -8,9 +12,9 @@ export function coreGraph(other, mutable) {
if (other instanceof coreGraph) {
var base = other.base();
this.entities = _.assign(Object.create(base.entities), other.entities);
this._parentWays = _.assign(Object.create(base.parentWays), other._parentWays);
this._parentRels = _.assign(Object.create(base.parentRels), other._parentRels);
this.entities = _assign(Object.create(base.entities), other.entities);
this._parentWays = _assign(Object.create(base.parentWays), other._parentWays);
this._parentRels = _assign(Object.create(base.parentRels), other._parentRels);
} else {
this.entities = Object.create({});
@@ -173,7 +177,7 @@ coreGraph.prototype = {
if (base.parentWays[child]) {
for (k = 0; k < base.parentWays[child].length; k++) {
id = base.parentWays[child][k];
if (!this.entities.hasOwnProperty(id) && !_.includes(this._parentWays[child], id)) {
if (!this.entities.hasOwnProperty(id) && !_includes(this._parentWays[child], id)) {
this._parentWays[child].push(id);
}
}
@@ -186,7 +190,7 @@ coreGraph.prototype = {
if (base.parentRels[child]) {
for (k = 0; k < base.parentRels[child].length; k++) {
id = base.parentRels[child][k];
if (!this.entities.hasOwnProperty(id) && !_.includes(this._parentRels[child], id)) {
if (!this.entities.hasOwnProperty(id) && !_includes(this._parentRels[child], id)) {
this._parentRels[child].push(id);
}
}
@@ -214,8 +218,8 @@ coreGraph.prototype = {
// Update parentWays
if (oldentity && entity) {
removed = _.difference(oldentity.nodes, entity.nodes);
added = _.difference(entity.nodes, oldentity.nodes);
removed = _difference(oldentity.nodes, entity.nodes);
added = _difference(entity.nodes, oldentity.nodes);
} else if (oldentity) {
removed = oldentity.nodes;
added = [];
@@ -224,10 +228,10 @@ coreGraph.prototype = {
added = entity.nodes;
}
for (i = 0; i < removed.length; i++) {
parentWays[removed[i]] = _.without(parentWays[removed[i]], oldentity.id);
parentWays[removed[i]] = _without(parentWays[removed[i]], oldentity.id);
}
for (i = 0; i < added.length; i++) {
ways = _.without(parentWays[added[i]], entity.id);
ways = _without(parentWays[added[i]], entity.id);
ways.push(entity.id);
parentWays[added[i]] = ways;
}
@@ -236,8 +240,8 @@ coreGraph.prototype = {
// Update parentRels
if (oldentity && entity) {
removed = _.difference(oldentity.members, entity.members);
added = _.difference(entity.members, oldentity);
removed = _difference(oldentity.members, entity.members);
added = _difference(entity.members, oldentity);
} else if (oldentity) {
removed = oldentity.members;
added = [];
@@ -246,10 +250,10 @@ coreGraph.prototype = {
added = entity.members;
}
for (i = 0; i < removed.length; i++) {
parentRels[removed[i].id] = _.without(parentRels[removed[i].id], oldentity.id);
parentRels[removed[i].id] = _without(parentRels[removed[i].id], oldentity.id);
}
for (i = 0; i < added.length; i++) {
rels = _.without(parentRels[added[i].id], entity.id);
rels = _without(parentRels[added[i].id], entity.id);
rels.push(entity.id);
parentRels[added[i].id] = rels;
}