From b9cd9193c3db4b145d047ec149bf1b857116bf05 Mon Sep 17 00:00:00 2001
From: Ansis Brammanis <ansis.brammanis@gmail.com>
Date: Thu, 10 Jan 2013 13:25:01 -0500
Subject: [PATCH] update to taginfo api v4

---
 js/id/services/taginfo.js | 8 ++++----
 test/spec/taginfo.js      | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/js/id/services/taginfo.js b/js/id/services/taginfo.js
index 77e9b3f0d..20f1cd09a 100644
--- a/js/id/services/taginfo.js
+++ b/js/id/services/taginfo.js
@@ -1,6 +1,6 @@
 iD.taginfo = function() {
     var taginfo = {},
-        endpoint = 'http://taginfo.openstreetmap.org/api/2/',
+        endpoint = 'http://taginfo.openstreetmap.org/api/4/',
         tag_sorts = {
             point: 'count_nodes',
             vertex: 'count_nodes',
@@ -35,7 +35,7 @@ iD.taginfo = function() {
 
     taginfo.keys = function(parameters, callback) {
         parameters = clean(setSort(setFilter(parameters)));
-        d3.json(endpoint + 'db/keys?' +
+        d3.json(endpoint + 'keys/all?' +
             iD.util.qsString(_.extend({
                 rp: 6,
                 sortname: 'count_all',
@@ -46,7 +46,7 @@ iD.taginfo = function() {
 
     taginfo.values = function(parameters, callback) {
         parameters = clean(setSort(setFilter(parameters)));
-        d3.json(endpoint + 'db/keys/values?' +
+        d3.json(endpoint + 'key/values?' +
             iD.util.qsString(_.extend({
                 rp: 20,
                 sortname: 'count_all',
@@ -57,7 +57,7 @@ iD.taginfo = function() {
 
     taginfo.docs = function(parameters, callback) {
         parameters = clean(setSort(parameters));
-        d3.json(endpoint + 'wiki/tags?' +
+        d3.json(endpoint + 'tag/wiki_pages?' +
             iD.util.qsString(parameters), callback);
     };
 
diff --git a/test/spec/taginfo.js b/test/spec/taginfo.js
index 0c9fec93f..b41c760e0 100644
--- a/test/spec/taginfo.js
+++ b/test/spec/taginfo.js
@@ -20,7 +20,7 @@ describe("iD.taginfo", function() {
 
             taginfo.keys({query: "amen"}, callback);
 
-            server.respondWith("GET", new RegExp("http://taginfo.openstreetmap.org/api/2/db/keys"),
+            server.respondWith("GET", new RegExp("http://taginfo.openstreetmap.org/api/4/keys/all"),
                 [200, { "Content-Type": "application/json" },
                     '{"data":[{"count_all":5190337,"key":"amenity"}]}']);
             server.respond();
@@ -39,7 +39,7 @@ describe("iD.taginfo", function() {
 
             taginfo.values({key: "amenity", query: "par"}, callback);
 
-            server.respondWith("GET", new RegExp("http://taginfo.openstreetmap.org/api/2/db/keys/values"),
+            server.respondWith("GET", new RegExp("http://taginfo.openstreetmap.org/api/4/key/values"),
                 [200, { "Content-Type": "application/json" },
                     '{"data":[{"value":"parking","description":"A place for parking cars"}]}']);
             server.respond();
@@ -58,7 +58,7 @@ describe("iD.taginfo", function() {
 
             taginfo.docs({key: "amenity", value: "parking"}, callback);
 
-            server.respondWith("GET", new RegExp("http://taginfo.openstreetmap.org/api/2/wiki/tags"),
+            server.respondWith("GET", new RegExp("http://taginfo.openstreetmap.org/api/4/tag/wiki_page"),
                 [200, { "Content-Type": "application/json" },
                     '[{"on_way":false,"lang":"en","on_area":true,"image":"File:Car park2.jpg"}]']);
             server.respond();