From e99afbe1c1408dbbaea26f51af2491f2e20ae897 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= <mxn@1ec5.org>
Date: Sat, 30 Jul 2016 23:24:55 -0700
Subject: [PATCH 1/2] Fixed taginfo for relation presets
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

taginfo’s relation/wiki_pages method no longer places results in a data property.

Also, only use relation/wiki_pages for top-level relation presets. More specific presets behave like non-relation presets. For example, the bicycle route relation has the tags type=route route=bicycle, so route=bicycle is what we’re interested in.

Fixes #3297.
---
 modules/presets/preset.js   | 11 +++++++++--
 modules/services/taginfo.js |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/modules/presets/preset.js b/modules/presets/preset.js
index 70cdb3a94..d7da3b236 100644
--- a/modules/presets/preset.js
+++ b/modules/presets/preset.js
@@ -61,8 +61,15 @@ export function Preset(id, preset, fields) {
             value = preset.tags[key];
 
         if (geometry === 'relation' && key === 'type') {
-            return { rtype: value };
-        } else if (value === '*') {
+            if (value in preset.tags) {
+                key = value;
+                value = preset.tags[key];
+            } else {
+                return { rtype: value };
+            }
+        }
+
+        if (value === '*') {
             return { key: key };
         } else {
             return { key: key, value: value };
diff --git a/modules/services/taginfo.js b/modules/services/taginfo.js
index 0df8cd83c..b2bc188f7 100644
--- a/modules/services/taginfo.js
+++ b/modules/services/taginfo.js
@@ -156,7 +156,7 @@ export function init() {
 
         request(endpoint + path + qsString(parameters), debounce, function(err, d) {
             if (err) return callback(err);
-            callback(null, d.data);
+            callback(null, parameters.rtype ? d : d.data);
         });
     };
 

From c4691529252add08f2412b00a9ab6bc1e762da5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= <mxn@1ec5.org>
Date: Tue, 2 Aug 2016 00:18:32 -0700
Subject: [PATCH 2/2] Removed workaround for joto/taginfo#179

---
 modules/services/taginfo.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/taginfo.js b/modules/services/taginfo.js
index b2bc188f7..0df8cd83c 100644
--- a/modules/services/taginfo.js
+++ b/modules/services/taginfo.js
@@ -156,7 +156,7 @@ export function init() {
 
         request(endpoint + path + qsString(parameters), debounce, function(err, d) {
             if (err) return callback(err);
-            callback(null, parameters.rtype ? d : d.data);
+            callback(null, d.data);
         });
     };