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 046c754568fd87e957518281a1860a0dc90d38af..369df89876e1f7d1b0084467adcc997bbcc4c176 100644 (file)
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -2,12 +2,20 @@ var map;
 var markers;
 var popup;
 
 var markers;
 var popup;
 

+OpenLayers._getScriptLocation = function () {
+   return "/openlayers/";
+}
+   

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

-   map = new OpenLayers.Map(divName,
-                            { maxExtent: new OpenLayers.Bounds(-20037508,-20037508,20037508,20037508),
-                              maxResolution: 156543,
-                              units: 'm',
-                              projection: "EPSG:41001" });
+   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);
 
    var mapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik", { displayOutsideMaxExtent: true });
    map.addLayer(mapnik);


@@ -15,13 +23,19 @@ function createMap(divName) {
    var osmarender = new OpenLayers.Layer.OSM.Osmarender("Osmarender", { displayOutsideMaxExtent: true });
    map.addLayer(osmarender);
 
    var osmarender = new OpenLayers.Layer.OSM.Osmarender("Osmarender", { displayOutsideMaxExtent: true });
    map.addLayer(osmarender);
 

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

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

-   markers = new OpenLayers.Layer.Markers("Markers", { visibility: 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",
+      projection: "EPSG:41001"
+   });

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

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

    return map;
 }
 
    return map;
 }
 


@@ -37,7 +51,6 @@ function addMarkerToMap(position, icon, description) {
    var marker = new OpenLayers.Marker(position, icon);
 
    markers.addMarker(marker);
    var marker = new OpenLayers.Marker(position, icon);
 
    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) });