diff options
author | Jochen Topf <jochen@topf.org> | 2013-01-06 20:58:09 +0100 |
---|---|---|
committer | Jochen Topf <jochen@topf.org> | 2013-01-06 20:58:09 +0100 |
commit | d80c2ce840a6d50e7809c8738afc9f09a02379f3 (patch) | |
tree | c6b7b73e3da5e82ba998daf21bbfab482ca2d4fb | |
parent | c47f73c31d29ad862fa1bd4b08e14d750ab8f93e (diff) | |
download | taginfo-d80c2ce840a6d50e7809c8738afc9f09a02379f3.tar taginfo-d80c2ce840a6d50e7809c8738afc9f09a02379f3.tar.gz |
Switched all remaining API calls to v4
-rw-r--r-- | examples/jsonp.html | 2 | ||||
-rw-r--r-- | web/views/key.erb | 8 | ||||
-rw-r--r-- | web/views/reports/frequently_used_keys_without_wiki_page.erb | 2 | ||||
-rw-r--r-- | web/viewsjs/keys.js.erb | 2 | ||||
-rw-r--r-- | web/viewsjs/reports/characters_in_keys.js.erb | 4 | ||||
-rw-r--r-- | web/viewsjs/reports/key_lengths.js.erb | 2 | ||||
-rw-r--r-- | web/viewsjs/reports/wiki_pages_about_non_existing_keys.js.erb | 2 | ||||
-rw-r--r-- | web/viewsjs/tags.js.erb | 2 |
8 files changed, 12 insertions, 12 deletions
diff --git a/examples/jsonp.html b/examples/jsonp.html index c3f243f..923d650 100644 --- a/examples/jsonp.html +++ b/examples/jsonp.html @@ -9,7 +9,7 @@ function jsonp(data) { result = data; } </script> - <script src="http://taginfo.openstreetmap.org/api/2/db/keys?include=prevalent_values&page=1&rp=15&sortname=count_all&sortorder=desc&qtype=key&callback=jsonp"></script> + <script src="http://taginfo.openstreetmap.org/api/4/keys/all?page=1&rp=15&sortname=count_all&sortorder=desc&qtype=key&callback=jsonp"></script> <script> var key = result.data[0].key; alert(key); diff --git a/web/views/key.erb b/web/views/key.erb index 4092311..2f87509 100644 --- a/web/views/key.erb +++ b/web/views/key.erb @@ -54,16 +54,16 @@ <h2><%= t.pages.key.geographic_distribution.title %></h2> <% if @filter_type == 'all' %> <div style="background-image: url(<%= TaginfoConfig.get('geodistribution.background_image') %>); background-repeat: no-repeat; background-position: 1px 1px;"/> - <img class="map" src="/api/3/db/keys/distribution/nodes?key=<%= @key_uri %>" alt="" width="<%= @img_width %>" height="<%= @img_height %>" style="position: absolute;"/> - <img class="map" src="/api/3/db/keys/distribution/ways?key=<%= @key_uri %>" alt="" width="<%= @img_width %>" height="<%= @img_height %>"/> + <img class="map" src="/api/4/key/distribution/nodes?key=<%= @key_uri %>" alt="" width="<%= @img_width %>" height="<%= @img_height %>" style="position: absolute;"/> + <img class="map" src="/api/4/key/distribution/ways?key=<%= @key_uri %>" alt="" width="<%= @img_width %>" height="<%= @img_height %>"/> </div> <% elsif @filter_type == 'nodes' %> <div style="background-image: url(<%= TaginfoConfig.get('geodistribution.background_image') %>); background-repeat: no-repeat; background-position: 1px 1px;"/> - <img class="map" src="/api/3/db/keys/distribution/nodes?key=<%= @key_uri %>" alt="" width="<%= @img_width %>" height="<%= @img_height %>"/> + <img class="map" src="/api/4/key/distribution/nodes?key=<%= @key_uri %>" alt="" width="<%= @img_width %>" height="<%= @img_height %>"/> </div> <% elsif @filter_type == 'ways' %> <div style="background-image: url(<%= TaginfoConfig.get('geodistribution.background_image') %>); background-repeat: no-repeat; background-position: 1px 1px;"/> - <img class="map" src="/api/3/db/keys/distribution/ways?key=<%= @key_uri %>" alt="" width="<%= @img_width %>" height="<%= @img_height %>"/> + <img class="map" src="/api/4/key/distribution/ways?key=<%= @key_uri %>" alt="" width="<%= @img_width %>" height="<%= @img_height %>"/> </div> <% elsif @filter_type == 'relations' %> <p class="empty"><%= t.pages.key.geographic_distribution.relations %></p> diff --git a/web/views/reports/frequently_used_keys_without_wiki_page.erb b/web/views/reports/frequently_used_keys_without_wiki_page.erb index 818acca..d510f70 100644 --- a/web/views/reports/frequently_used_keys_without_wiki_page.erb +++ b/web/views/reports/frequently_used_keys_without_wiki_page.erb @@ -18,7 +18,7 @@ function page_init2() { create_flexigrid_with_option(#{ params[:english] == '1' ? '1' : '0' }); jQuery('#english').bind('click', function() { jQuery('#grid-keys').flexOptions({ - url: '/api/2/reports/frequently_used_keys_without_wiki_page?english=' + (jQuery('#english')[0].checked ? '1' : '0') + url: '/api/4/keys/without_wiki_page?english=' + (jQuery('#english')[0].checked ? '1' : '0') }); jQuery('#grid-keys').flexReload(); }); diff --git a/web/viewsjs/keys.js.erb b/web/viewsjs/keys.js.erb index 39cbe3d..8e9e4e2 100644 --- a/web/viewsjs/keys.js.erb +++ b/web/viewsjs/keys.js.erb @@ -4,7 +4,7 @@ %> function page_init() { create_flexigrid('grid-keys', { - url: '/api/2/db/keys?include=prevalent_values', + url: '/api/4/keys/all?include=prevalent_values', colModel: [ { display: '<%= osm.key %>', name: 'key', width: 160, sortable: true }, { display: '<span title="<%= misc.objects_tooltip %>"><img src="/img/types/all.16.png" width="16" height="16" alt=""/> <%= osm.objects %></span>', name: 'count_all', width: 160, sortable: true, align: 'center' }, diff --git a/web/viewsjs/reports/characters_in_keys.js.erb b/web/viewsjs/reports/characters_in_keys.js.erb index 2d9a5c3..612110e 100644 --- a/web/viewsjs/reports/characters_in_keys.js.erb +++ b/web/viewsjs/reports/characters_in_keys.js.erb @@ -5,7 +5,7 @@ var create_flexigrid_for = { whitespace: function() { create_flexigrid('grid-whitespace', { - url: '/api/2/db/keys?filters=characters_space&include=prevalent_values', + url: '/api/4/keys/all?filters=characters_space&include=prevalent_values', colModel: [ { display: '<%= osm.key %>', name: 'key', width: 250, sortable: true }, { display: '<span title="<%= misc.objects_tooltip %>"><img src="/img/types/all.16.png" width="16" height="16" alt=""/> <%= osm.objects %></span>', name: 'count_all', width: 250, sortable: true, align: 'center' }, @@ -38,7 +38,7 @@ var create_flexigrid_for = { }, problematic: function() { create_flexigrid('grid-problematic', { - url: '/api/2/db/keys?filters=characters_problematic&include=prevalent_values', + url: '/api/4/keys/all?filters=characters_problematic&include=prevalent_values', colModel: [ { display: '<%= osm.key %>', name: 'key', width: 250, sortable: true }, { display: '<span title="<%= misc.objects_tooltip %>"><img src="/img/types/all.16.png" width="16" height="16" alt=""/> <%= osm.objects %></span>', name: 'count_all', width: 250, sortable: true, align: 'center' }, diff --git a/web/viewsjs/reports/key_lengths.js.erb b/web/viewsjs/reports/key_lengths.js.erb index 4ccd760..4062808 100644 --- a/web/viewsjs/reports/key_lengths.js.erb +++ b/web/viewsjs/reports/key_lengths.js.erb @@ -6,7 +6,7 @@ var create_flexigrid_for = { keys: function() { create_flexigrid('grid-keys', { - url: '/api/2/db/keys?include=prevalent_values', + url: '/api/4/keys/all?include=prevalent_values', colModel: [ { display: '<%= misc.length %>', name: 'length', width: 60, sortable: true, align: 'right' }, { display: '<%= osm.key %>', name: 'key', width: 180, sortable: true }, diff --git a/web/viewsjs/reports/wiki_pages_about_non_existing_keys.js.erb b/web/viewsjs/reports/wiki_pages_about_non_existing_keys.js.erb index 9dfc9d9..06c0162 100644 --- a/web/viewsjs/reports/wiki_pages_about_non_existing_keys.js.erb +++ b/web/viewsjs/reports/wiki_pages_about_non_existing_keys.js.erb @@ -4,7 +4,7 @@ %> function page_init() { create_flexigrid('grid-keys', { - url: '/api/2/db/keys?filters=in_wiki,not_in_db&include=wikipages', + url: '/api/4/keys/all?filters=in_wiki,not_in_db&include=wikipages', colModel: [ { display: '<img src="/img/sources/wiki.16.png" alt="Wiki" width="16" height="16" title="Wiki"/>', name: 'in_wiki', width: 20, sortable: true, align: 'center' }, { display: '<img src="/img/sources/josm.16.png" alt="JOSM" width="16" height="16" title="JOSM"/>', name: 'in_josm', width: 20, sortable: true, align: 'center' }, diff --git a/web/viewsjs/tags.js.erb b/web/viewsjs/tags.js.erb index 94b0b91..6ba5c98 100644 --- a/web/viewsjs/tags.js.erb +++ b/web/viewsjs/tags.js.erb @@ -4,7 +4,7 @@ %> function page_init() { create_flexigrid('grid-tags', { - url: '/api/2/db/tags', + url: '/api/4/tags/popular', colModel: [ { display: '<%= osm.tag %>', name: 'tag', width: 300, sortable: true }, { display: '<span title="<%= misc.objects_tooltip %>"><img src="/img/types/all.16.png" width="16" height="16" alt=""/> <%= osm.objects %></span>', name: 'count_all', width: 260, sortable: true, align: 'center' }, |