Merge 7452:7744 from trunk.

[rails.git] / public / javascripts / map.js

diff --git a/public/javascripts/map.js b/public/javascripts/map.js
index db5b8561638afd45ba4fa403c881b11196ddcf9f..c7f381d846df32e1b68863968d4ea9b3d5c566b3 100644 (file)
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -7,9 +7,10 @@ OpenLayers._getScriptLocation = function () {
    return "/openlayers/";
 }
 
-function createMap(divName) {
+function createMap(divName, options) {
+   if (!options) { options = {} }
    map = new OpenLayers.Map(divName, {
-      controls: [
+      controls: options.controls || [
          new OpenLayers.Control.ArgParser(),
          new OpenLayers.Control.Attribution(),
          new OpenLayers.Control.LayerSwitcher(),
@@ -18,7 +19,7 @@ function createMap(divName) {
          new OpenLayers.Control.ScaleLine()
       ],
       units: "m",
-      maxResolution: 156543,
+      maxResolution: 156543.0339,
       numZoomLevels: 20
    });
 
@@ -39,6 +40,9 @@ function createMap(divName) {
       wrapDateLine: true
    });
    map.addLayer(maplint);
+   var data = new OpenLayers.Layer.Data("Data", {'visibility': false});
+   map.addLayer(data); 
+   map.dataLayer = data;
 
    var numZoomLevels = Math.max(mapnik.numZoomLevels, osmarender.numZoomLevels);
    markers = new OpenLayers.Layer.Markers("Markers", {