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

If undo'd back to the base graph, don't show head issues as user issues

Browse Source
This commit is contained in:
Bryan Housel
2021-08-05 12:47:52 -04:00
parent 9f58f1fb5c
commit 3b0a850400
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/validator.js
+6 -7
View File
@@ -176,14 +176,14 @@ export function coreValidator(context) {
validator.getIssues = (options) => {
const opts = Object.assign({ what: 'all', where: 'all', includeIgnored: false, includeDisabledRules: false }, options);
const view = context.map().extent();
const baseGraph = context.history().base();
let issues = [];
let seen = new Set();
// collect head issues - caused by user edits
let cache = _headCache;
if (_headGraph) {
Object.values(cache.issuesByIssueID).forEach(issue => {
if (!filter(issue, _headGraph, cache)) return;
if (_headGraph && _headGraph !== baseGraph) {
Object.values(_headCache.issuesByIssueID).forEach(issue => {
if (!filter(issue, _headGraph, _headCache)) return;
seen.add(issue.id);
issues.push(issue);
});
@@ -191,9 +191,8 @@ export function coreValidator(context) {
// collect base issues - not caused by user edits
if (opts.what === 'all') {
cache = _baseCache;
Object.values(cache.issuesByIssueID).forEach(issue => {
if (!filter(issue, context.history().base(), cache)) return;
Object.values(_baseCache.issuesByIssueID).forEach(issue => {
if (!filter(issue, baseGraph, _baseCache)) return;
seen.add(issue.id);
issues.push(issue);
});