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

update to taginfo api v4

Browse Source
This commit is contained in:
Ansis Brammanis
2013-01-10 13:25:01 -05:00
parent 61aaa3994b
commit b9cd9193c3
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
js/id/services/taginfo.js
View File

@@ -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);
};

6
test/spec/taginfo.js
View File

@@ -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();