diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/assets/javascripts/helpers/maps.js | 69 | ||||
| -rw-r--r-- | src/pages/background/background.js | 1 |
2 files changed, 45 insertions, 25 deletions
diff --git a/src/assets/javascripts/helpers/maps.js b/src/assets/javascripts/helpers/maps.js index 582a70d4..090215a0 100644 --- a/src/assets/javascripts/helpers/maps.js +++ b/src/assets/javascripts/helpers/maps.js @@ -17,7 +17,7 @@ let redirects = { } }; const mapCentreRegex = /@(-?\d[0-9.]*),(-?\d[0-9.]*),(\d{1,2})[.z]/; -const dataLatLngRegex = /(!3d|!4d)(-?[0-9]{1,10}.[0-9]{1,10})/g; +const dataLatLngRegex = /!3d(-?[0-9]{1,}.[0-9]{1,})!4d(-?[0-9]{1,}.[0-9]{1,})/; const placeRegex = /\/place\/(.*)\//; const travelModes = { driving: "fossgis_osrm_car", @@ -25,6 +25,12 @@ const travelModes = { bicycling: "fossgis_osrm_bike", transit: "fossgis_osrm_car", // not implemented on OSM, default to car. }; +const travelModesFacil = { + driving: "car", + walking: "pedestrian", + bicycling: "bicycle", + transit: "car", // not implemented on Facil, default to car. +}; const osmLayers = { none: "S", transit: "T", @@ -40,7 +46,7 @@ function addressToLatLng(address, callback) { const json = JSON.parse(xmlhttp.responseText)[0]; if (json) callback( `${json.lat},${json.lon}`, - `${json.boundingbox[2]},${json.boundingbox[1]},${json.boundingbox[3]},${json.boundingbox[0]}` + `${json.boundingbox[2]},${json.boundingbox[1]},${json.boundingbox[3]},${json.boundingbox[0]}`, ); } else console.info("Error: Status is " + xmlhttp.status); @@ -82,9 +88,9 @@ function redirect(url, initiator) { let mapCentre = "#"; let prefs = {}; + let facilPrefs = {}; - // Set map centre if present - if (url.pathname.match(mapCentreRegex)) { + if (url.pathname.match(mapCentreRegex)) { // Set map centre if present var [, lat, lon, zoom] = url.pathname.match(mapCentreRegex); } else if (url.searchParams.has("center")) { var [lat, lon] = url.searchParams.get("center").split(","); @@ -102,8 +108,10 @@ function redirect(url, initiator) { if (url.searchParams.get("layer")) prefs.layers = osmLayers[url.searchParams.get("layer")]; - // Handle Google Maps Embed API - if (url.pathname.includes("/embed")) { + if (url.pathname.includes("/embed")) { // Handle Google Maps Embed API + // https://www.google.com/maps/embed/v1/place?key=AIzaSyD4iE2xVSpkLLOXoyqT-RuPwURN3ddScAI&q=Eiffel+Tower,Paris+France + console.log("embed life"); + let query = ""; if (url.searchParams.has("q")) query = url.searchParams.get("q"); else if (url.searchParams.has("query")) query = url.searchParams.has("query"); @@ -120,44 +128,54 @@ function redirect(url, initiator) { } ); prefs.layer = "mapnik"; - let prefsEncoded = new URLSearchParams(prefs).toString(); if (frontend == 'osm') return `${randomInstance}/export/embed.html?${prefsEncoded}`; + if (frontend == 'facil') return `${randomInstance}/#q=${query}`; + } else if (url.pathname.includes("/dir")) { // Handle Google Maps Directions - if (url.searchParams.has("travelmode")) prefs.engine = travelModes[url.searchParams.get("travelmode")]; + // https://www.google.com/maps/dir/?api=1&origin=Space+Needle+Seattle+WA&destination=Pike+Place+Market+Seattle+WA&travelmode=bicycling - let origin; addressToLatLng(url.searchParams.get("origin"), a => origin = a); - let destination; addressToLatLng(url.searchParams.get("destination"), a => destination = a); - prefs.route = `${origin};${destination}`; + let travMod = url.searchParams.get("travelmode"); + if (url.searchParams.has("travelmode")) prefs.engine = travelModes[travMod]; + + let orgVal = url.searchParams.get("origin"); + let destVal = url.searchParams.get("destination"); + + let org; addressToLatLng(orgVal, a => org = a); + let dest; addressToLatLng(destVal, a => dest = a); + prefs.route = `${org};${dest}`; let prefsEncoded = new URLSearchParams(prefs).toString(); if (frontend == 'osm') return `${randomInstance}/directions?${prefsEncoded}${mapCentre}`; + if (frontend == 'facil') return `${randomInstance}/#q=${orgVal}%20to%20${destVal}%20by%20${travelModesFacil[travMod]}`; + } else if (url.pathname.includes("data=") && url.pathname.match(dataLatLngRegex)) { // Get marker from data attribute + // https://www.google.com/maps/place/41%C2%B001'58.2%22N+40%C2%B029'18.2%22E/@41.032833,40.4862063,17z/data=!3m1!4b1!4m6!3m5!1s0x0:0xf64286eaf72fc49d!7e2!8m2!3d41.0328329!4d40.4883948 console.log("data life"); - const [mlat, mlon] = url.pathname.match(dataLatLngRegex); - prefs.mlat = mlat.replace("!3d", ""); - prefs.mlon = mlon.replace("!4d", ""); + let [, mlat, mlon] = url.pathname.match(dataLatLngRegex); + + if (frontend == 'osm') return `${randomInstance}/search?query=${mlat}%2C${mlon}`; + if (frontend == 'facil') return `${randomInstance}/#q=${mlat}%2C${mlon}`; - // Get marker from ll param - } else if (url.searchParams.has("ll")) { + } else if (url.searchParams.has("ll")) { // Get marker from ll param + // https://maps.google.com/?ll=38.882147,-76.99017 console.log("ll life"); const [mlat, mlon] = url.searchParams.get("ll").split(","); - prefs.mlat = mlat; - prefs.mlon = mlon; - // Get marker from viewpoint param. - } else if (url.searchParams.has("viewpoint")) { + if (frontend == 'osm') return `${randomInstance}/search?query=${mlat}%2C${mlon}`; + if (frontend == 'facil') return `${randomInstance}/#q=${mlat}%2C${mlon}`; + } else if (url.searchParams.has("viewpoint")) { // Get marker from viewpoint param. + // https://www.google.com/maps/@?api=1&map_action=pano&viewpoint=48.857832,2.295226&heading=-45&pitch=38&fov=80 console.log("viewpoint life"); const [mlat, mlon] = url.searchParams.get("viewpoint").split(","); - prefs.mlat = mlat; - prefs.mlon = mlon; - // Use query as search if present. - } else { + if (frontend == 'osm') return `${randomInstance}/search?query=${mlat}%2C${mlon}`; + if (frontend == 'facil') return `${randomInstance}/#q=${mlat}%2C${mlon}`; + } else { // Use query as search if present. console.log("normal life"); let query; @@ -173,8 +191,9 @@ function redirect(url, initiator) { } let prefsEncoded = new URLSearchParams(prefs).toString(); + console.log("mapCentre", mapCentre); console.log("prefs", prefs); - console.log("prefsEncoded", prefsEncoded) + console.log("prefsEncoded", prefsEncoded); if (frontend == 'osm') return `${randomInstance}/${mapCentre}&${prefsEncoded}` if (frontend == 'facil') return `${randomInstance}/${mapCentre}/Mpnk` } diff --git a/src/pages/background/background.js b/src/pages/background/background.js index d78ff203..f8a7e54c 100644 --- a/src/pages/background/background.js +++ b/src/pages/background/background.js @@ -50,6 +50,7 @@ let BYPASSTABs = []; browser.webRequest.onBeforeRequest.addListener( details => { const url = new URL(details.url); + // console.info("url:", url.href, "type:", details.type); let initiator; if (details.originUrl) initiator = new URL(details.originUrl); |