From 660631a3ff063e6378c9838f40c1d9bfa8dcfd43 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Tue, 15 Aug 2017 18:25:08 +0100
Subject: Have /around ajax use same format as others.

Both /reports and /my work by using the same URL with ajax=1. We should
use the same on /around for consistency.
---
 web/js/map-google.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/web/js/map-google.js b/web/js/map-google.js
index 596e4f8ee..6be2a0232 100644
--- a/web/js/map-google.js
+++ b/web/js/map-google.js
@@ -127,12 +127,13 @@ fixmystreet.maps = {};
             b_ne = b.getNorthEast(),
             bbox = b_sw.lng() + ',' + b_sw.lat() + ',' + b_ne.lng() + ',' + b_ne.lat(),
             params = {
+                ajax: 1,
                 bbox: bbox
             };
         if (fixmystreet.all_pins) {
             params.all_pins = 1;
         }
-        $.getJSON('/ajax', params, read_pin_json);
+        $.getJSON('/around', params, read_pin_json);
     }
 
     function map_initialize() {
-- 
cgit v1.2.3


From 917be7924e23fd4e0168927f16fa5d6e64ca4508 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Tue, 15 Aug 2017 18:03:10 +0100
Subject: Remove Show all pins link and on_map_list_limit.

/around will now show all reports all the time, but we are about to
introduce pagination to stop that.
---
 web/js/map-google.js | 37 -------------------------------------
 1 file changed, 37 deletions(-)

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

diff --git a/web/js/map-google.js b/web/js/map-google.js
index 6be2a0232..803ac4f3e 100644
--- a/web/js/map-google.js
+++ b/web/js/map-google.js
@@ -130,9 +130,6 @@ fixmystreet.maps = {};
                 ajax: 1,
                 bbox: bbox
             };
-        if (fixmystreet.all_pins) {
-            params.all_pins = 1;
-        }
         $.getJSON('/around', params, read_pin_json);
     }
 
@@ -224,40 +221,6 @@ fixmystreet.maps = {};
                 this.innerHTML = translation_strings.show_pins;
             }
         });
-
-        $('#all_pins_link').click(function(e) {
-            var i;
-            e.preventDefault();
-            for (i=0; i<fixmystreet.markers.length; i++) {
-                fixmystreet.markers[i].setMap(fixmystreet.map);
-            }
-            var texts = [
-                'en', 'Show old', 'Hide old',
-                'nb', 'Inkluder utdaterte problemer', 'Skjul utdaterte rapporter',
-                'cy', 'Cynnwys hen adroddiadau', 'Cuddio hen adroddiadau'
-            ];
-            for (i=0; i<texts.length; i+=3) {
-                if (this.innerHTML == texts[i+1]) {
-                    this.innerHTML = texts[i+2];
-                    fixmystreet.markers.protocol.options.params = { all_pins: 1 };
-                    fixmystreet.markers.refresh( { force: true } );
-                    lang = texts[i];
-                } else if (this.innerHTML == texts[i+2]) {
-                    this.innerHTML = texts[i+1];
-                    fixmystreet.markers.protocol.options.params = { };
-                    fixmystreet.markers.refresh( { force: true } );
-                    lang = texts[i];
-                }
-            }
-            if (lang == 'cy') {
-                document.getElementById('hide_pins_link').innerHTML = 'Cuddio pinnau';
-            } else if (lang == 'nb') {
-                document.getElementById('hide_pins_link').innerHTML = 'Gjem nåler';
-            } else {
-                document.getElementById('hide_pins_link').innerHTML = 'Hide pins';
-            }
-        });
-
     }
 
     google.maps.visualRefresh = true;
-- 
cgit v1.2.3