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

Consider matchScore when sorting the preset list

Browse Source
This commit is contained in:
Bryan Housel
2017-03-12 19:01:15 -04:00
parent 73f32fe5f3
commit 5e7919e78c
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/presets/collection.js
View File

@@ -56,9 +56,14 @@ export function presetCollection(collection) {
var leading_name = _.filter(searchable, function(a) {
return leading(a.name().toLowerCase());
}).sort(function(a, b) {
var i = a.name().toLowerCase().indexOf(value) - b.name().toLowerCase().indexOf(value);
if (i === 0) return a.name().length - b.name().length;
else return i;
var i;
i = b.originalScore - a.originalScore;
if (i !== 0) return i;
i = a.name().toLowerCase().indexOf(value) - b.name().toLowerCase().indexOf(value);
if (i !== 0) return i;
return a.name().length - b.name().length;
});
// matches value to preset.terms values

8
modules/presets/preset.js
View File

@@ -21,16 +21,18 @@ export function presetPreset(id, preset, fields) {
};
var matchScore = preset.matchScore || 1;
preset.originalScore = preset.matchScore || 1;
preset.matchScore = function(entity) {
var tags = preset.tags,
score = 0;
for (var t in tags) {
if (entity.tags[t] === tags[t]) {
score += matchScore;
score += preset.originalScore;
} else if (tags[t] === '*' && t in entity.tags) {
score += matchScore / 2;
score += preset.originalScore / 2;
} else {
return -1;
}