Move to using pushState for new report.

Update the URL whenever location of pin is updated (first time, drag, or
reclick), make sure it works when clicking back.

3 files changed, 57 insertions, 63 deletions

diff --git a/web/js/jquery.ba-hashchange.min.js b/web/js/jquery.ba-hashchange.min.js
deleted file mode 100644
index 3c607bae3..000000000
--- a/web/js/jquery.ba-hashchange.min.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * jQuery hashchange event - v1.3 - 7/21/2010
- * http://benalman.com/projects/jquery-hashchange-plugin/
- * 
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
- */
-(function($,e,b){var c="hashchange",h=document,f,g=$.event.special,i=h.documentMode,d="on"+c in e&&(i===b||i>7);function a(j){j=j||location.href;return"#"+j.replace(/^[^#]*#?(.*)$/,"$1")}$.fn[c]=function(j){return j?this.bind(c,j):this.trigger(c)};$.fn[c].delay=50;g[c]=$.extend(g[c],{setup:function(){if(d){return false}$(f.start)},teardown:function(){if(d){return false}$(f.stop)}});f=(function(){var j={},p,m=a(),k=function(q){return q},l=k,o=k;j.start=function(){p||n()};j.stop=function(){p&&clearTimeout(p);p=b};function n(){var r=a(),q=o(m);if(r!==m){l(m=r,q);$(e).trigger(c)}else{if(q!==m){location.href=location.href.replace(/#.*/,"")+q}}p=setTimeout(n,$.fn[c].delay)}$.browser.msie&&!d&&(function(){var q,r;j.start=function(){if(!q){r=$.fn[c].src;r=r&&r+a();q=$('<iframe tabindex="-1" title="empty"/>').hide().one("load",function(){r||l(a());n()}).attr("src",r||"javascript:0").insertAfter("body")[0].contentWindow;h.onpropertychange=function(){try{if(event.propertyName==="title"){q.document.title=h.title}}catch(s){}}}};j.stop=k;o=function(){return a(q.location.href)};l=function(v,s){var u=q.document,t=$.fn[c].domain;if(v!==s){u.title=h.title;u.open();t&&u.write('<script>document.domain="'+t+'"<\/script>');u.close();q.location.hash=v}}})();return j})()})(jQuery,this);
\ No newline at end of file
diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index 872956716..f6e7e8a62 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -4,18 +4,43 @@ var fixmystreet = fixmystreet || {};
 
     fixmystreet.maps = {
       // This function might be passed either an OpenLayers.LonLat (so has
-      // lon and lat) or an OpenLayers.Geometry.Point (so has x and y)
+      // lon and lat), or an OpenLayers.Geometry.Point (so has x and y).
       update_pin: function(lonlat) {
-        lonlat = lonlat.clone().transform(
+        var transformedLonlat = lonlat.clone().transform(
             fixmystreet.map.getProjectionObject(),
             new OpenLayers.Projection("EPSG:4326")
         );
 
-        document.getElementById('fixmystreet.latitude').value = lonlat.lat || lonlat.y;
-        document.getElementById('fixmystreet.longitude').value = lonlat.lon || lonlat.x;
+        var lat = transformedLonlat.lat || transformedLonlat.y;
+        var lon = transformedLonlat.lon || transformedLonlat.x;
+
+        document.getElementById('fixmystreet.latitude').value = lat;
+        document.getElementById('fixmystreet.longitude').value = lon;
+        return {
+            'url': { 'lon': lon, 'lat': lat },
+            'state': { 'lon': lonlat.lon, 'lat': lonlat.lat }
+        };
+      },
+
+      display_around: function() {
+        // Required after changing the size of the map element
+        fixmystreet.map.updateSize();
+
+        // Dragging the map should fetch new local reports from server
+        fixmystreet.bbox_strategy.activate();
+
+        // Should not be able to drag normal pins!!
+        drag.deactivate();
+
+        // Force a redraw to return (de)selected marker to normal size
+        fixmystreet.markers.refresh({force: true});
       },
 
       begin_report: function(lonlat) {
+        if (typeof lonlat.clone !== 'function') {
+            lonlat = new OpenLayers.LonLat(lonlat.lon, lonlat.lat);
+        }
+
         if (fixmystreet.page == 'new') {
             /* Already have a pin */
             fixmystreet.markers.features[0].move(lonlat);
@@ -31,9 +56,9 @@ var fixmystreet = fixmystreet || {};
         // 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();
         }
+        return lonlat;
       },
 
       markers_list: function(pins, transform) {
@@ -120,7 +145,7 @@ var fixmystreet = fixmystreet || {};
             this._drag.activate();
         },
         deactivate: function() {
-            this._drag.deactivate();
+            this._drag && this._drag.deactivate();
         }
     };
 
@@ -451,30 +476,6 @@ var fixmystreet = fixmystreet || {};
             click.activate();
         }
 
-        $(window).hashchange(function(){
-            if (location.hash && location.hash != '#') {
-                return;
-            }
-
-            // 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();
-            }
-            drag.deactivate();
-            $('#side-form').hide();
-            $('#side').show();
-            $('body').removeClass('with-notes');
-            fixmystreet.map.updateSize(); // required after changing the size of the map element
-            $('#sub_map_links').show();
-            //only on mobile
-            $('#mob_sub_map_links').remove();
-            $('.mobile-map-banner').html('<a href="/">' + translation_strings.home + '</a> ' + translation_strings.place_pin_on_map);
-            fixmystreet.page = 'around';
-        });
-
         // Hide the pin filter submit button. Not needed because we'll use JS
         // to refresh the map when the filter inputs are changed.
         $(".report-list-filters [type=submit]").hide();
diff --git a/web/js/map-google.js b/web/js/map-google.js
index fa2b6d90e..4c3f6188e 100644
--- a/web/js/map-google.js
+++ b/web/js/map-google.js
@@ -11,11 +11,21 @@ fixmystreet.maps = {};
 (function() {
 
     fixmystreet.maps.update_pin = function(lonlat) {
-        document.getElementById('fixmystreet.latitude').value = lonlat.lat();
-        document.getElementById('fixmystreet.longitude').value = lonlat.lng();
+        var lat = lonlat.lat();
+        var lon = lonlat.lng();
+        document.getElementById('fixmystreet.latitude').value = lat;
+        document.getElementById('fixmystreet.longitude').value = lon;
+        return {
+            'url': { 'lon': lon, 'lat': lat },
+            'state': { 'lon': lon, 'lat': lat }
+        };
     };
 
     fixmystreet.maps.begin_report = function(lonlat) {
+        if (typeof lonlat.lat !== 'function') {
+            lonlat = new google.maps.LatLng(lonlat.lat, lonlat.lon);
+        }
+
         if (fixmystreet.page == 'new') {
             /* Already have a pin */
             fixmystreet.report_marker.setPosition(lonlat);
@@ -35,6 +45,15 @@ fixmystreet.maps = {};
                 fixmystreet.markers[m].setMap(null);
             }
         }
+        return lonlat;
+    };
+
+    fixmystreet.maps.display_around = function() {
+        if (fixmystreet.report_marker) {
+            fixmystreet.report_marker.setMap(null);
+        }
+        fixmystreet.event_update_map = google.maps.event.addListener(fixmystreet.map, 'idle', update_pins);
+        google.maps.event.trigger(fixmystreet.map, 'idle');
     };
 
     function PaddingControl(div) {
@@ -81,6 +100,11 @@ fixmystreet.maps = {};
     }
 
     function map_clicked(e) {
+        if ($('.js-back-to-report-list').length) {
+            $('.js-back-to-report-list').trigger('click');
+            return true;
+        }
+
         var lonlat = e.latLng;
         fixmystreet.display.begin_report(lonlat);
     }
@@ -148,28 +172,6 @@ fixmystreet.maps = {};
             var l = google.maps.event.addListener(fixmystreet.map, 'click', map_clicked);
         }
 
-        $(window).hashchange(function(){
-            if (location.hash && location.hash != '#') {
-                return;
-            }
-
-            // Okay, back to around view.
-            fixmystreet.report_marker.setMap(null);
-            fixmystreet.event_update_map = google.maps.event.addListener(fixmystreet.map, 'idle', update_pins);
-            google.maps.event.trigger(fixmystreet.map, 'idle');
-            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();
-            }
-            $('#side-form').hide();
-            $('#side').show();
-            $('#sub_map_links').show();
-            //only on mobile
-            $('#mob_sub_map_links').remove();
-            $('.mobile-map-banner').html('<a href="/">' + translation_strings.home + '</a> ' + translation_strings.place_pin_on_map);
-            fixmystreet.page = 'around';
-        });
-
         if ( fixmystreet.area.length ) {
             for (var i=0; i<fixmystreet.area.length; i++) {
                 var args = {