Serve OpenLayers through the asset pipeline

[rails.git] / app / assets / javascripts / map.js.erb

diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb
index 0dfb7e31f127dde1b80ddcb4c912fd9b07c0634a..e2f06babb695b40cb3e757562624dfaa514de3ef 100644 (file)
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -24,6 +24,7 @@ function createMap(divName, options) {
    });
 
    var mapnik = new OpenLayers.Layer.OSM.Mapnik(i18n("javascripts.map.base.mapnik"), {
+      attribution: "",
       keyid: "mapnik",
       displayOutsideMaxExtent: true,
       wrapDateLine: true,
@@ -32,6 +33,7 @@ function createMap(divName, options) {
    map.addLayer(mapnik);
 
    var osmarender = new OpenLayers.Layer.OSM.Osmarender(i18n("javascripts.map.base.osmarender"), {
+      attribution: "",
       keyid: "osmarender",
       displayOutsideMaxExtent: true,
       wrapDateLine: true,
@@ -40,6 +42,7 @@ function createMap(divName, options) {
    map.addLayer(osmarender);
 
    var cyclemap = new OpenLayers.Layer.OSM.CycleMap(i18n("javascripts.map.base.cycle_map"), {
+      attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
       keyid: "cyclemap",
       displayOutsideMaxExtent: true,
       wrapDateLine: true,
@@ -48,6 +51,7 @@ function createMap(divName, options) {
    map.addLayer(cyclemap);
 
    var transportmap = new OpenLayers.Layer.OSM.TransportMap(i18n("javascripts.map.base.transport_map"), {
+      attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
       keyid: "transportmap",
       displayOutsideMaxExtent: true,
       wrapDateLine: true,
@@ -61,6 +65,7 @@ function createMap(divName, options) {
       "http://otile3.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png",
       "http://otile4.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.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",
       displayOutsideMaxExtent: true,
       wrapDateLine: true,
@@ -263,7 +268,7 @@ function setMapLayers(layerConfig) {
                } else {
                   map.layers[i].setVisibility(true);
                }
-            } else {
+            } else if (!map.layers[i].isBaseLayer) {
                map.layers[i].setVisibility(false);
             }
          }