Skip to content

new icons in js #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Vylda wants to merge 4 commits into
base: master
Choose a base branch
from
Open

new icons in js #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e5e3efa
new icons in js
Mar 8, 2019
a2f3af8
Better work with circles
Vylda Jan 4, 2020
a5837a4
better work with circles
Vylda Jan 4, 2020
259ce03
Merge remote-tracking branch 'upstream/master'
Vylda Jul 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion GeocacheCircles/Geocache_Circles.meta.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// @oujs:author JRI
// @license MIT; http://www.opensource.org/licenses/mit-license.php
// @copyright 2016-2017, James Inge (http://geo.inge.org.uk/)
// @version 0.0.4
// @version 0.0.5
// @icon https://geo.inge.org.uk/userscripts/circleIcon48.png
// @icon64 https://geo.inge.org.uk/userscripts/circleIcon64.png
// @connect www.geocaching.com
Expand Down
195 changes: 111 additions & 84 deletions GeocacheCircles/Geocache_Circles.user.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// @oujs:author JRI
// @license MIT; http://www.opensource.org/licenses/mit-license.php
// @copyright 2016-2017, James Inge (http://geo.inge.org.uk/)
// @version 0.0.4
// @version 0.0.5
// @icon https://geo.inge.org.uk/userscripts/circleIcon48.png
// @icon64 https://geo.inge.org.uk/userscripts/circleIcon64.png
// @connect www.geocaching.com
Expand All @@ -19,87 +19,114 @@
/*jshint esversion: 6, undef:true, unused:true */
/*global L, MapSettings, window, console */

