Back out attempt to commit partial support for POIs as this is not at

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

diff --git a/public/javascripts/map.js b/public/javascripts/map.js
index d2dd5f3c7d53786aa9774b5c2c7846110a3641b8..abbc7f8eaa9a81860a96836f2b5a7f255fcfeeb9 100644 (file)
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -2,6 +2,10 @@ var map;
 var markers;
 var popup;
 
 var markers;
 var popup;
 

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

 function createMap(divName) {
    map = new OpenLayers.Map(divName);
 
 function createMap(divName) {
    map = new OpenLayers.Map(divName);
 


@@ -11,8 +15,17 @@ 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.addControl(new OpenLayers.Control.LayerSwitcher());
    map.addLayer(markers);
 
    map.addControl(new OpenLayers.Control.LayerSwitcher());


@@ -33,7 +46,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) });