Merge branch 'master' into openid

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

diff --git a/public/javascripts/map.js b/public/javascripts/map.js
index 32953c4397213cfbd9dcc7e235ca40512d351ff2..fd45d930462d3601e322c7121f927505b2938c15 100644 (file)
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -13,12 +13,6 @@ var nonamekeys = {
    'www.openstreetmap.net': '0bd1654141c85d30b9c2ccdb5302f2e4'
 };
 
    'www.openstreetmap.net': '0bd1654141c85d30b9c2ccdb5302f2e4'
 };
 

-OpenLayers._getScriptLocation = function () {
-  // Should really have this file as an erb, so that this can return
-  // the real rails root
-   return "/openlayers/";
-}
-

 function createMap(divName, options) {
    options = options || {};
 
 function createMap(divName, options) {
    options = options || {};
 


@@ -28,6 +22,7 @@ function createMap(divName, options) {
          new OpenLayers.Control.Attribution(),
          new OpenLayers.Control.LayerSwitcher(),
          new OpenLayers.Control.Navigation(),
          new OpenLayers.Control.Attribution(),
          new OpenLayers.Control.LayerSwitcher(),
          new OpenLayers.Control.Navigation(),

+         new OpenLayers.Control.PanZoom(),

          new OpenLayers.Control.PanZoomBar()
       ],
       units: "m",
          new OpenLayers.Control.PanZoomBar()
       ],
       units: "m",


@@ -37,18 +32,21 @@ function createMap(divName, options) {
    });
 
    var mapnik = new OpenLayers.Layer.OSM.Mapnik(i18n("javascripts.map.base.mapnik"), {
    });
 
    var mapnik = new OpenLayers.Layer.OSM.Mapnik(i18n("javascripts.map.base.mapnik"), {

+      keyid: "mapnik",

       displayOutsideMaxExtent: true,
       wrapDateLine: true
    });
    map.addLayer(mapnik);
 
    var osmarender = new OpenLayers.Layer.OSM.Osmarender(i18n("javascripts.map.base.osmarender"), {
       displayOutsideMaxExtent: true,
       wrapDateLine: true
    });
    map.addLayer(mapnik);
 
    var osmarender = new OpenLayers.Layer.OSM.Osmarender(i18n("javascripts.map.base.osmarender"), {

+      keyid: "osmarender",

       displayOutsideMaxExtent: true,
       wrapDateLine: true
    });
    map.addLayer(osmarender);
 
    var cyclemap = new OpenLayers.Layer.OSM.CycleMap(i18n("javascripts.map.base.cycle_map"), {
       displayOutsideMaxExtent: true,
       wrapDateLine: true
    });
    map.addLayer(osmarender);
 
    var cyclemap = new OpenLayers.Layer.OSM.CycleMap(i18n("javascripts.map.base.cycle_map"), {

+      keyid: "cyclemap",

       displayOutsideMaxExtent: true,
       wrapDateLine: true
    });
       displayOutsideMaxExtent: true,
       wrapDateLine: true
    });


@@ -101,7 +99,8 @@ function addMarkerToMap(position, icon, description) {
    markers.addMarker(marker);
 
    if (description) {
    markers.addMarker(marker);
 
    if (description) {

-      marker.events.register("click", marker, function() { openMapPopup(marker, description) });
+      marker.events.register("mouseover", marker, function() { openMapPopup(marker, description) });
+      marker.events.register("mouseout", marker, function() { closeMapPopup() });

    }
 
    return marker;
    }
 
    return marker;


@@ -174,10 +173,9 @@ function addBoxToMap(boxbounds) {
 function openMapPopup(marker, description) {
    closeMapPopup();
 
 function openMapPopup(marker, description) {
    closeMapPopup();
 

-   popup = new OpenLayers.Popup.AnchoredBubble("popup", marker.lonlat, null,
-                                               description, marker.icon, true);
+   popup = new OpenLayers.Popup.FramedCloud("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;


@@ -198,7 +196,7 @@ function removeBoxFromMap(box){
    vectors.removeFeature(box);
 }
 
    vectors.removeFeature(box);
 }
 

-function getMapCenter(center, zoom) {
+function getMapCenter() {

    return map.getCenter().clone().transform(map.getProjectionObject(), epsg4326);
 }
 
    return map.getCenter().clone().transform(map.getProjectionObject(), epsg4326);
 }
 


@@ -217,6 +215,10 @@ function getMapExtent() {
    return map.getExtent().clone().transform(map.getProjectionObject(), epsg4326);
 }
 
    return map.getExtent().clone().transform(map.getProjectionObject(), epsg4326);
 }
 

+function getMapZoom() {
+   return map.getZoom();
+}
+

 function getEventPosition(event) {
    return map.getLonLatFromViewPortPx(event.xy).clone().transform(map.getProjectionObject(), epsg4326);
 }
 function getEventPosition(event) {
    return map.getLonLatFromViewPortPx(event.xy).clone().transform(map.getProjectionObject(), epsg4326);
 }