(function () {
"use strict";
const version = "Geocache Circles v0.0.4";
const loggedIn = document.getElementById("uxLoginStatus_divSignedIn");
const template = document.getElementById("cacheDetailsTemplate");
const script = document.createElement("script");
const circleIcon = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA6UlEQVQ4ja2TsY3DMAxFiUvvbOTaA0SVRhBEfooyBLjyON7FC3iVNNYVlwB3MQwH5/xW/A/8FEm0I+99E4K0IUjrvW/26jaKETeILZC0KqwqrELSCrElRtx2jaWUq0iaFFaBPKvawMwdM3eqNgB5VlgVSVMp5boBPMx3ibkfx/Hr9d05d5GYe4XdRdK0aVthVWLujyI+IPVPHIgtQJ6dc5cjgHPuAuQZYgsR/UwbklZVG47MT6naAEmr976hEKRVWGXm7l0AM3cKqyFIex5wOgLRySESfeAbiU4uEtEHVvl3nH8d06vePedvYUbM9ZMTrS4AAAAASUVORK5CYII=";

function handleCircleRequest(e) {
/* Fetch coordinates from cache page */
const req = new XMLHttpRequest();
const gc = e.detail;
req.addEventListener("load", function (ignore) {
const r = req.responseText;
const k = r.indexOf("mapLatLng = {");

if (req.status < 400) {
try {
const {lat, lng, name} = JSON.parse(r.substring(k + 12, r.indexOf("}", k) + 1));

if (typeof lat !== "number" || typeof lng !== "number") {
// Missing data in JSON string
console.error("Geocache Circles: no cache coordinates retrieved.");
return;
}

if (window.MapSettings && MapSettings.Map && window.L && window.L.Circle) {
const ll = new L.LatLng(lat, lng);
new L.Circle(ll, 161, {weight: 2})
.addTo(MapSettings.Map)
.bindPopup(`<p><strong>${name}</strong><br/>${ll.toUrl()}`);
} else {
console.error("Geocache Circles: couldn't find map interface.");
}
} catch (err) {
if (err instanceof SyntaxError) {
console.warn(`Geocache Circles: Received ${r.length} bytes, coords at ${k} but couldn't extract cache coordinates from data (are you still logged in?):
(function() {
"use strict";
const version = "Geocache Circles v0.0.5";
const loggedIn = document.getElementById("uxLoginStatus_divSignedIn");
const template = document.getElementById("cacheDetailsTemplate");
const script = document.createElement("script");
const circleIcon = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA6UlEQVQ4ja2TsY3DMAxFiUvvbOTaA0SVRhBEfooyBLjyON7FC3iVNNYVlwB3MQwH5/xW/A/8FEm0I+99E4K0IUjrvW/26jaKETeILZC0KqwqrELSCrElRtx2jaWUq0iaFFaBPKvawMwdM3eqNgB5VlgVSVMp5boBPMx3ibkfx/Hr9d05d5GYe4XdRdK0aVthVWLujyI+IPVPHIgtQJ6dc5cjgHPuAuQZYgsR/UwbklZVG47MT6naAEmr976hEKRVWGXm7l0AM3cKqyFIex5wOgLRySESfeAbiU4uEtEHVvl3nH8d06vePedvYUbM9ZMTrS4AAAAASUVORK5CYII=";

//delete existing circle
function handleCircleRemove(e) {
const gc = e.detail;
if (window.MapSettings && MapSettings.Map && window.L && circleStorage[gc]) {
{
MapSettings.Map.removeLayer(circleStorage[gc]);
delete circleStorage[gc];
}
}
}

function handleCircleRequest(e) {
/* Fetch coordinates from cache page */
const req = new XMLHttpRequest();
const gc = e.detail;

//if circle exists, delete it
if (circleStorage[gc] && window.MapSettings && MapSettings.Map && window.L && window.L.Circle) {
MapSettings.Map.removeLayer(circleStorage[gc]);
delete circleStorage[gc];
return;
}

req.addEventListener("load", function(ignore) {
const r = req.responseText;
const k = r.indexOf("mapLatLng = {");



if (req.status < 400) {
try {
const { lat, lng, name } = JSON.parse(r.substring(k + 12, r.indexOf("}", k) + 1));

if (typeof lat !== "number" || typeof lng !== "number") {
// Missing data in JSON string
console.error("Geocache Circles: no cache coordinates retrieved.");
return;
}

if (window.MapSettings && MapSettings.Map && window.L && window.L.Circle) {
const ll = new L.LatLng(lat, lng);
var circle = new L.Circle(ll, 161, { weight: 2 });
circle.addTo(MapSettings.Map)
.bindPopup(`<p><strong>${name}</strong><br/>${ll.toUrl()}<br/>
<a href="https://www.geocaching.com/geocache/${gc}" target="_blank">OpenCache</a><br>
<a style="cursor: pointer;" onclick="document.dispatchEvent(new CustomEvent('gme_circle_remove', {'detail':'${gc}'}));">Remove circle</a>`);
circleStorage[gc] = circle;
} else {
console.error("Geocache Circles: couldn't find map interface.");
}
} catch (err) {
if (err instanceof SyntaxError) {
console.warn(`Geocache Circles: Received ${r.length} bytes, coords at ${k} but couldn't extract cache coordinates from data (are you still logged in?):
${err}`);
} else {
console.error(`Geocache Circles: couldn't add circle to ssmap: ${err}`);
}
}
} else {
console.warn(`Geocache Circles: error retrieving cache page to find coords for ${gc}: ${req.statusText}`);
}
});
req.open("GET", `https://www.geocaching.com/geocache/${gc}`);
req.send();
}

// Don't run on frames or iframes
if (window.top !== window.self) {
return false;
}

// Check feature support
if (!window.JSON || !window.XMLHttpRequest) {
console.warn(`${version} requires a browser with support for JSON and XMLHttpRequest`);
return false;
}

if (loggedIn === null) {
// Warn if not logged in, as coords unavailable. Don't quit, as user might log in later in a different window, or login detection might have failed.
console.warn("Geocache Circles may not be able to locate caches as you don't seem to be logged in.");
}

if (template) {
console.info(version);

// Attach to cache info popup template
template.textContent = template.textContent.replace(/<div\sclass="links\sClear">/, `<div class="links Clear"> <a class="jri-circle-link" style="cursor: pointer; text-decoration: underline;" onclick="document.dispatchEvent(new CustomEvent('gme_circle_request', {'detail':'{{=gc}}'}));"><img src="${circleIcon}" alt="O" style="vertical-align:middle; margin-right: 0.25em;" width="16" height="16" />Circle</a>&nbsp; `);

// Add event listener to content script context
script.type = "text/javascript";
script.text = `"use strict";
${handleCircleRequest.toString()}
document.addEventListener("gme_circle_request", handleCircleRequest, false)`;
document.documentElement.firstChild.appendChild(script);
document.documentElement.firstChild.removeChild(script);
} else {
// Couldn't find popup template
console.error(`${version} didn't understand page structure.`);
}
}());
} else {
console.error(`Geocache Circles: couldn't add circle to ssmap: ${err}`);
}
}
} else {
console.warn(`Geocache Circles: error retrieving cache page to find coords for ${gc}: ${req.statusText}`);
}
});
req.open("GET", `https://www.geocaching.com/geocache/${gc}`);
req.send();
}

