CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-19 17:43:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't repeat addTags suggestion if key is also in NSI suggestion

Browse Source
This commit is contained in:
Martin Raifer
2025-03-10 11:49:36 +01:00
parent 28d1a4c66d
commit 4282acab09
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
modules/validations/outdated_tags.js
View File

@@ -42,6 +42,19 @@ export function validationOutdatedTags() {
preset = newPreset;
}
// Attempt to match a canonical record in the name-suggestion-index.
const nsi = services.nsi;
let waitingForNsi = false;
let nsiResult;
if (nsi) {
waitingForNsi = (nsi.status() === 'loading');
if (!waitingForNsi) {
const loc = entity.extent(graph).center();
nsiResult = nsi.upgradeTags(oldTags, loc);
}
}
const nsiDiff = nsiResult ? utilTagDiff(oldTags, nsiResult.newTags) : [];
// Upgrade deprecated tags..
if (_dataDeprecated) {
const deprecatedTags = getDeprecatedTags(entity.tags, _dataDeprecated);
@@ -64,7 +77,10 @@ export function validationOutdatedTags() {
// Add missing addTags from the detected preset
let newTags = Object.assign({}, entity.tags); // shallow copy
if (preset.tags !== preset.addTags) {
Object.keys(preset.addTags).forEach(k => {
Object.keys(preset.addTags).filter(k => {
// if nsi suggestion already includes this tag: don't repeat it in "incomplete tags"
return !nsiResult?.newTags[k];
}).forEach(k => {
if (!newTags[k]) {
if (preset.addTags[k] === '*') {
newTags[k] = 'yes';
@@ -74,23 +90,8 @@ export function validationOutdatedTags() {
}
});
}
const deprecationDiff = utilTagDiff(oldTags, newTags);
// Attempt to match a canonical record in the name-suggestion-index.
const nsi = services.nsi;
let waitingForNsi = false;
let nsiResult;
if (nsi) {
waitingForNsi = (nsi.status() === 'loading');
if (!waitingForNsi) {
const loc = entity.extent(graph).center();
nsiResult = nsi.upgradeTags(oldTags, loc);
}
}
const nsiDiff = nsiResult ? utilTagDiff(oldTags, nsiResult.newTags) : [];
let issues = [];
issues.provisional = (_waitingForDeprecated || waitingForNsi);