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 781ea5551de36d67030e872cc07ae3a1dac7f05f..db5b8561638afd45ba4fa403c881b11196ddcf9f 100644 (file)
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -1,61 +1,71 @@
+var epsg4326 = new OpenLayers.Projection("EPSG:4326");

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

-function createMap(divName) {
-   OpenLayers.Util.onImageLoadError = function() {
-      this.src = OpenLayers.Util.getImagesLocation() + "404.png";
-   }
-
-   map = new OpenLayers.Map(divName,
-                            { maxExtent: new OpenLayers.Bounds(-20037508,-20037508,20037508,20037508),
-                              numZoomLevels: 19,
-                              maxResolution: 156543,
-                              units: 'm',
-                              projection: "EPSG:41001" });
+OpenLayers._getScriptLocation = function () {
+   return "/openlayers/";
+}

 
 

-   var mapnik = new OpenLayers.Layer.TMS("Mapnik",
-                                         "http://tile.openstreetmap.org/",
-                                         { type: 'png', getURL: getTileURL, displayOutsideMaxExtent: true });
+function createMap(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,
+      wrapDateLine: true
+   });

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

-   var osmarender = new OpenLayers.Layer.TMS("Osmarender",
-                                             "http://dev.openstreetmap.org/~ojw/Tiles/tile.php/",
-                                             { type: 'png', getURL: getTileURL, displayOutsideMaxExtent: true });
+   var osmarender = new OpenLayers.Layer.OSM.Osmarender("Osmarender", {
+      displayOutsideMaxExtent: true,
+      wrapDateLine: true
+   });

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

-   markers = new OpenLayers.Layer.Markers("markers", { visibility: false });
+   var maplint = new OpenLayers.Layer.OSM.Maplint("Maplint", {
+      displayOutsideMaxExtent: true,
+      wrapDateLine: true
+   });
+   map.addLayer(maplint);
+
+   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",
+      projection: "EPSG:900913"
+   });

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

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

    return map;
 }
 
    return map;
 }
 

-function getTileURL(bounds) {
-   var res = this.map.getResolution();
-   var x = Math.round((bounds.left - this.maxExtent.left) / (res * this.tileSize.w));
-   var y = Math.round((this.maxExtent.top - bounds.top) / (res * this.tileSize.h));
-   var z = this.map.getZoom();
-   var limit = Math.pow(2, z);
-
-   if (y < 0 || y >= limit)
-   {
-     return null;
-   }
-   else
-   {
-     x = ((x % limit) + limit) % limit;
+function getArrowIcon() {
+   var size = new OpenLayers.Size(25, 22);
+   var offset = new OpenLayers.Pixel(-30, -27);
+   var icon = new OpenLayers.Icon("/images/arrow.png", size, offset);

 
 

-     return this.url + z + "/" + x + "/" + y + "." + this.type;
-   }
+   return icon;

 }
 
 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);

-   markers.setVisibility(true);

 
    if (description) {
       marker.events.register("click", marker, function() { openMapPopup(marker, description) });
 
    if (description) {
       marker.events.register("click", marker, function() { openMapPopup(marker, description) });


@@ -65,19 +75,12 @@ function addMarkerToMap(position, icon, description) {
 }
 
 function openMapPopup(marker, description) {
 }
 
 function openMapPopup(marker, description) {

-//   var box = document.createElement("div");
-//   box.innerHTML = description;
-//   box.style.display = 'none';
-//   box.style.width = "200px";
-//   document.body.appendChild(box);
-

    closeMapPopup();
 
    closeMapPopup();
 

-   popup = new OpenLayers.Popup.AnchoredBubble("popup", marker.lonlat,
-                                               new OpenLayers.Size(200, 50),
-                                               "<p>" + 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;


@@ -94,6 +97,26 @@ function removeMarkerFromMap(marker){
    markers.removeMarker(marker);
 }
 
    markers.removeMarker(marker);
 }
 

+function getMapCenter(center, zoom) {
+   return map.getCenter().clone().transform(map.getProjectionObject(), epsg4326);
+}
+
+function setMapCenter(center, zoom) {
+   map.setCenter(center.clone().transform(epsg4326, map.getProjectionObject()), zoom);
+}
+
+function setMapExtent(extent) {
+   map.zoomToExtent(extent.clone().transform(epsg4326, map.getProjectionObject()));
+}
+
+function getMapExtent(extent) {
+   return map.getExtent().clone().transform(map.getProjectionObject(), epsg4326);
+}
+
+function getEventPosition(event) {
+   return map.getLonLatFromViewPortPx(event.xy).clone().transform(map.getProjectionObject(), epsg4326);
+}
+

 function getMapLayers() {
    var layers = "";
 
 function getMapLayers() {
    var layers = "";
 


@@ -113,34 +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);
-}
-

 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);
 }