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 632f31456493badad09a46c135641e1f2332434e..50b0fe441e8aa0556ed243c1b68fb5ef31cc41c8 100644 (file)
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -4,15 +4,6 @@ var markers;
 var vectors;
 var popup;
 
 var vectors;
 var popup;
 

-var nonamekeys = {
-   'openstreetmap.org': '2f59745a6b525b4ebdb100891d5b6711',
-   'www.openstreetmap.org': 'fd093e52f0965d46bb1c6c6281022199',
-   'openstreetmap.com': '4c60e7f5f31c576a9bb8da71c8d61152',
-   'www.openstreetmap.com': '142f25a0770a51a9a400b3513834a199',
-   'openstreetmap.net': '687c58fd1d715596bfc94abe653d8ac0',
-   'www.openstreetmap.net': '0bd1654141c85d30b9c2ccdb5302f2e4'
-};
-

 function createMap(divName, options) {
    options = options || {};
 
 function createMap(divName, options) {
    options = options || {};
 


@@ -20,19 +11,19 @@ function createMap(divName, options) {
       controls: options.controls || [
          new OpenLayers.Control.ArgParser(),
          new OpenLayers.Control.Attribution(),
       controls: options.controls || [
          new OpenLayers.Control.ArgParser(),
          new OpenLayers.Control.Attribution(),

-         new OpenLayers.Control.LayerSwitcher(),
+         new SimpleLayerSwitcher(),

          new OpenLayers.Control.Navigation(),
          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})
       ],
          new OpenLayers.Control.ScaleLine({geodesic: true})
       ],

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

       numZoomLevels: 20,
       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("javascripts.map.base.standard"), {
+      attribution: "",

       keyid: "mapnik",
       displayOutsideMaxExtent: true,
       wrapDateLine: true,
       keyid: "mapnik",
       displayOutsideMaxExtent: true,
       wrapDateLine: true,


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

-   var osmarender = new OpenLayers.Layer.OSM.Osmarender(i18n("javascripts.map.base.osmarender"), {
-      keyid: "osmarender",
-      displayOutsideMaxExtent: true,
-      wrapDateLine: true,
-      layerCode: "O"
-   });
-   map.addLayer(osmarender);
-

    var cyclemap = new OpenLayers.Layer.OSM.CycleMap(i18n("javascripts.map.base.cycle_map"), {
    var cyclemap = new OpenLayers.Layer.OSM.CycleMap(i18n("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,
       keyid: "cyclemap",
       displayOutsideMaxExtent: true,
       wrapDateLine: true,


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

-   var nonamekey = nonamekeys[document.domain];
-   var noname = new OpenLayers.Layer.OSM(i18n("javascripts.map.base.noname"), [
-      "http://a.tile.cloudmade.com/" + nonamekey + "/3/256/${z}/${x}/${y}.png",
-      "http://b.tile.cloudmade.com/" + nonamekey + "/3/256/${z}/${x}/${y}.png",
-      "http://c.tile.cloudmade.com/" + nonamekey + "/3/256/${z}/${x}/${y}.png"
+   var transportmap = new OpenLayers.Layer.OSM.TransportMap(i18n("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,
+      layerCode: "T"
+   });
+   map.addLayer(transportmap);
+
+   var mapquest = new OpenLayers.Layer.OSM(i18n("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://otile4.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png"

    ], {
    ], {

+      attribution: "Tiles courtesy of <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a> <img src='http://developer.mapquest.com/content/osm/mq_logo.png'>",
+      keyid: "mapquest",

       displayOutsideMaxExtent: true,
       wrapDateLine: true,
       numZoomLevels: 19,
       displayOutsideMaxExtent: true,
       wrapDateLine: true,
       numZoomLevels: 19,

-      layerCode: "N"
+      layerCode: "Q"

    });
    });

-   map.addLayer(noname);
-
-   var numZoomLevels = Math.max(mapnik.numZoomLevels, osmarender.numZoomLevels);
+   map.addLayer(mapquest);

 
    markers = new OpenLayers.Layer.Markers("Markers", {
       displayInLayerSwitcher: false,
 
    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);
       projection: "EPSG:900913"
    });
    map.addLayer(markers);


@@ -86,27 +76,35 @@ 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;
 }
 
 function addMarkerToMap(position, icon, description) {
    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) {
 
    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) {
    }
 
    return marker;
 }
 
 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,


@@ -144,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) {


@@ -160,9 +156,9 @@ function addBoxToMap(boxbounds, id, outline) {
    if (outline) {
      vertices = boxbounds.toGeometry().getVertices();
      vertices.push(new OpenLayers.Geometry.Point(vertices[0].x, vertices[0].y));
    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 {
    } else {

-     geometry = boxbounds.toGeometry().transform(epsg4326, map.getProjectionObject());
+     geometry = proj(boxbounds.toGeometry());

    }
    var box = new OpenLayers.Feature.Vector(geometry, {}, {
       strokeWidth: 2,
    }
    var box = new OpenLayers.Feature.Vector(geometry, {}, {
       strokeWidth: 2,


@@ -202,27 +198,19 @@ function removeBoxFromMap(box){
    vectors.removeFeature(box);
 }
 
    vectors.removeFeature(box);
 }
 

-function getMapCenter() {
-   return map.getCenter().clone().transform(map.getProjectionObject(), epsg4326);
+function proj(x) {
+    return x.clone().transform(epsg4326, map.getProjectionObject());
+}
+
+function unproj(x) {
+    return x.clone().transform(map.getProjectionObject(), epsg4326);

 }
 
 function setMapCenter(center, zoom) {
 }
 
 function setMapCenter(center, zoom) {

-   zoom = parseInt(zoom);
+   zoom = parseInt(zoom, 10);

    var numzoom = map.getNumZoomLevels();
    if (zoom >= numzoom) zoom = numzoom - 1;
    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) {
 }
 
 function getEventPosition(event) {


@@ -263,14 +251,10 @@ function setMapLayers(layerConfig) {
                } else {
                   map.layers[i].setVisibility(true);
                }
                } else {
                   map.layers[i].setVisibility(true);
                }

-            } else {
+            } else if (!map.layers[i].isBaseLayer) {

                map.layers[i].setVisibility(false);
             }
          }
       }
    }
 }
                map.layers[i].setVisibility(false);
             }
          }
       }
    }
 }

-
-function scaleToZoom(scale) {
-   return Math.log(360.0/(scale * 512.0)) / Math.log(2.0);
-}