Remove obsolete maxExtent from marker layer

[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 d05d00993066d621311c7df93a1757c7bd398d43..094a02cd522c5802832ac54e82c7450906c71a3b 100644 (file)
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -17,8 +17,6 @@ function createMap(divName, options) {
          new OpenLayers.Control.PanZoomBar(),
          new OpenLayers.Control.ScaleLine({geodesic: true})
       ],
          new OpenLayers.Control.PanZoomBar(),
          new OpenLayers.Control.ScaleLine({geodesic: true})
       ],

-      units: "m",
-      maxResolution: 156543.0339,

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


@@ -69,9 +67,6 @@ function createMap(divName, options) {
    markers = new OpenLayers.Layer.Markers("Markers", {
       displayInLayerSwitcher: false,
       numZoomLevels: 20,
    markers = new OpenLayers.Layer.Markers("Markers", {
       displayInLayerSwitcher: false,
       numZoomLevels: 20,

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

       projection: "EPSG:900913"
    });
    map.addLayer(markers);
       projection: "EPSG:900913"
    });
    map.addLayer(markers);


@@ -102,8 +97,14 @@ function addMarkerToMap(position, icon, description) {
 }
 
 function addObjectToMap(url, zoom, callback) {
 }
 
 function addObjectToMap(url, zoom, callback) {

-   var layer = new OpenLayers.Layer.GML("Objects", url, {
-      format: OpenLayers.Format.OSM,
+   var layer = new OpenLayers.Layer.Vector("Objects", {
+      strategies: [ 
+          new OpenLayers.Strategy.Fixed()
+      ],
+      protocol: new OpenLayers.Protocol.HTTP({
+          url: url,
+          format: new OpenLayers.Format.OSM()
+      }),

       style: {
           strokeColor: "blue",
           strokeWidth: 3,
       style: {
           strokeColor: "blue",
           strokeWidth: 3,


@@ -141,8 +142,6 @@ function addObjectToMap(url, zoom, callback) {
    });
 
    map.addLayer(layer);
    });
 
    map.addLayer(layer);

-
-   layer.loadGML();

 }
 
 function addBoxToMap(boxbounds, id, outline) {
 }
 
 function addBoxToMap(boxbounds, id, outline) {