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

Slightly improve suggestion placement, preset search performance

Browse Source 
- avoid lodash _filter when native filter is ok for arrays
- for suggestions use `originalName` instead of adding/removing the en-dash
- bump up importance of leading suggestions, but do a strict leading search

more on that last point:
For normal presets, we count a string as leading if it follows a space.
e.g. "office" will match "Law Office"
We don't really want this for suggestion presets though
e.g. "bell" should not match "Taco Bell"
This commit is contained in:
Bryan Housel
2019-01-29 21:56:23 -05:00
parent a4eab24117
commit 17bbc3d5a2
2 changed files with 65 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
modules/presets/collection.js
View File

@@ -1,4 +1,3 @@
import _filter from 'lodash-es/filter';
import _find from 'lodash-es/find';
import _findIndex from 'lodash-es/findIndex';
import _some from 'lodash-es/some';
@@ -11,7 +10,6 @@ import { utilEditDistance } from '../util/index';
export function presetCollection(collection) {
var maxSearchResults = 50;
var maxSuggestionResults = 10;
var presets = {
@@ -40,64 +38,70 @@ export function presetCollection(collection) {
search: function(value, geometry) {
if (!value) return this;
value = value.toLowerCase();
// match at name beginning or just after a space (e.g. "office" -> match "Law Office")
function leading(a) {
var index = a.indexOf(value);
return index === 0 || a[index - 1] === ' ';
}
function suggestionName(name) {
var nameArray = name.split(' - ');
if (nameArray.length > 1) {
name = nameArray.slice(0, nameArray.length - 1).join(' - ');
}
return name.toLowerCase();
// match at name beginning only
function leadingStrict(a) {
var index = a.indexOf(value);
return index === 0;
}
function sortNames(a, b) {
var aCompare = (a.suggestion ? a.originalName : a.name()).toLowerCase();
var bCompare = (b.suggestion ? b.originalName : b.name()).toLowerCase();
// priority if search string matches preset name exactly - #4325
if (value === aCompare) return -1;
if (value === bCompare) return 1;
// priority for higher matchScore
var i = b.originalScore - a.originalScore;
if (i !== 0) return i;
// priority if search string appears earlier in preset name
i = aCompare.indexOf(value) - bCompare.indexOf(value);
if (i !== 0) return i;
// priority for shorter preset names
return aCompare.length - bCompare.length;
}
value = value.toLowerCase();
var searchable = _filter(this.collection, function(a) {
var searchable = this.collection.filter(function(a) {
return a.searchable !== false && a.suggestion !== true;
});
var suggestions = _filter(this.collection, function(a) {
var suggestions = this.collection.filter(function(a) {
return a.suggestion === true;
});
// matches value to preset.name
var leading_name = _filter(searchable, function(a) {
var leading_name = searchable
.filter(function(a) {
return leading(a.name().toLowerCase());
}).sort(function(a, b) {
var aCompare = a.name().toLowerCase();
var bCompare = b.name().toLowerCase();
var i;
// priority if search string matches preset name exactly - #4325
if (value === aCompare) return -1;
if (value === bCompare) return 1;
// priority for higher matchScore
i = b.originalScore - a.originalScore;
if (i !== 0) return i;
// priority if search string appears earlier in preset name
i = aCompare.indexOf(value) - bCompare.indexOf(value);
if (i !== 0) return i;
// priority for shorter preset names
return a.name().length - b.name().length;
});
}).sort(sortNames);
// matches value to preset.terms values
var leading_terms = _filter(searchable, function(a) {
return _some(a.terms() || [], leading);
});
var leading_terms = searchable
.filter(function(a) {
return _some(a.terms() || [], leading);
});
// matches value to preset.tags values
var leading_tag_values = _filter(searchable, function(a) {
return _some(_without(_values(a.tags || {}), '*'), leading);
});
var leading_tag_values = searchable
.filter(function(a) {
return _some(_without(_values(a.tags || {}), '*'), leading);
});
var leading_suggestions = suggestions
.filter(function(a) {
return leadingStrict(a.originalName.toLowerCase());
}).sort(sortNames);
// finds close matches to value in preset.name
var similar_name = searchable
@@ -112,26 +116,18 @@ export function presetCollection(collection) {
});
// finds close matches to value in preset.terms
var similar_terms = _filter(searchable, function(a) {
var similar_terms = searchable
.filter(function(a) {
return _some(a.terms() || [], function(b) {
return utilEditDistance(value, b) + Math.min(value.length - b.length, 0) < 3;
});
});
var leading_suggestions = _filter(suggestions, function(a) {
return leading(suggestionName(a.name()));
}).sort(function(a, b) {
a = suggestionName(a.name());
b = suggestionName(b.name());
var i = a.indexOf(value) - b.indexOf(value);
if (i === 0) return a.length - b.length;
else return i;
});
var similar_suggestions = suggestions.map(function(a) {
return { preset: a, dist: utilEditDistance(value, suggestionName(a.name())) };
var similar_suggestions = suggestions
.map(function(a) {
return { preset: a, dist: utilEditDistance(value, a.originalName.toLowerCase()) };
}).filter(function(a) {
return a.dist + Math.min(value.length - suggestionName(a.preset.name()).length, 0) < 1;
return a.dist + Math.min(value.length - a.preset.originalName.length, 0) < 1;
}).sort(function(a, b) {
return a.dist - b.dist;
}).map(function(a) {
@@ -141,12 +137,12 @@ export function presetCollection(collection) {
var other = presets.item(geometry);
var results = leading_name.concat(
leading_suggestions,
leading_terms,
leading_tag_values,
leading_suggestions.slice(0, maxSuggestionResults + 5),
similar_name,
similar_terms,
similar_suggestions.slice(0, maxSuggestionResults)
similar_suggestions,
similar_terms
).slice(0, maxSearchResults - 1);
return presetCollection(_uniq(results.concat(other)));

19
modules/presets/preset.js
View File

@@ -130,20 +130,25 @@ export function presetPreset(id, preset, fields, visible, rawPresets) {
};
var origName = preset.name || '';
preset.originalName = preset.name || '';
preset.name = function() {
if (preset.suggestion) {
var path = id.split('/');
path.pop(); // remove brand name
// NOTE: insert an en-dash, not a hypen (to avoid conflict with fr - nl names in Brussels etc)
return origName + ' – ' + t('presets.presets.' + path.join('/') + '.name');
return preset.originalName + ' – ' + t('presets.presets.' + path.join('/') + '.name');
}
return preset.t('name', { 'default': origName });
return preset.t('name', { 'default': preset.originalName });
};
var origTerms = (preset.terms || []).join();
preset.originalTerms = (preset.terms || []).join();
preset.terms = function() {
return preset.t('terms', { 'default': origTerms }).toLowerCase().trim().split(/\s*,+\s*/);
return preset.t('terms', { 'default': preset.originalTerms }).toLowerCase().trim().split(/\s*,+\s*/);
};
@@ -161,8 +166,8 @@ export function presetPreset(id, preset, fields, visible, rawPresets) {
var reference = preset.reference || {};
preset.reference = function(geometry) {
var key = reference.key || Object.keys(_omit(preset.tags, 'name'))[0],
value = reference.value || preset.tags[key];
var key = reference.key || Object.keys(_omit(preset.tags, 'name'))[0];
var value = reference.value || preset.tags[key];
if (geometry === 'relation' && key === 'type') {
if (value in preset.tags) {