// Don't run on frames or iframes
if (window.top !== window.self) {
return false;
}

// Check feature support
if (!window.JSON || !window.XMLHttpRequest) {
console.warn(`${version} requires a browser with support for JSON and XMLHttpRequest`);
return false;
}

if (loggedIn === null) {
// Warn if not logged in, as coords unavailable. Don't quit, as user might log in later in a different window, or login detection might have failed.
console.warn("Geocache Circles may not be able to locate caches as you don't seem to be logged in.");
}

if (template) {
console.info(version);

// Attach to cache info popup template
template.textContent = template.textContent.replace(/<div\sclass="links\sClear">/, `<div class="links Clear"> <a class="jri-circle-link" style="cursor: pointer; text-decoration: underline;" onclick="document.dispatchEvent(new CustomEvent('gme_circle_request', {'detail':'{{=gc}}'}));"><img src="${circleIcon}" alt="O" style="vertical-align:middle; margin-right: 0.25em;" width="16" height="16" />Circle</a>&nbsp; `);

// Add event listener to content script context
script.type = "text/javascript";
script.text = `"use strict";
const circleStorage = {};
${handleCircleRequest.toString()}
${handleCircleRemove.toString()}
document.addEventListener("gme_circle_request", handleCircleRequest, false);
document.addEventListener("gme_circle_remove", handleCircleRemove, false)`;
document.documentElement.firstChild.appendChild(script);
document.documentElement.firstChild.removeChild(script);
} else {
// Couldn't find popup template
console.error(`${version} didn't understand page structure.`);
}
}());
167 changes: 97 additions & 70 deletions GeocacheCircles/src/Geocache_Circles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,81 +1,108 @@
const version = "Geocache Circles v0.0.4";
const loggedIn = document.getElementById("uxLoginStatus_divSignedIn");
const template = document.getElementById("cacheDetailsTemplate");
const script = document.createElement("script");
const circleIcon = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA6UlEQVQ4ja2TsY3DMAxFiUvvbOTaA0SVRhBEfooyBLjyON7FC3iVNNYVlwB3MQwH5/xW/A/8FEm0I+99E4K0IUjrvW/26jaKETeILZC0KqwqrELSCrElRtx2jaWUq0iaFFaBPKvawMwdM3eqNgB5VlgVSVMp5boBPMx3ibkfx/Hr9d05d5GYe4XdRdK0aVthVWLujyI+IPVPHIgtQJ6dc5cjgHPuAuQZYgsR/UwbklZVG47MT6naAEmr976hEKRVWGXm7l0AM3cKqyFIex5wOgLRySESfeAbiU4uEtEHVvl3nH8d06vePedvYUbM9ZMTrS4AAAAASUVORK5CYII=";
const version = "Geocache Circles v0.0.5";
const loggedIn = document.getElementById("uxLoginStatus_divSignedIn");
const template = document.getElementById("cacheDetailsTemplate");
const script = document.createElement("script");
const circleIcon = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA6UlEQVQ4ja2TsY3DMAxFiUvvbOTaA0SVRhBEfooyBLjyON7FC3iVNNYVlwB3MQwH5/xW/A/8FEm0I+99E4K0IUjrvW/26jaKETeILZC0KqwqrELSCrElRtx2jaWUq0iaFFaBPKvawMwdM3eqNgB5VlgVSVMp5boBPMx3ibkfx/Hr9d05d5GYe4XdRdK0aVthVWLujyI+IPVPHIgtQJ6dc5cjgHPuAuQZYgsR/UwbklZVG47MT6naAEmr976hEKRVWGXm7l0AM3cKqyFIex5wOgLRySESfeAbiU4uEtEHVvl3nH8d06vePedvYUbM9ZMTrS4AAAAASUVORK5CYII=";

