X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9c10e6703e6945c4737c6b7682c6f1d606453294..3fb931f9a86955faa39bec1fa4f2a731cbc74780:/app/assets/javascripts/map.js.erb?ds=sidebyside

diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb
index b45e6b7b5..4c1a849dc 100644
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -11,19 +11,18 @@ 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.Zoom(),
+         new OpenLayers.Control.SimplePanZoom(),
          new OpenLayers.Control.ScaleLine({geodesic: true})
       ],
-      units: "m",
-      maxResolution: 156543.0339,
       numZoomLevels: 20,
-      displayProjection: new OpenLayers.Projection("EPSG:4326")
+      displayProjection: new OpenLayers.Projection("EPSG:4326"),
+      theme: "<%= asset_path 'theme/openstreetmap/style.css' %>"
    });
 
-   var mapnik = new OpenLayers.Layer.OSM.Mapnik(i18n("javascripts.map.base.mapnik"), {
+   var mapnik = new OpenLayers.Layer.OSM.Mapnik(I18n.t("javascripts.map.base.standard"), {
       attribution: "",
       keyid: "mapnik",
       displayOutsideMaxExtent: true,
@@ -32,17 +31,8 @@ function createMap(divName, options) {
    });
    map.addLayer(mapnik);
 
-   var osmarender = new OpenLayers.Layer.OSM.Osmarender(i18n("javascripts.map.base.osmarender"), {
-      attribution: "",
-      keyid: "osmarender",
-      displayOutsideMaxExtent: true,
-      wrapDateLine: true,
-      layerCode: "O"
-   });
-   map.addLayer(osmarender);
-
-   var cyclemap = new OpenLayers.Layer.OSM.CycleMap(i18n("javascripts.map.base.cycle_map"), {
-      attribution: "",
+   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,
       wrapDateLine: true,
@@ -50,8 +40,8 @@ function createMap(divName, options) {
    });
    map.addLayer(cyclemap);
 
-   var transportmap = new OpenLayers.Layer.OSM.TransportMap(i18n("javascripts.map.base.transport_map"), {
-      attribution: "",
+   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,
       wrapDateLine: true,
@@ -59,7 +49,7 @@ function createMap(divName, options) {
    });
    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",
@@ -74,44 +64,59 @@ function createMap(divName, options) {
    });
    map.addLayer(mapquest);
 
-   var numZoomLevels = Math.max(mapnik.numZoomLevels, osmarender.numZoomLevels);
-
    markers = new OpenLayers.Layer.Markers("Markers", {
       displayInLayerSwitcher: false,
-      numZoomLevels: numZoomLevels,
-      maxExtent: new OpenLayers.Bounds(-20037508,-20037508,20037508,20037508),
-      maxResolution: 156543,
-      units: "m",
+      numZoomLevels: 20,
       projection: "EPSG:900913"
    });
    map.addLayer(markers);
 
+   map.dataLayer = new OpenLayers.Layer(I18n.t('browse.start_rjs.data_layer_name'), {
+     visibility: false,
+     displayInLayerSwitcher: false
+   });
+   map.addLayer(map.dataLayer);
+
+   $("#" + divName).on("resized", function () {
+     map.updateSize();
+   });
+
+   $("#" + divName).trigger("initialised");
+
    return map;
 }
 
 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;
 }
 
 function addMarkerToMap(position, icon, description) {
-   var marker = new OpenLayers.Marker(position.clone().transform(epsg4326, map.getProjectionObject()), icon);
+   var marker = new OpenLayers.Marker(proj(position), icon);
 
    markers.addMarker(marker);
 
    if (description) {
-      marker.events.register("mouseover", marker, function() { openMapPopup(marker, description) });
+       marker.events.register("mouseover", marker, function() {
+           openMapPopup(marker, description);
+       });
    }
 
    return marker;
 }
 
-function addObjectToMap(url, zoom, callback) {
-   var layer = new OpenLayers.Layer.GML("Objects", url, {
-      format: OpenLayers.Format.OSM,
+function addObjectToMap(object, zoom, callback) {
+   var layer = new OpenLayers.Layer.Vector("Objects", {
+      strategies: [ 
+          new OpenLayers.Strategy.Fixed()
+      ],
+      protocol: new OpenLayers.Protocol.HTTP({
+          url: OSM.apiUrl(object),
+          format: new OpenLayers.Format.OSM()
+      }),
       style: {
           strokeColor: "blue",
           strokeWidth: 3,
@@ -149,8 +154,6 @@ function addObjectToMap(url, zoom, callback) {
    });
 
    map.addLayer(layer);
-
-   layer.loadGML();
 }
 
 function addBoxToMap(boxbounds, id, outline) {
@@ -165,9 +168,9 @@ function addBoxToMap(boxbounds, id, outline) {
    if (outline) {
      vertices = boxbounds.toGeometry().getVertices();
      vertices.push(new OpenLayers.Geometry.Point(vertices[0].x, vertices[0].y));
-     geometry = new OpenLayers.Geometry.LineString(vertices).transform(epsg4326, map.getProjectionObject());
+     geometry = proj(new OpenLayers.Geometry.LineString(vertices));
    } else {
-     geometry = boxbounds.toGeometry().transform(epsg4326, map.getProjectionObject());
+     geometry = proj(boxbounds.toGeometry());
    }
    var box = new OpenLayers.Feature.Vector(geometry, {}, {
       strokeWidth: 2,
@@ -195,7 +198,6 @@ function openMapPopup(marker, description) {
 function closeMapPopup() {
    if (popup) {
       map.removePopup(popup);
-      delete popup;
    }
 }
 
@@ -203,35 +205,23 @@ function removeMarkerFromMap(marker){
    markers.removeMarker(marker);
 }
 
-function removeBoxFromMap(box){
-   vectors.removeFeature(box);
+function proj(x) {
+    return x.clone().transform(epsg4326, map.getProjectionObject());
 }
 
-function getMapCenter() {
-   return map.getCenter().clone().transform(map.getProjectionObject(), epsg4326);
+function unproj(x) {
+    return x.clone().transform(map.getProjectionObject(), epsg4326);
 }
 
 function setMapCenter(center, zoom) {
-   zoom = parseInt(zoom);
+   zoom = parseInt(zoom, 10);
    var numzoom = map.getNumZoomLevels();
    if (zoom >= numzoom) zoom = numzoom - 1;
-   map.setCenter(center.clone().transform(epsg4326, map.getProjectionObject()), zoom);
-}
-
-function setMapExtent(extent) {
-   map.zoomToExtent(extent.clone().transform(epsg4326, map.getProjectionObject()));
-}
-
-function getMapExtent() {
-   return map.getExtent().clone().transform(map.getProjectionObject(), epsg4326);
-}
-
-function getMapZoom() {
-   return map.getZoom();
+   map.setCenter(proj(center), zoom);
 }
 
 function getEventPosition(event) {
-   return map.getLonLatFromViewPortPx(event.xy).clone().transform(map.getProjectionObject(), epsg4326);
+   return unproj(map.getLonLatFromViewPortPx(event.xy));
 }
 
 function getMapLayers() {
@@ -268,14 +258,10 @@ function setMapLayers(layerConfig) {
                } else {
                   map.layers[i].setVisibility(true);
                }
-            } else {
+            } else if (!map.layers[i].isBaseLayer) {
                map.layers[i].setVisibility(false);
             }
          }
       }
    }
 }
-
-function scaleToZoom(scale) {
-   return Math.log(360.0/(scale * 512.0)) / Math.log(2.0);
-}