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

Include name-suggestion-index matcher in outdated_tags validator

Browse Source
This commit is contained in:
Bryan Housel
2019-05-17 01:58:57 -04:00
parent caecbffc18
commit 8d0fa289cf
1 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
modules/validations/outdated_tags.js
View File

@@ -1,4 +1,6 @@
import { t } from '../util/locale';
import { matcher, brands } from 'name-suggestion-index';
import { actionChangePreset } from '../actions/change_preset';
import { actionChangeTags } from '../actions/change_tags';
import { actionUpgradeTags } from '../actions/upgrade_tags';
@@ -10,6 +12,12 @@ import { validationIssue, validationIssueFix } from '../core/validation';
export function validationOutdatedTags() {
var type = 'outdated_tags';
// initialize name-suggestion-index matcher
var nsiMatcher = matcher();
nsiMatcher.buildMatchIndex(brands.brands);
var nsiKeys = ['amenity', 'leisure', 'shop', 'tourism'];
function oldTagIssues(entity, context) {
var graph = context.graph();
var oldTags = Object.assign({}, entity.tags); // shallow copy
@@ -47,6 +55,24 @@ export function validationOutdatedTags() {
});
}
// search name-suggestion-index
if (newTags.name) {
for (var i = 0; i < nsiKeys.length; i++) {
var k = nsiKeys[i];
if (!newTags[k]) continue;
var match = nsiMatcher.matchKVN(k, newTags[k], newTags.name);
if (!match) continue;
var brand = brands.brands[match.kvnd];
if (brand) {
Object.assign(newTags, brand.tags);
break;
}
}
}
// determine diff
var tagDiff = utilTagDiff(oldTags, newTags);
if (!tagDiff.length) return [];