function handleCircleRequest(e) {
/* Fetch coordinates from cache page */
const req = new XMLHttpRequest();
const gc = e.detail;
req.addEventListener("load", function (ignore) {
const r = req.responseText;
const k = r.indexOf("mapLatLng = {");
//delete existing circle
function handleCircleRemove(e) {
const gc = e.detail;
if (window.MapSettings && MapSettings.Map && window.L && circleStorage[gc]) {
{
MapSettings.Map.removeLayer(circleStorage[gc]);
delete circleStorage[gc];
}
}
}

if (req.status < 400) {
try {
const {lat, lng, name} = JSON.parse(r.substring(k + 12, r.indexOf("}", k) + 1));
function handleCircleRequest(e) {
/* Fetch coordinates from cache page */
const req = new XMLHttpRequest();
const gc = e.detail;

if (typeof lat !== "number" || typeof lng !== "number") {
// Missing data in JSON string
console.error("Geocache Circles: no cache coordinates retrieved.");
return;
}
//if circle exists, delete it
if (circleStorage[gc] && window.MapSettings && MapSettings.Map && window.L && window.L.Circle) {
MapSettings.Map.removeLayer(circleStorage[gc]);
delete circleStorage[gc];
return;
}

if (window.MapSettings && MapSettings.Map && window.L && window.L.Circle) {
const ll = new L.LatLng(lat, lng);
new L.Circle(ll, 161, {weight: 2})
.addTo(MapSettings.Map)
.bindPopup(`<p><strong>${name}</strong><br/>${ll.toUrl()}`);
} else {
console.error("Geocache Circles: couldn't find map interface.");
}
} catch (err) {
if (err instanceof SyntaxError) {
console.warn(`Geocache Circles: Received ${r.length} bytes, coords at ${k} but couldn't extract cache coordinates from data (are you still logged in?):
req.addEventListener("load", function(ignore) {
const r = req.responseText;
const k = r.indexOf("mapLatLng = {");



if (req.status < 400) {
try {
const { lat, lng, name } = JSON.parse(r.substring(k + 12, r.indexOf("}", k) + 1));

if (typeof lat !== "number" || typeof lng !== "number") {
// Missing data in JSON string
console.error("Geocache Circles: no cache coordinates retrieved.");
return;
}

if (window.MapSettings && MapSettings.Map && window.L && window.L.Circle) {
const ll = new L.LatLng(lat, lng);
var circle = new L.Circle(ll, 161, { weight: 2 });
circle.addTo(MapSettings.Map)
.bindPopup(`<p><strong>${name}</strong><br/>${ll.toUrl()}<br/>
<a href="https://www.geocaching.com/geocache/${gc}" target="_blank">OpenCache</a><br>
<a style="cursor: pointer;" onclick="document.dispatchEvent(new CustomEvent('gme_circle_remove', {'detail':'${gc}'}));">Remove circle</a>`);
circleStorage[gc] = circle;
} else {
console.error("Geocache Circles: couldn't find map interface.");
}
} catch (err) {
if (err instanceof SyntaxError) {
console.warn(`Geocache Circles: Received ${r.length} bytes, coords at ${k} but couldn't extract cache coordinates from data (are you still logged in?):
${err}`);
} else {
console.error(`Geocache Circles: couldn't add circle to ssmap: ${err}`);
}
}
} else {
console.warn(`Geocache Circles: error retrieving cache page to find coords for ${gc}: ${req.statusText}`);
}
});
req.open("GET", `https://www.geocaching.com/geocache/${gc}`);
req.send();
}
} else {
console.error(`Geocache Circles: couldn't add circle to ssmap: ${err}`);
}
}
} else {
console.warn(`Geocache Circles: error retrieving cache page to find coords for ${gc}: ${req.statusText}`);
}
});
req.open("GET", `https://www.geocaching.com/geocache/${gc}`);
req.send();
}

