api06: Fix normal way and relation uploading (i.e. not as part of a diff).

[rails.git] / public / javascripts / map.js

diff --git a/public/javascripts/map.js b/public/javascripts/map.js
index 0c13b016e93c0422a421e69634bb44b0444a7e43..db5b8561638afd45ba4fa403c881b11196ddcf9f 100644 (file)
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -1,3 +1,4 @@
+var epsg4326 = new OpenLayers.Projection("EPSG:4326");

 var map;
 var markers;
 var popup;
 var map;
 var markers;
 var popup;


@@ -5,32 +6,51 @@ var popup;
 OpenLayers._getScriptLocation = function () {
    return "/openlayers/";
 }
 OpenLayers._getScriptLocation = function () {
    return "/openlayers/";
 }

-   
+

 function createMap(divName) {
 function createMap(divName) {

-   map = new OpenLayers.Map(divName);
+   map = new OpenLayers.Map(divName, {
+      controls: [
+         new OpenLayers.Control.ArgParser(),
+         new OpenLayers.Control.Attribution(),
+         new OpenLayers.Control.LayerSwitcher(),
+         new OpenLayers.Control.Navigation(),
+         new OpenLayers.Control.PanZoomBar(),
+         new OpenLayers.Control.ScaleLine()
+      ],
+      units: "m",
+      maxResolution: 156543,
+      numZoomLevels: 20
+   });

 
 

-   var mapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik", { displayOutsideMaxExtent: true });
+   var mapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik", {
+      displayOutsideMaxExtent: true,
+      wrapDateLine: true
+   });

    map.addLayer(mapnik);
 
    map.addLayer(mapnik);
 

-   var osmarender = new OpenLayers.Layer.OSM.Osmarender("Osmarender", { displayOutsideMaxExtent: true });
+   var osmarender = new OpenLayers.Layer.OSM.Osmarender("Osmarender", {
+      displayOutsideMaxExtent: true,
+      wrapDateLine: true
+   });

    map.addLayer(osmarender);
 
    map.addLayer(osmarender);
 

-   var maplint = new OpenLayers.Layer.OSM.Maplint("Maplint", { displayOutsideMaxExtent: true });
+   var maplint = new OpenLayers.Layer.OSM.Maplint("Maplint", {
+      displayOutsideMaxExtent: true,
+      wrapDateLine: true
+   });

    map.addLayer(maplint);
 
    var numZoomLevels = Math.max(mapnik.numZoomLevels, osmarender.numZoomLevels);
    map.addLayer(maplint);
 
    var numZoomLevels = Math.max(mapnik.numZoomLevels, osmarender.numZoomLevels);

-   markers = new OpenLayers.Layer.Markers("Markers", { 
-      displayInLayerSwitcher: false, numZoomLevels: numZoomLevels,
+   markers = new OpenLayers.Layer.Markers("Markers", {
+      displayInLayerSwitcher: false,
+      numZoomLevels: numZoomLevels,

       maxExtent: new OpenLayers.Bounds(-20037508,-20037508,20037508,20037508),
       maxResolution: 156543,
       units: "m",
       maxExtent: new OpenLayers.Bounds(-20037508,-20037508,20037508,20037508),
       maxResolution: 156543,
       units: "m",

-      projection: "EPSG:41001"
+      projection: "EPSG:900913"

    });
    map.addLayer(markers);
 
    });
    map.addLayer(markers);
 

-   map.addControl(new OpenLayers.Control.LayerSwitcher());
-   map.addControl(new OpenLayers.Control.KeyboardDefaults());
-

    return map;
 }
 
    return map;
 }
 


