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

if on address interpolation, match and don't look through keys...

Browse Source 
ref #5811
This commit is contained in:
Max Grossman
2019-02-01 17:58:15 -05:00
parent 58e31bc45a
commit b7786fd081
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
modules/presets/index.js
View File

@@ -82,25 +82,29 @@ export function presetIndex() {
var vertexPresets = _index.vertex;
var match;
for (var k in entity.tags) {
var keyMatches = vertexPresets[k];
if (!keyMatches) continue;
for (var i = 0; i < keyMatches.length; i++) {
var preset = keyMatches[i];
if (preset.searchable !== false) {
if (preset.matchScore(entity) > -1) {
match = preset;
break;
if (entity.isOnAddressLine(resolver)) {
match = true;
} else {
for (var k in entity.tags) {
var keyMatches = vertexPresets[k];
if (!keyMatches) continue;
for (var i = 0; i < keyMatches.length; i++) {
var preset = keyMatches[i];
if (preset.searchable !== false) {
if (preset.matchScore(entity) > -1) {
match = preset;
break;
}
}
}
if (!match && /^addr:/.test(k) && vertexPresets['addr:*']) {
match = true;
}
if (match) break;
}
if (!match && /^addr:/.test(k) && vertexPresets['addr:*']) {
match = true;
}
if (match) break;
}
return match;