cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into moderation

Browse source
This commit is contained in:
Andy Allan 2018-01-21 11:20:19 +00:00
commit ae44879213
139 changed files with 6377 additions and 1766 deletions
Download patch file Download diff file Expand all files Collapse all files

7
test/controllers/geocoder_controller_test.rb
View file

@ -1,4 +1,3 @@
require "test_helper"
require "geocoder_controller"
@ -425,6 +424,12 @@ class GeocoderControllerTest < ActionController::TestCase
results_check :name => "Dinant Link Road, Broxbourne, Hertfordshire, East of England, England, EN11 8HX, United Kingdom",
:lat => 51.7634883, :lon => -0.0088373,
:type => "way", :id => 3489841, :zoom => 17
get :search_osm_nominatim_reverse, :xhr => true,
:params => { :lat => 13.7709, :lon => 100.50507, :zoom => 19 }
results_check :name => "MM Steak&Grill, ถนนศรีอยุธยา, บางขุนพรหม, กรุงเทพมหานคร, เขตดุสิต, กรุงเทพมหานคร, 10300, ประเทศไทย",
:lat => 13.7708691, :lon => 100.505073233221,
:type => "way", :id => 542901374, :zoom => 19
end
end

2
test/controllers/node_controller_test.rb
View file

@ -455,7 +455,7 @@ class NodeControllerTest < ActionController::TestCase
end
# check error when a non-existent node is included
get :nodes, :params => { :nodes => "#{node1.id},#{node2.id},#{node3.id},#{node4.id},#{node5.id},400" }
get :nodes, :params => { :nodes => "#{node1.id},#{node2.id},#{node3.id},#{node4.id},#{node5.id},0" }
assert_response :not_found
end

2
test/controllers/relation_controller_test.rb
View file

@ -188,7 +188,7 @@ class RelationControllerTest < ActionController::TestCase
end
# check error when a non-existent relation is included
get :relations, :params => { :relations => "#{relation1.id},#{relation2.id},#{relation3.id},#{relation4.id},400" }
get :relations, :params => { :relations => "#{relation1.id},#{relation2.id},#{relation3.id},#{relation4.id},0" }
assert_response :not_found
end

6
test/controllers/trace_controller_test.rb
View file

@ -550,6 +550,9 @@ class TraceControllerTest < ActionController::TestCase
post :create, :params => { :trace => { :gpx_file => file, :description => "New Trace", :tagstring => "new,trace", :visibility => "trackable" } }
assert_response :forbidden
# Rewind the file
file.rewind
# Now authenticated
create(:user_preference, :user => user, :k => "gps.trace.visibility", :v => "identifiable")
assert_not_equal "trackable", user.preferences.where(:k => "gps.trace.visibility").first.v
@ -829,6 +832,9 @@ class TraceControllerTest < ActionController::TestCase
post :api_create, :params => { :file => file, :description => "New Trace", :tags => "new,trace", :visibility => "trackable" }
assert_response :unauthorized
# Rewind the file
file.rewind
# Now authenticated
create(:user_preference, :user => user, :k => "gps.trace.visibility", :v => "identifiable")
assert_not_equal "trackable", user.preferences.where(:k => "gps.trace.visibility").first.v

5
test/controllers/user_roles_controller_test.rb
View file

@ -134,5 +134,10 @@ class UserRolesControllerTest < ActionController::TestCase
end
assert_redirected_to user_path(target_user.display_name)
assert_equal "The string `no_such_role' is not a valid role.", flash[:error]
# Revoking administrator role from current user should fail
post :revoke, :params => { :display_name => administrator_user.display_name, :role => "administrator" }
assert_redirected_to user_path(administrator_user.display_name)
assert_equal "Cannot revoke administrator role from current user.", flash[:error]
end
end

2
test/controllers/way_controller_test.rb
View file

@ -105,7 +105,7 @@ class WayControllerTest < ActionController::TestCase
end
# check error when a non-existent way is included
get :ways, :params => { :ways => "#{way1.id},#{way2.id},#{way3.id},#{way4.id},400" }
get :ways, :params => { :ways => "#{way1.id},#{way2.id},#{way3.id},#{way4.id},0" }
assert_response :not_found
end

