From d81a4b9766cd536231ba5911bda857962480a046 Mon Sep 17 00:00:00 2001
From: ManeraKai <manerakai@protonmail.com>
Date: Sat, 11 Jun 2022 09:57:41 +0300
Subject: Fixing cookies #319 #323

---
 src/assets/javascripts/maps.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/assets/javascripts/maps.js')

diff --git a/src/assets/javascripts/maps.js b/src/assets/javascripts/maps.js
index a0dbcae8..7d886eaa 100644
--- a/src/assets/javascripts/maps.js
+++ b/src/assets/javascripts/maps.js
@@ -46,6 +46,9 @@ init();
 browser.storage.onChanged.addListener(init)
 
 function redirect(url, initiator) {
+  if (disableMaps) return;
+  if (initiator && initiator.host === "earth.google.com") return;
+  if (!url.href.match(targets)) return;
   const mapCentreRegex = /@(-?\d[0-9.]*),(-?\d[0-9.]*),(\d{1,2})[.z]/;
   const dataLatLngRegex = /!3d(-?[0-9]{1,}.[0-9]{1,})!4d(-?[0-9]{1,}.[0-9]{1,})/;
   const placeRegex = /\/place\/(.*)\//;
@@ -67,7 +70,6 @@ function redirect(url, initiator) {
     traffic: "S", // not implemented on OSM, default to standard.
     bicycling: "C",
   };
-
   function addressToLatLng(address) {
     const xmlhttp = new XMLHttpRequest();
     xmlhttp.open("GET", `https://nominatim.openstreetmap.org/search/${address}?format=json&limit=1`, false);
@@ -85,10 +87,6 @@ function redirect(url, initiator) {
     console.info("Error: Status is " + xmlhttp.status);
   }
 
-  if (disableMaps) return;
-  if (initiator && initiator.host === "earth.google.com") return;
-  if (!url.href.match(targets)) return;
-
   let randomInstance;
   if (mapsFrontend == 'osm') randomInstance = utils.getRandomInstance(redirects.osm.normal);
   if (mapsFrontend == 'facil') randomInstance = utils.getRandomInstance([...facilNormalRedirectsChecks, ...facilNormalCustomRedirects]);
-- 
cgit 1.4.1