Remove ancient geolocation JS library.

mysociety · Nov 6, 2017 · b2843ab · b2843ab
1 parent b811bbb
commit b2843ab
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 92 deletions.
diff --git a/templates/web/base/common_scripts.html b/templates/web/base/common_scripts.html
@@ -12,7 +12,6 @@
     version('/vendor/jquery.validate.min.js'),
     version('/vendor/dropzone.min.js'),
     version('/js/jquery.multi-select.js'),
-    version('/vendor/geo.min.js'),
     version('/cobrands/fixmystreet/fixmystreet.js'),
 );
 

diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
@@ -217,7 +217,7 @@ fixmystreet.geolocate = {
                 var spincolor = $('<span>').css("color","white").css("color") === $('#front-main').css("background-color") ? 'white' : 'yellow';
                 $link.append(' <img src="/cobrands/fixmystreet/images/spinner-' + spincolor + '.gif" alt="" align="bottom">');
             }
-            geo_position_js.getCurrentPosition(function(pos) {
+            navigator.geolocation.getCurrentPosition(function(pos) {
                 $link.find('img').remove();
                 success_callback(pos);
             }, function(err) {
@@ -409,10 +409,7 @@ $.extend(fixmystreet.set_up, {
   },
 
   report_geolocation: function() {
-    if (!geo_position_js.init()) {
-        return;
-    }
-    if ($('.js-geolocate').length) {
+    if ('geolocation' in navigator && $('.js-geolocate').length) {
         var link = $('.js-geolocate').attr('action');
         link = '<a href="' + link + '" id="geolocate_link">&hellip; ' + translation_strings.geolocate + '</a>';
         if ($('body.frontpage').length) {

diff --git a/web/cobrands/fixmystreet/staff.js b/web/cobrands/fixmystreet/staff.js
@@ -313,7 +313,7 @@ $.extend(fixmystreet.set_up, {
         });
     }
 
-    if (geo_position_js.init()) {
+    if ('geolocation' in navigator) {
         fixmystreet.geolocate.setup(function(pos) {
             var latlon = new OpenLayers.LonLat(pos.coords.longitude, pos.coords.latitude);
             var bng = latlon.clone().transform(

diff --git a/web/vendor/geo.min.js b/web/vendor/geo.min.js