32
test/helpers/browse_helper_test.rb
View file

@ -104,7 +104,7 @@ class BrowseHelperTest < ActionView::TestCase
def test_format_key
html = format_key("highway")
assert_dom_equal "<a href=\"http://wiki.openstreetmap.org/wiki/Key:highway?uselang=en\" title=\"The wiki description page for the highway tag\">highway</a>", html
assert_dom_equal "<a href=\"https://wiki.openstreetmap.org/wiki/Key:highway?uselang=en\" title=\"The wiki description page for the highway tag\">highway</a>", html
html = format_key("unknown")
assert_dom_equal "unknown", html
@ -112,7 +112,7 @@ class BrowseHelperTest < ActionView::TestCase
def test_format_value
html = format_value("highway", "primary")
assert_dom_equal "<a href=\"http://wiki.openstreetmap.org/wiki/Tag:highway=primary?uselang=en\" title=\"The wiki description page for the highway=primary tag\">primary</a>", html
assert_dom_equal "<a href=\"https://wiki.openstreetmap.org/wiki/Tag:highway=primary?uselang=en\" title=\"The wiki description page for the highway=primary tag\">primary</a>", html
html = format_value("highway", "unknown")
assert_dom_equal "unknown", html
@ -124,7 +124,7 @@ class BrowseHelperTest < ActionView::TestCase
assert_dom_equal "<a href=\"tel:+1234567890\" title=\"Call +1234567890\">+1234567890</a>", html
html = format_value("wikipedia", "Test")
assert_dom_equal "<a title=\"The Test article on Wikipedia\" href=\"http://en.wikipedia.org/wiki/Test?uselang=en\">Test</a>", html
assert_dom_equal "<a title=\"The Test article on Wikipedia\" href=\"https://en.wikipedia.org/wiki/Test?uselang=en\">Test</a>", html
html = format_value("wikidata", "Q42")
assert_dom_equal "<a title=\"The Q42 item on Wikidata\" href=\"//www.wikidata.org/wiki/Q42?uselang=en\">Q42</a>", html
@ -165,26 +165,26 @@ class BrowseHelperTest < ActionView::TestCase
def test_wiki_link
link = wiki_link("key", "highway")
assert_equal "http://wiki.openstreetmap.org/wiki/Key:highway?uselang=en", link
assert_equal "https://wiki.openstreetmap.org/wiki/Key:highway?uselang=en", link
link = wiki_link("tag", "highway=primary")
assert_equal "http://wiki.openstreetmap.org/wiki/Tag:highway=primary?uselang=en", link
assert_equal "https://wiki.openstreetmap.org/wiki/Tag:highway=primary?uselang=en", link
I18n.locale = "de"
link = wiki_link("key", "highway")
assert_equal "http://wiki.openstreetmap.org/wiki/DE:Key:highway?uselang=de", link
assert_equal "https://wiki.openstreetmap.org/wiki/DE:Key:highway?uselang=de", link
link = wiki_link("tag", "highway=primary")
assert_equal "http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary?uselang=de", link
assert_equal "https://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary?uselang=de", link
I18n.locale = "tr"
link = wiki_link("key", "highway")
assert_equal "http://wiki.openstreetmap.org/wiki/Tr:Key:highway?uselang=tr", link
assert_equal "https://wiki.openstreetmap.org/wiki/Tr:Key:highway?uselang=tr", link
link = wiki_link("tag", "highway=primary")
assert_equal "http://wiki.openstreetmap.org/wiki/Tag:highway=primary?uselang=tr", link
assert_equal "https://wiki.openstreetmap.org/wiki/Tag:highway=primary?uselang=tr", link
end
def test_wikidata_links
@ -268,33 +268,33 @@ class BrowseHelperTest < ActionView::TestCase
assert_nil link
link = wikipedia_link("wikipedia", "Test")
assert_equal "http://en.wikipedia.org/wiki/Test?uselang=en", link[:url]
assert_equal "https://en.wikipedia.org/wiki/Test?uselang=en", link[:url]
assert_equal "Test", link[:title]
link = wikipedia_link("wikipedia", "de:Test")
assert_equal "http://de.wikipedia.org/wiki/de:Test?uselang=en", link[:url]
assert_equal "https://de.wikipedia.org/wiki/de:Test?uselang=en", link[:url]
assert_equal "de:Test", link[:title]
link = wikipedia_link("wikipedia:fr", "de:Test")
assert_equal "http://fr.wikipedia.org/wiki/de:Test?uselang=en", link[:url]
assert_equal "https://fr.wikipedia.org/wiki/de:Test?uselang=en", link[:url]
assert_equal "de:Test", link[:title]
link = wikipedia_link("wikipedia", "de:Englischer Garten (München)#Japanisches Teehaus")
assert_equal "http://de.wikipedia.org/wiki/de:Englischer Garten (München)?uselang=en#Japanisches_Teehaus", link[:url]
assert_equal "https://de.wikipedia.org/wiki/de:Englischer Garten (München)?uselang=en#Japanisches_Teehaus", link[:url]
assert_equal "de:Englischer Garten (München)#Japanisches Teehaus", link[:title]
link = wikipedia_link("wikipedia", "de:Alte Brücke (Heidelberg)#Brückenaffe")
assert_equal "http://de.wikipedia.org/wiki/de:Alte Brücke (Heidelberg)?uselang=en#Br.C3.BCckenaffe", link[:url]
assert_equal "https://de.wikipedia.org/wiki/de:Alte Brücke (Heidelberg)?uselang=en#Br.C3.BCckenaffe", link[:url]
assert_equal "de:Alte Brücke (Heidelberg)#Brückenaffe", link[:title]
link = wikipedia_link("wikipedia", "de:Liste der Baudenkmäler in Eichstätt#Brückenstraße 1, Ehemaliges Bauernhaus")
assert_equal "http://de.wikipedia.org/wiki/de:Liste der Baudenkmäler in Eichstätt?uselang=en#Br.C3.BCckenstra.C3.9Fe_1.2C_Ehemaliges_Bauernhaus", link[:url]
assert_equal "https://de.wikipedia.org/wiki/de:Liste der Baudenkmäler in Eichstätt?uselang=en#Br.C3.BCckenstra.C3.9Fe_1.2C_Ehemaliges_Bauernhaus", link[:url]
assert_equal "de:Liste der Baudenkmäler in Eichstätt#Brückenstraße 1, Ehemaliges Bauernhaus", link[:title]
I18n.locale = "pt-BR"
link = wikipedia_link("wikipedia", "zh-classical:Test#Section")
assert_equal "http://zh-classical.wikipedia.org/wiki/zh-classical:Test?uselang=pt-BR#Section", link[:url]
assert_equal "https://zh-classical.wikipedia.org/wiki/zh-classical:Test?uselang=pt-BR#Section", link[:url]
assert_equal "zh-classical:Test#Section", link[:title]
link = wikipedia_link("foo", "Test")

