From d6d3a2904cafa7236b5426a9d19f0807c28e153f Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 1 Mar 2012 15:39:53 +0000
Subject: Move popups to come out of the middle of the pin.

---
 web/js/map-OpenLayers.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'web/js/map-OpenLayers.js')

diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index 87400c9d8..b50f8c30f 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -134,7 +134,8 @@ function fixmystreet_onload() {
                 feature.geometry.getBounds().getCenterLonLat(),
                 null,
                 feature.attributes.title + "<br><a href=/report/" + feature.attributes.id + ">More details</a>",
-                null, true, onPopupClose);
+                { size: new OpenLayers.Size(0,0), offset: new OpenLayers.Pixel(0,-40) },
+                true, onPopupClose);
             feature.popup = popup;
             fixmystreet.map.addPopup(popup);
         });
-- 
cgit v1.2.3


From f00eaa221cdefd6d2d70c8c2029df801bc0d0420 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 1 Mar 2012 15:50:01 +0000
Subject: Remember pin hiding state in case they try again.

---
 web/js/map-OpenLayers.js | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'web/js/map-OpenLayers.js')

diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index b50f8c30f..d4aa51a34 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -263,6 +263,10 @@ $(function(){
         // Okay, back to around view.
         fixmystreet.bbox_strategy.activate();
         fixmystreet.markers.refresh( { force: true } );
+        if ( fixmystreet.state_pins_were_hidden ) {
+            // If we had pins hidden when we clicked map (which had to show the pin layer as I'm doing it in one layer), hide them again.
+            $('#hide_pins_link').click();
+        }
         fixmystreet.drag.deactivate();
         $('#side-form').hide();
         $('#side').show();
@@ -399,6 +403,7 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, {
         // link so that it updates the text in case they go
         // back
         if ( ! fixmystreet.markers.getVisibility() ) {
+            fixmystreet.state_pins_were_hidden = true;
             $('#hide_pins_link').click();
         }
         if (fixmystreet.page == 'new') {
-- 
cgit v1.2.3