diff options
| author | IrlJidel <donal.diamond@gmail.com> | 2013-01-18 14:18:57 +0000 |
|---|---|---|
| committer | IrlJidel <donal.diamond@gmail.com> | 2013-01-18 14:18:57 +0000 |
| commit | 055dc3a28428fb6914f02bab35933a4cea614731 (patch) | |
| tree | 4230fcc286421c439f8df52bc5d2a84683773d58 | |
| parent | 1c332107b2fc68f997cee654cfcf18604ab55c9b (diff) | |
| download | taginfo-055dc3a28428fb6914f02bab35933a4cea614731.tar taginfo-055dc3a28428fb6914f02bab35933a4cea614731.tar.gz | |
Use rtype as param for api/4/relation/roles call
Was using type as param which is inconsistent with api/4/relation/stats call
Also example was using role as param which is incorrect
| -rw-r--r-- | web/lib/api/v4/relation.rb | 6 | ||||
| -rw-r--r-- | web/viewsjs/relation.js.erb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/web/lib/api/v4/relation.rb b/web/lib/api/v4/relation.rb index 4982f07..73c5a15 100644 --- a/web/lib/api/v4/relation.rb +++ b/web/lib/api/v4/relation.rb @@ -5,7 +5,7 @@ class Taginfo < Sinatra::Base api(4, 'relation/roles', { :description => 'Member role statistics for a relation of given type.', :parameters => { - :type => 'Relation type (required).', + :rtype => 'Relation type (required).', :query => 'Only show results where the role matches this query (substring match, optional).' }, :paging => :optional, @@ -22,10 +22,10 @@ class Taginfo < Sinatra::Base [:count_relation_members, :INT, 'Number of members of type relation with this role.'], [:count_relation_members_fraction, :FLOAT, 'Number of members of type relation with this role devided by all members of type relation.'] ]), - :example => { :role => 'multipolygon', :page => 1, :rp => 10 }, + :example => { :rtype => 'multipolygon', :page => 1, :rp => 10 }, :ui => '/reports/relation_types#roles' }) do - rtype = params[:type] + rtype = params[:rtype] relation_type_info = @db.select('SELECT * FROM relation_types'). condition("rtype=?", rtype). diff --git a/web/viewsjs/relation.js.erb b/web/viewsjs/relation.js.erb index 931f33c..13d431c 100644 --- a/web/viewsjs/relation.js.erb +++ b/web/viewsjs/relation.js.erb @@ -28,7 +28,7 @@ var create_flexigrid_for = { }, roles: function(rtype) { create_flexigrid('grid-roles', { - url: '/api/4/relation/roles?type=' + encodeURIComponent(rtype), + url: '/api/4/relation/roles?rtype=' + encodeURIComponent(rtype), colModel: [ { display: '<%= osm.relation_member_role %>', name: 'role', width: 250, sortable: true }, { display: '<span title="<%= page.roles.objects_tooltip %>"><img src="/img/types/all.16.png" width="16" height="16" alt=""/> <%= osm.relation_members %></span>', name: 'count_all_members', width: 250, sortable: true, align: 'center' }, |