From: John Firebaugh <john.firebaugh@gmail.com>
Date: Mon, 10 Jun 2013 20:55:27 +0000 (-0700)
Subject: Restore attribution on main map
X-Git-Tag: live~4854^2~51
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d1ee7de08b0900713ca2cd6510ee6bd83bf1c240

Restore attribution on main map
---

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index e4dbb84d0..3edfaeeaf 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -12,13 +12,13 @@ $(document).ready(function () {
   var params = OSM.mapParams();
 
   map = L.map("map", {
-    attributionControl: false,
     zoomControl: false,
     layerControl: false
   });
 
-  layers = mapLayers();
+  map.attributionControl.setPrefix('');
 
+  layers = mapLayers();
   layers[0].layer.addTo(map);
 
   $("#map").on("resized", function () {
diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb
index 323d16378..a7e9f6f50 100644
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -17,27 +17,29 @@ var objectLoader;
 
 function mapLayers() {
   return [{
-    layer: new L.OSM.Mapnik(),
+    layer: new L.OSM.Mapnik({
+      attribution: ''
+    }),
     keyid: "mapnik",
     layerCode: "M",
     name: I18n.t("javascripts.map.base.standard")
   }, {
     layer: new L.OSM.CycleMap( {
-        attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
+      attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
     }),
     keyid: "cyclemap",
     layerCode: "C",
     name: I18n.t("javascripts.map.base.cycle_map")
   }, {
     layer: new L.OSM.TransportMap({
-        attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
+      attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
     }),
     keyid: "transportmap",
     layerCode: "T",
     name: I18n.t("javascripts.map.base.transport_map")
   }, {
     layer: new L.OSM.MapQuestOpen({
-        attribution: "Tiles courtesy of <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a> <img src='http://developer.mapquest.com/content/osm/mq_logo.png'>",
+      attribution: "Tiles courtesy of <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a> <img src='http://developer.mapquest.com/content/osm/mq_logo.png'>",
     }),
     keyid: "mapquest",
     layerCode: "Q",