// Don't run on frames or iframes
if (window.top !== window.self) {
return false;
}
// Don't run on frames or iframes
if (window.top !== window.self) {
return false;
}

// Check feature support
if (!window.JSON || !window.XMLHttpRequest) {
console.warn(`${version} requires a browser with support for JSON and XMLHttpRequest`);
return false;
}
// Check feature support
if (!window.JSON || !window.XMLHttpRequest) {
console.warn(`${version} requires a browser with support for JSON and XMLHttpRequest`);
return false;
}

if (loggedIn === null) {
// Warn if not logged in, as coords unavailable. Don't quit, as user might log in later in a different window, or login detection might have failed.
console.warn("Geocache Circles may not be able to locate caches as you don't seem to be logged in.");
}
if (loggedIn === null) {
// Warn if not logged in, as coords unavailable. Don't quit, as user might log in later in a different window, or login detection might have failed.
console.warn("Geocache Circles may not be able to locate caches as you don't seem to be logged in.");
}

if (template) {
console.info(version);
if (template) {
console.info(version);

// Attach to cache info popup template
template.textContent = template.textContent.replace(/<div\sclass="links\sClear">/, `<div class="links Clear"> <a class="jri-circle-link" style="cursor: pointer; text-decoration: underline;" onclick="document.dispatchEvent(new CustomEvent('gme_circle_request', {'detail':'{{=gc}}'}));"><img src="${circleIcon}" alt="O" style="vertical-align:middle; margin-right: 0.25em;" width="16" height="16" />Circle</a>&nbsp; `);
// Attach to cache info popup template
template.textContent = template.textContent.replace(/<div\sclass="links\sClear">/, `<div class="links Clear"> <a class="jri-circle-link" style="cursor: pointer; text-decoration: underline;" onclick="document.dispatchEvent(new CustomEvent('gme_circle_request', {'detail':'{{=gc}}'}));"><img src="${circleIcon}" alt="O" style="vertical-align:middle; margin-right: 0.25em;" width="16" height="16" />Circle</a>&nbsp; `);

// Add event listener to content script context
script.type = "text/javascript";
script.text = `"use strict";
${handleCircleRequest.toString()}
document.addEventListener("gme_circle_request", handleCircleRequest, false)`;
document.documentElement.firstChild.appendChild(script);
document.documentElement.firstChild.removeChild(script);
} else {
// Couldn't find popup template
console.error(`${version} didn't understand page structure.`);
}
// Add event listener to content script context
script.type = "text/javascript";
script.text = `"use strict";
const circleStorage = {};
${handleCircleRequest.toString()}
${handleCircleRemove.toString()}
document.addEventListener("gme_circle_request", handleCircleRequest, false);
document.addEventListener("gme_circle_remove", handleCircleRemove, false)`;
document.documentElement.firstChild.appendChild(script);
document.documentElement.firstChild.removeChild(script);
} else {
// Couldn't find popup template
console.error(`${version} didn't understand page structure.`);
}
Loading