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

Must use context.graph to validate entities instead of validatedgraph

Browse Source 
This is because all the validators use it, and it's the right thing to do.
As entites load from the OSM or are restored from history, the most
updated version of them will be in context.graph, not validatedGraph
This commit is contained in:
Bryan Housel
2019-04-19 10:00:38 -04:00
parent c4209515a5
commit ca02f7ed06
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/core/validator.js
View File

@@ -217,21 +217,19 @@ export function coreValidator(context) {
//
// Run validation for several entities, supplied `entityIDs`
// It uses the "validatedGraph", so this can be called asynchronously
// as entities are loaded from OSM if we want to.
//
validator.validateEntities = function(entityIDs) {
_validatedGraph = _validatedGraph || context.history().base();
var graph = context.graph();
var entitiesToCheck = entityIDs.reduce(function(acc, entityID) {
var entity = _validatedGraph.entity(entityID);
var entity = graph.entity(entityID);
if (acc.has(entity)) return acc;
acc.add(entity);
var checkParentRels = [entity];
if (entity.type === 'node') { // include parent ways
_validatedGraph.parentWays(entity).forEach(function(parentWay) {
graph.parentWays(entity).forEach(function(parentWay) {
checkParentRels.push(parentWay);
acc.add(parentWay);
});
@@ -239,7 +237,7 @@ export function coreValidator(context) {
checkParentRels.forEach(function(entity) { // include parent relations
if (entity.type !== 'relation') { // but not super-relations
_validatedGraph.parentRelations(entity).forEach(function(parentRel) {
graph.parentRelations(entity).forEach(function(parentRel) {
acc.add(parentRel);
});
}