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 2749f0ab1325148a979af4a1f82f68a344c890db..50b0fe441e8aa0556ed243c1b68fb5ef31cc41c8 100644 (file)
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -13,13 +13,13 @@ function createMap(divName, options) {
          new OpenLayers.Control.Attribution(),
          new SimpleLayerSwitcher(),
          new OpenLayers.Control.Navigation(),
          new OpenLayers.Control.Attribution(),
          new SimpleLayerSwitcher(),
          new OpenLayers.Control.Navigation(),

-         new OpenLayers.Control.PanZoom(),
-         new OpenLayers.Control.PanZoomBar(),
+         new OpenLayers.Control.Zoom(),
+         new OpenLayers.Control.SimplePanZoom(),

          new OpenLayers.Control.ScaleLine({geodesic: true})
       ],
       numZoomLevels: 20,
       displayProjection: new OpenLayers.Projection("EPSG:4326"),
          new OpenLayers.Control.ScaleLine({geodesic: true})
       ],
       numZoomLevels: 20,
       displayProjection: new OpenLayers.Projection("EPSG:4326"),

-      theme: "<%= asset_path 'theme/default/style.css' %>"
+      theme: "<%= asset_path 'theme/openstreetmap/style.css' %>"

    });
 
    var mapnik = new OpenLayers.Layer.OSM.Mapnik(i18n("javascripts.map.base.standard"), {
    });
 
    var mapnik = new OpenLayers.Layer.OSM.Mapnik(i18n("javascripts.map.base.standard"), {