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

Added support for 2 more secondary wikidata tag links

Browse source 
Listed on in https://wiki.openstreetmap.org/wiki/Key:wikidata :
* name:etymology:wikidata
* network:wikidata
This commit is contained in:
Štefan Baebler 2018-03-05 00:01:19 +01:00 • committed by Tom Hughes
parent e019a1f031
commit 36a382bb43
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/browse_helper.rb
View file

@ -167,7 +167,7 @@ module BrowseHelper
:title => value :title => value
}] }]
# Key has to be one of the accepted wikidata-tags # Key has to be one of the accepted wikidata-tags
elsif key =~ /(architect|artist|brand|operator|subject):wikidata/ && elsif key =~ /(architect|artist|brand|name:etymology|network|operator|subject):wikidata/ &&
# Value has to be a semicolon-separated list of wikidata-IDs (whitespaces allowed before and after semicolons) # Value has to be a semicolon-separated list of wikidata-IDs (whitespaces allowed before and after semicolons)
value =~ /^[Qq][1-9][0-9]*(\s*;\s*[Qq][1-9][0-9]*)*$/ value =~ /^[Qq][1-9][0-9]*(\s*;\s*[Qq][1-9][0-9]*)*$/
# Splitting at every semicolon to get a separate hash for each wikidata-ID # Splitting at every semicolon to get a separate hash for each wikidata-ID

3
test/helpers/browse_helper_test.rb
View file

@ -131,6 +131,9 @@ class BrowseHelperTest < ActionView::TestCase
html = format_value("operator:wikidata", "Q12;Q98") html = format_value("operator:wikidata", "Q12;Q98")
assert_dom_equal "<a title=\"The Q12 item on Wikidata\" href=\"//www.wikidata.org/wiki/Q12?uselang=en\">Q12</a>;<a title=\"The Q98 item on Wikidata\" href=\"//www.wikidata.org/wiki/Q98?uselang=en\">Q98</a>", html assert_dom_equal "<a title=\"The Q12 item on Wikidata\" href=\"//www.wikidata.org/wiki/Q12?uselang=en\">Q12</a>;<a title=\"The Q98 item on Wikidata\" href=\"//www.wikidata.org/wiki/Q98?uselang=en\">Q98</a>", html
html = format_value("name:etymology:wikidata", "Q123")
assert_dom_equal "<a title=\"The Q123 item on Wikidata\" href=\"//www.wikidata.org/wiki/Q123?uselang=en\">Q123</a>", html
end end
def test_icon_tags def test_icon_tags