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

don't include misspelled taginfo suggestions in combo fields

Browse Source
This commit is contained in:
Martin Raifer
2022-12-02 13:49:49 +01:00
parent 60ee70f016
commit dcd7fb4938
3 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ui/combobox.js
-2
View File
@@ -349,8 +349,6 @@ export function uiCombobox(context, klass) {
suggestionValues.push(s.key);
}
});
//_suggestions.map(s => s.value)
// .concat(_suggestions.filter(s => s.key !== s.value).map(s => s.key));
var bestIndex = -1;
for (var i = 0; i < suggestionValues.length; i++) {
modules/ui/fields/combo.js
+20 -10
View File
@@ -97,6 +97,10 @@ export function uiFieldCombo(field, context) {
return 'yes';
}
return restrictTagValueSpelling(dval) || undefined;
}
function restrictTagValueSpelling(dval) {
if (_snake_case) {
dval = snake(dval);
}
@@ -105,7 +109,7 @@ export function uiFieldCombo(field, context) {
dval = dval.toLowerCase();
}
return dval || undefined;
return dval;
}
@@ -227,23 +231,29 @@ export function uiFieldCombo(field, context) {
services.taginfo[fn](params, function(err, data) {
if (err) return;
data = data.filter(function(d) {
// don't show the fallback value
return field.type !== 'typeCombo' || d.value !== 'yes';
// don't show the fallback value
data = data.filter(d =>
field.type !== 'typeCombo' || d.value !== 'yes');
// don't show misspelled values
data = data.filter(d => {
var value = d.value;
if (_isMulti) {
value = value.slice(field.key.length);
}
return value === restrictTagValueSpelling(value);
});
var deprecatedValues = osmEntity.deprecatedTagValuesByKey(_dataDeprecated)[field.key];
if (deprecatedValues) {
// don't suggest deprecated tag values
data = data.filter(function(d) {
return deprecatedValues.indexOf(d.value) === -1;
});
data = data.filter(d =>
!deprecatedValues.includes(d.value));
}
if (hasCountryPrefix) {
data = data.filter(function(d) {
return d.value.toLowerCase().indexOf(_countryCode + ':') === 0;
});
data = data.filter(d =>
d.value.toLowerCase().indexOf(_countryCode + ':') === 0);
}
const additionalOptions = (field.options || stringsField.options || [])