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

Remove lodash without and others from history imageryUsed

Browse Source 
(re: #6087)

I ran into some trouble here, it looks like `Array.from()` polyfill
doesn't work for Sets in PhantomJS
This commit is contained in:
Bryan Housel
2019-03-24 01:50:54 -04:00
parent 963a4127db
commit b5c2918a24
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/history.js
+17 -3
View File
@@ -8,7 +8,6 @@ import _isEmpty from 'lodash-es/isEmpty';
import _forEach from 'lodash-es/forEach';
import _map from 'lodash-es/map';
import _omit from 'lodash-es/omit';
import _without from 'lodash-es/without';
import _uniq from 'lodash-es/uniq';
import { dispatch as d3_dispatch } from 'd3-dispatch';
@@ -314,8 +313,23 @@ export function coreHistory(context) {
_imageryUsed = sources;
return history;
} else {
var arr = _map(_stack.slice(1, _index + 1), 'imageryUsed');
return _without(_uniq(_flatten(arr)), 'Custom');
var s = new Set();
_stack.slice(1, _index + 1).forEach(function(state) {
state.imageryUsed.forEach(function(source) {
if (source !== 'Custom') {
s.add(source);
}
});
});
if (window.mocha) {
var arr = [];
s.forEach(function(v) { arr.push(v); });
return arr;
} else {
return Array.from(s);
}
// var arr = _map(_stack.slice(1, _index + 1), 'imageryUsed');
// return _without(_uniq(_flatten(arr)), 'Custom');
}
},