Merge branch 'master' into openstreetbugs

[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..f2397210412e1853071c83f26b82d9a79a0badf3 100644 (file)
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -20,10 +20,12 @@ function createMap(divName, options) {
       units: "m",
       maxResolution: 156543.0339,
       numZoomLevels: 20,
       units: "m",
       maxResolution: 156543.0339,
       numZoomLevels: 20,

-      displayProjection: new OpenLayers.Projection("EPSG:4326")
+      displayProjection: new OpenLayers.Projection("EPSG:4326"),
+      theme: "<%= asset_path 'theme/default/style.css' %>"

    });
 
    });
 

-   var mapnik = new OpenLayers.Layer.OSM.Mapnik(i18n("javascripts.map.base.mapnik"), {
+   var mapnik = new OpenLayers.Layer.OSM.Mapnik(i18n("javascripts.map.base.standard"), {
+      attribution: "",

       keyid: "mapnik",
       displayOutsideMaxExtent: true,
       wrapDateLine: true,
       keyid: "mapnik",
       displayOutsideMaxExtent: true,
       wrapDateLine: true,


@@ -31,15 +33,8 @@ function createMap(divName, options) {
    });
    map.addLayer(mapnik);
 
    });
    map.addLayer(mapnik);
 

-   var osmarender = new OpenLayers.Layer.OSM.Osmarender(i18n("javascripts.map.base.osmarender"), {
-      keyid: "osmarender",
-      displayOutsideMaxExtent: true,
-      wrapDateLine: true,
-      layerCode: "O"
-   });
-   map.addLayer(osmarender);
-

    var cyclemap = new OpenLayers.Layer.OSM.CycleMap(i18n("javascripts.map.base.cycle_map"), {
    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,
       keyid: "cyclemap",
       displayOutsideMaxExtent: true,
       wrapDateLine: true,


@@ -48,6 +43,7 @@ function createMap(divName, options) {
    map.addLayer(cyclemap);
 
    var transportmap = new OpenLayers.Layer.OSM.TransportMap(i18n("javascripts.map.base.transport_map"), {
    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,
       keyid: "transportmap",
       displayOutsideMaxExtent: true,
       wrapDateLine: true,


@@ -61,6 +57,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"
    ], {
       "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,
       keyid: "mapquest",
       displayOutsideMaxExtent: true,
       wrapDateLine: true,


@@ -69,11 +66,9 @@ function createMap(divName, options) {
    });
    map.addLayer(mapquest);
 
    });
    map.addLayer(mapquest);
 

-   var numZoomLevels = Math.max(mapnik.numZoomLevels, osmarender.numZoomLevels);
-

    markers = new OpenLayers.Layer.Markers("Markers", {
       displayInLayerSwitcher: false,
    markers = new OpenLayers.Layer.Markers("Markers", {
       displayInLayerSwitcher: false,

-      numZoomLevels: numZoomLevels,
+      numZoomLevels: 20,

       maxExtent: new OpenLayers.Bounds(-20037508,-20037508,20037508,20037508),
       maxResolution: 156543,
       units: "m",
       maxExtent: new OpenLayers.Bounds(-20037508,-20037508,20037508,20037508),
       maxResolution: 156543,
       units: "m",


@@ -263,7 +258,7 @@ function setMapLayers(layerConfig) {
                } else {
                   map.layers[i].setVisibility(true);
                }
                } else {
                   map.layers[i].setVisibility(true);
                }

-            } else {
+            } else if (!map.layers[i].isBaseLayer) {

                map.layers[i].setVisibility(false);
             }
          }
                map.layers[i].setVisibility(false);
             }
          }