Work round ruby's half assed Tempfile class which, because for some

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

diff --git a/public/javascripts/map.js b/public/javascripts/map.js
index 71f5b8ff8be18845881b77dab4db62fc4c53e2ae..369df89876e1f7d1b0084467adcc997bbcc4c176 100644 (file)
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -2,59 +2,52 @@ var map;
 var markers;
 var popup;
 
 var markers;
 var popup;
 

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

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

-   map.addControl(new OpenLayers.Control.LayerSwitcher());
-   map.setCenter(centre, zoom);
+   var maplint = new OpenLayers.Layer.OSM.Maplint("Maplint", { displayOutsideMaxExtent: 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:41001"
+   });
+   map.addLayer(markers);

 
    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) {

-   if (markers == null) {
-      markers = new OpenLayers.Layer.Markers("markers");
-      map.addLayer(markers);
-   }
-

    var marker = new OpenLayers.Marker(position, icon);
 
    markers.addMarker(marker);
    var marker = new OpenLayers.Marker(position, icon);
 
    markers.addMarker(marker);


@@ -67,17 +60,11 @@ 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();
 
    popup = new OpenLayers.Popup.AnchoredBubble("popup", marker.lonlat,
    closeMapPopup();
 
    popup = new OpenLayers.Popup.AnchoredBubble("popup", marker.lonlat,

-                                               new OpenLayers.Size(200, 50),
-                                               "<p>" + description + "</p>",
+                                               sizeMapPopup(description),
+                                               "<p style='padding-right: 28px'>" + description + "</p>",

                                                marker.icon, true);
    popup.setBackgroundColor("#E3FFC5");
    map.addPopup(popup);
                                                marker.icon, true);
    popup.setBackgroundColor("#E3FFC5");
    map.addPopup(popup);


@@ -92,10 +79,60 @@ 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";
+
+   document.body.appendChild(box);
+
+   var width = box.offsetWidth;
+   var height = box.offsetHeight;
+
+   document.body.removeChild(box);
+
+   return new OpenLayers.Size(width + 30, height + 24);
+}
+

 function removeMarkerFromMap(marker){
    markers.removeMarker(marker);
 }
 
 function removeMarkerFromMap(marker){
    markers.removeMarker(marker);
 }
 

+function getMapLayers() {
+   var layers = "";
+
+   for (var i=0; i< this.map.layers.length; i++) {
+      var layer = this.map.layers[i];
+
+      if (layer.isBaseLayer) {
+         layers += (layer == this.map.baseLayer) ? "B" : "0";
+      } else {
+         layers += (layer.getVisibility()) ? "T" : "F";
+      }
+   }
+
+   return layers;
+}
+
+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");
+      }
+   }
+}
+

 function mercatorToLonLat(merc) {
    var lon = (merc.lon / 20037508.34) * 180;
    var lat = (merc.lat / 20037508.34) * 180;
 function mercatorToLonLat(merc) {
    var lon = (merc.lon / 20037508.34) * 180;
    var lat = (merc.lat / 20037508.34) * 180;