@@ -43,7 +63,7 @@ function getArrowIcon() {
 }
 
 function addMarkerToMap(position, icon, description) {
 }
 
 function addMarkerToMap(position, icon, description) {

-   var marker = new OpenLayers.Marker(position, icon);
+   var marker = new OpenLayers.Marker(position.clone().transform(epsg4326, map.getProjectionObject()), icon);

 
    markers.addMarker(marker);
 
 
    markers.addMarker(marker);
 


@@ -57,11 +77,10 @@ function addMarkerToMap(position, icon, description) {
 function openMapPopup(marker, description) {
    closeMapPopup();
 
 function openMapPopup(marker, description) {
    closeMapPopup();
 

-   popup = new OpenLayers.Popup.AnchoredBubble("popup", marker.lonlat,
-                                               sizeMapPopup(description),
-                                               "<p style='padding-right: 28px'>" + description + "</p>",
-                                               marker.icon, true);
+   popup = new OpenLayers.Popup.AnchoredBubble("popup", marker.lonlat, null,
+                                               description, marker.icon, true);

    popup.setBackgroundColor("#E3FFC5");
    popup.setBackgroundColor("#E3FFC5");

+   popup.autoSize = true;

    map.addPopup(popup);
 
    return popup;
    map.addPopup(popup);
 
    return popup;


@@ -74,29 +93,28 @@ function closeMapPopup() {
    }
 }
 
    }
 }
 

-function sizeMapPopup(text) {
-   var box = document.createElement("div");
-
-   box.innerHTML = text;
-   box.style.visibility = "hidden";
-   box.style.position = "absolute";
-   box.style.top = "0px";
-   box.style.left = "0px";
-   box.style.width = "200px";
-   box.style.height = "auto";
+function removeMarkerFromMap(marker){
+   markers.removeMarker(marker);
+}

 
 

-   document.body.appendChild(box);
+function getMapCenter(center, zoom) {
+   return map.getCenter().clone().transform(map.getProjectionObject(), epsg4326);
+}

 
 

-   var width = box.offsetWidth;
-   var height = box.offsetHeight;
+function setMapCenter(center, zoom) {
+   map.setCenter(center.clone().transform(epsg4326, map.getProjectionObject()), zoom);
+}

 
 

-   document.body.removeChild(box);
+function setMapExtent(extent) {
+   map.zoomToExtent(extent.clone().transform(epsg4326, map.getProjectionObject()));
+}

 
 

-   return new OpenLayers.Size(width + 30, height + 24);
+function getMapExtent(extent) {
+   return map.getExtent().clone().transform(map.getProjectionObject(), epsg4326);

 }
 
 }
 

-function removeMarkerFromMap(marker){
-   markers.removeMarker(marker);
+function getEventPosition(event) {
+   return map.getLonLatFromViewPortPx(event.xy).clone().transform(map.getProjectionObject(), epsg4326);

 }
 
 function getMapLayers() {
 }
 
 function getMapLayers() {


@@ -118,84 +136,19 @@ function getMapLayers() {
 function setMapLayers(layers) {
    for (var i=0; i < layers.length; i++) {
       var layer = map.layers[i];
 function setMapLayers(layers) {
    for (var i=0; i < layers.length; i++) {
       var layer = map.layers[i];

-      var c = layers.charAt(i);

 
 

-      if (c == "B") {
-         map.setBaseLayer(layer);
-      } else if ( (c == "T") || (c == "F") ) {
-         layer.setVisibility(c == "T");
+      if (layer) {
+         var c = layers.charAt(i);
+
+         if (c == "B") {
+            map.setBaseLayer(layer);
+         } else if ( (c == "T") || (c == "F") ) {
+            layer.setVisibility(c == "T");
+         }

       }
    }
 }
 
       }
    }
 }
 

-function mercatorToLonLat(merc) {
-   var lon = (merc.lon / 20037508.34) * 180;
-   var lat = (merc.lat / 20037508.34) * 180;
-
-   lat = 180/Math.PI * (2 * Math.atan(Math.exp(lat * Math.PI / 180)) - Math.PI / 2);
-
-   return new OpenLayers.LonLat(lon, lat);
-}
-
-function lonLatToMercator(ll) {
-   var lon = ll.lon * 20037508.34 / 180;
-   var lat = Math.log(Math.tan((90 + ll.lat) * Math.PI / 360)) / (Math.PI / 180);
-
-   lat = lat * 20037508.34 / 180;
-
-   return new OpenLayers.LonLat(lon, lat);
-}
-
-// for interacting with the PostGIS database which uses non spherical
-// Mercator. Taken from Freemap which in turn was taken from a standard
-// algorithm off the net.
-
-function lonLatToNonSphericalMercator(ll) {
-    var custLat  = ll.lat * (Math.PI/180);
-    var a = 6378137;
-    var b = 6356752.3142;
-    var f = (a-b)/a;
-    var e = Math.sqrt(2*f-Math.pow(f,2));
-    custLat=a*Math.log(Math.tan(Math.PI/4+custLat/2)*
-        Math.pow(( (1-e*Math.sin(custLat)) / (1+e*Math.sin(custLat))),e/2));
-    custLon = ll.lon * (Math.PI/180) * 6378137;
-    return new OpenLayers.LonLat (custLon,custLat);
-}
-
-function nonSphericalMercatorToLonLat(merc) {
-    var lon_deg, lat_deg;
-    var a = 6378137.0;
-    var b = 6356752.3142;
-    var k0 = 1.0;
-    var t = 1.0 - b/a;
-    var es = 2*t - t*t;
-    var e = Math.sqrt(es);
-    lon_deg = merc.lon;
-    lat_deg = merc.lat;
-    lon_deg /= a;
-    lat_deg /= a;
-    lon_deg /= k0;
-    lat_deg = phi2(Math.exp(-lat_deg/k0), e);
-    lon_deg *= (180/M_PI);
-    lat_deg *= (180/M_PI);
-    return new OpenLayers.LonLat(lon_deg,lat_deg);
-}
-
-function phi2 (ts,e) {
-    var eccnth = 0.5*e;
-    var Phi = (PI/2) - 2.0*Math.atan(ts);
-    var dphi;
-    var i=15;
-    do {
-        var con = e*Math.sin(Phi);
-        dphi = (PI/2) - 2.0*Math.atan(ts*Math.pow((1.0-con)/(1.0+con),eccnth))
-            - Phi;
-        Phi += dphi;
-    }
-    while(Math.abs(dphi) > 0.0000000001 && --i);
-    return Phi;
-}
-

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