X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2aae01a59096f5ed98ba05c65ac883cc604565fe..7d60707647535b17faef62c0ec31742f9686b016:/app/helpers/browse_helper.rb

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index e929d9755..a41b39a3d 100644
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -45,7 +45,7 @@ module BrowseHelper
 private
 
   ICON_TAGS = [ 
-    "aeroway", "amenity", "barrier", "building", "highway", "landuse",
+    "aeroway", "amenity", "barrier", "building", "highway", "historic", "landuse",
     "leisure", "man_made", "natural", "railway", "shop", "tourism", "waterway"
   ]
 
@@ -56,9 +56,15 @@ private
   def wiki_link(type, lookup)
     locale = I18n.locale.to_s
 
-    if page = WIKI_PAGES[locale][type][lookup] rescue nil
+    # update-wiki-pages does s/ /_/g on keys before saving them, we
+    # have to replace spaces with underscore so we'll link
+    # e.g. `source=Isle of Man Government aerial imagery (2001)' to
+    # the correct page.
+    lookup_us = lookup.tr(" ", "_")
+
+    if page = WIKI_PAGES[locale][type][lookup_us] rescue nil
       url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
-    elsif page = WIKI_PAGES["en"][type][lookup] rescue nil
+    elsif page = WIKI_PAGES["en"][type][lookup_us] rescue nil
       url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
     end