From 6ba497e64bb8346c4777e2db290cb812a4fdb535 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Fri, 29 Jul 2016 13:16:44 -0700 Subject: [PATCH] Allow uppercase in network taginfo (#3280) When suggesting values for network or cycle_network from taginfo, include values that contain uppercase letters. --- modules/services/taginfo.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/services/taginfo.js b/modules/services/taginfo.js index 0369b6ad3..0df8cd83c 100644 --- a/modules/services/taginfo.js +++ b/modules/services/taginfo.js @@ -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)); }); };