Improve user popups on friend/nearby mapper maps.

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

diff --git a/public/javascripts/map.js b/public/javascripts/map.js
index a25ab1614d655adcca53d1299c14d8f717a23b9d..ab15198abf3ba411abf763928167668c1dabd34f 100644 (file)
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -22,6 +22,7 @@ function createMap(divName, options) {
          new OpenLayers.Control.Attribution(),
          new OpenLayers.Control.LayerSwitcher(),
          new OpenLayers.Control.Navigation(),
+         new OpenLayers.Control.PanZoom(),
          new OpenLayers.Control.PanZoomBar()
       ],
       units: "m",
@@ -95,7 +96,8 @@ function addMarkerToMap(position, icon, 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;
@@ -168,10 +170,9 @@ function addBoxToMap(boxbounds) {
 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.autoSize = true;
    map.addPopup(popup);
 
    return popup;
@@ -192,7 +193,7 @@ function removeBoxFromMap(box){
    vectors.removeFeature(box);
 }
 
-function getMapCenter(center, zoom) {
+function getMapCenter() {
    return map.getCenter().clone().transform(map.getProjectionObject(), epsg4326);
 }
 
@@ -211,6 +212,10 @@ function getMapExtent() {
    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);
 }