X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/701325e9ef6720a16646c7218010e33b5c58d544..b0453833b1e699a65ba1e9918eb8a5d8e02eb6e0:/app/assets/javascripts/map.js.erb

diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb
index aff258ad2..9c3aa9e36 100644
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -11,14 +11,12 @@ function createMap(divName, options) {
       controls: options.controls || [
          new OpenLayers.Control.ArgParser(),
          new OpenLayers.Control.Attribution(),
-         new OpenLayers.Control.LayerSwitcher(),
+         new SimpleLayerSwitcher(),
          new OpenLayers.Control.Navigation(),
          new OpenLayers.Control.PanZoom(),
          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' %>"
@@ -70,8 +68,6 @@ function createMap(divName, options) {
       displayInLayerSwitcher: false,
       numZoomLevels: 20,
       maxExtent: new OpenLayers.Bounds(-20037508,-20037508,20037508,20037508),
-      maxResolution: 156543,
-      units: "m",
       projection: "EPSG:900913"
    });
    map.addLayer(markers);
@@ -102,8 +98,14 @@ function addMarkerToMap(position, icon, description) {
 }
 
 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,
@@ -141,8 +143,6 @@ function addObjectToMap(url, zoom, callback) {
    });
 
    map.addLayer(layer);
-
-   layer.loadGML();
 }
 
 function addBoxToMap(boxbounds, id, outline) {