Remove unused gem and add a comment where it was replaced

[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 094a02cd522c5802832ac54e82c7450906c71a3b..d976b9f8c9f0c82ef27010b9608257601ca7257d 100644 (file)
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -13,16 +13,16 @@ 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.t("javascripts.map.base.standard"), {

       attribution: "",
       keyid: "mapnik",
       displayOutsideMaxExtent: true,
       attribution: "",
       keyid: "mapnik",
       displayOutsideMaxExtent: true,


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

-   var cyclemap = new OpenLayers.Layer.OSM.CycleMap(i18n("javascripts.map.base.cycle_map"), {
+   var cyclemap = new OpenLayers.Layer.OSM.CycleMap(I18n.t("javascripts.map.base.cycle_map"), {

       attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
       keyid: "cyclemap",
       displayOutsideMaxExtent: true,
       attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
       keyid: "cyclemap",
       displayOutsideMaxExtent: true,


@@ -40,7 +40,7 @@ function createMap(divName, options) {
    });
    map.addLayer(cyclemap);
 
    });
    map.addLayer(cyclemap);
 

-   var transportmap = new OpenLayers.Layer.OSM.TransportMap(i18n("javascripts.map.base.transport_map"), {
+   var transportmap = new OpenLayers.Layer.OSM.TransportMap(I18n.t("javascripts.map.base.transport_map"), {

       attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
       keyid: "transportmap",
       displayOutsideMaxExtent: true,
       attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
       keyid: "transportmap",
       displayOutsideMaxExtent: true,


@@ -49,7 +49,7 @@ function createMap(divName, options) {
    });
    map.addLayer(transportmap);
 
    });
    map.addLayer(transportmap);
 

-   var mapquest = new OpenLayers.Layer.OSM(i18n("javascripts.map.base.mapquest"), [
+   var mapquest = new OpenLayers.Layer.OSM(I18n.t("javascripts.map.base.mapquest"), [

       "http://otile1.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png",
       "http://otile2.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://otile1.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png",
       "http://otile2.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png",
       "http://otile3.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png",


@@ -76,7 +76,7 @@ function createMap(divName, options) {
 
 function getArrowIcon() {
    var size = new OpenLayers.Size(25, 22);
 
 function getArrowIcon() {
    var size = new OpenLayers.Size(25, 22);

-   var offset = new OpenLayers.Pixel(-30, -27);
+   var offset = new OpenLayers.Pixel(-22, -20);

    var icon = new OpenLayers.Icon("<%= asset_path 'arrow.png' %>", size, offset);
 
    return icon;
    var icon = new OpenLayers.Icon("<%= asset_path 'arrow.png' %>", size, offset);
 
    return icon;