Allow uppercase in network taginfo (#3280)

When suggesting values for network or cycle_network from taginfo, include values that contain uppercase letters.
This commit is contained in:
Minh Nguyễn
2016-07-29 13:16:44 -07:00
committed by Bryan Housel
parent 8b9fc25e87
commit 6ba497e64b

View File

@@ -49,9 +49,10 @@ function filterMultikeys() {
};
}
function filterValues() {
function filterValues(allowUpperCase) {
return function(d) {
if (d.value.match(/[A-Z*;,]/) !== null) return false; // exclude some punctuation, uppercase letters
if (d.value.match(/[;,]/) !== null) return false; // exclude some punctuation
if (!allowUpperCase && d.value.match(/[A-Z*]/) !== null) return false; // exclude uppercase letters
return parseFloat(d.fraction) > 0.0 || d.in_wiki;
};
}
@@ -140,7 +141,7 @@ export function init() {
page: 1
}, parameters)), debounce, function(err, d) {
if (err) return callback(err);
var f = filterValues();
var f = filterValues(parameters.key === 'cycle_network' || parameters.key === 'network');
callback(null, d.data.filter(f).map(valKeyDescription));
});
};