19
test/http/nominatim.yml
View file

@ -51,3 +51,22 @@
<country_code>gb</country_code>
</addressparts>
</reversegeocode>
/reverse?accept-language=&lat=13.7709&lon=100.50507&zoom=19:
code: 200
body: |
<?xml version="1.0" encoding="UTF-8" ?>
<reversegeocode timestamp='Wed, 29 Nov 17 22:48:30 +0000' attribution='Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright' querystring='accept-language=&amp;lat=13.7709&amp;lon=100.50507&amp;zoom=19'>
<result place_id="220797400" osm_type="way" osm_id="542901374" ref="MM Steak&amp;Grill" lat="13.7708691" lon="100.505073233221" boundingbox="13.7708162,13.7709465,100.5049978,100.5051344">MM Steak&amp;Grill, ถนนศรีอยุธยา, บางขุนพรหม, กรุงเทพมหานคร, เขตดุสิต, กรุงเทพมหานคร, 10300, ประเทศไทย</result>
<addressparts>
<restaurant>MM Steak&amp;Grill</restaurant>
<road>ถนนศรีอยุธยา</road>
<neighbourhood>บางขุนพรหม</neighbourhood>
<city>กรุงเทพมหานคร</city>
<suburb>เขตดุสิต</suburb>
<state>กรุงเทพมหานคร</state>
<postcode>10300</postcode>
<country>ประเทศไทย</country>
<country_code>th</country_code>
</addressparts>
</reversegeocode>