Compare commits
No commits in common. "ab2e50f851467363ff643a165b4f0e1d4dabbe5c" and "4c7590a212c3900b6f6bf37d00afd6a0c72b84b3" have entirely different histories.
ab2e50f851
...
4c7590a212
@ -297,7 +297,7 @@ L.GotoControl = L.MyControl.extend({
|
|||||||
options: {
|
options: {
|
||||||
position: 'topleft',
|
position: 'topleft',
|
||||||
callback: prompt_location,
|
callback: prompt_location,
|
||||||
title: 'Jump to coordinates',
|
title: 'Jump to coordinates.',
|
||||||
html: '⌖'
|
html: '⌖'
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
const queryString = window.location.search;
|
const queryString = window.location.search;
|
||||||
const urlParams = new URLSearchParams(queryString);
|
const urlParams = new URLSearchParams(queryString);
|
||||||
editor_mode = urlParams.has('editor');
|
editor_mode = urlParams.has('editor');
|
||||||
|
|
||||||
if (editor_mode) {
|
if (editor_mode) {
|
||||||
var draw_layer;
|
var draw_layer;
|
||||||
var polyline;
|
var polyline;
|
||||||
@ -14,22 +13,14 @@ if (editor_mode) {
|
|||||||
return latlng;
|
return latlng;
|
||||||
}
|
}
|
||||||
|
|
||||||
function start_editing(dir = 1) {
|
function start_editing(e) {
|
||||||
// TODO: Check whether we already are in edit mode
|
// TODO: Check whether we already are in edit mode
|
||||||
// TODO: Detect whether we are cloner to the tail or the head, and issue Fwd or Bwd accordingly
|
// TODO: Detect whether we are cloner to the tail or the head, and issue Fwd or Bwd accordingly
|
||||||
if (polyline) {
|
if (polyline)
|
||||||
if (dir)
|
|
||||||
polyline.editor.continueForward();
|
polyline.editor.continueForward();
|
||||||
else
|
else
|
||||||
polyline.editor.continueBackward();
|
|
||||||
} else {
|
|
||||||
polyline = mymap.editTools.startPolyline();
|
polyline = mymap.editTools.startPolyline();
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
function start_reverse_editing() {
|
|
||||||
start_editing(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
function strToPoints(str) {
|
function strToPoints(str) {
|
||||||
var temp = JSON.parse("[" + str + "]"); // TODO: add .5 everwhere
|
var temp = JSON.parse("[" + str + "]"); // TODO: add .5 everwhere
|
||||||
@ -57,17 +48,10 @@ if (editor_mode) {
|
|||||||
"* Double click a waypoint to delete it.\n" +
|
"* Double click a waypoint to delete it.\n" +
|
||||||
"* Click save in the top right to get the new string.\n\n" +
|
"* Click save in the top right to get the new string.\n\n" +
|
||||||
"Enter existing waypoints in the following format: [x,y],[x,y]:", window.location.hash.slice(1));
|
"Enter existing waypoints in the following format: [x,y],[x,y]:", window.location.hash.slice(1));
|
||||||
if (!str)
|
|
||||||
return;
|
|
||||||
} else {
|
} else {
|
||||||
str = window.location.hash.slice(1);
|
str = window.location.hash.slice(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (polyline) {
|
|
||||||
polyline.remove(mymap);
|
|
||||||
polyline = undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (str) {
|
if (str) {
|
||||||
coords = strToPoints(str);
|
coords = strToPoints(str);
|
||||||
for (var i = 0; i < coords.length; i++) {
|
for (var i = 0; i < coords.length; i++) {
|
||||||
@ -81,6 +65,7 @@ if (editor_mode) {
|
|||||||
|
|
||||||
function editor_onHashChange() {
|
function editor_onHashChange() {
|
||||||
if (("#" + get_location_string()) != window.location.hash) {
|
if (("#" + get_location_string()) != window.location.hash) {
|
||||||
|
polyline.remove(mymap);
|
||||||
onLoad(0);
|
onLoad(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -93,6 +78,7 @@ if (editor_mode) {
|
|||||||
document.getElementById('mapid').classList.add("no-aa");
|
document.getElementById('mapid').classList.add("no-aa");
|
||||||
mymap.setMaxZoom(14);
|
mymap.setMaxZoom(14);
|
||||||
mymap.off('click', onMapClick);
|
mymap.off('click', onMapClick);
|
||||||
|
onLoad();
|
||||||
|
|
||||||
function get_location_string() {
|
function get_location_string() {
|
||||||
var latlngs = polyline.getLatLngs();
|
var latlngs = polyline.getLatLngs();
|
||||||
@ -109,11 +95,7 @@ if (editor_mode) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function show_location_string(e) {
|
function show_location_string(e) {
|
||||||
prompt("Copy this string back into the Wiki and wait for the server to refresh the maps:", get_location_string());
|
prompt("Copy this string back into the Wiki and wait for a few hours:", get_location_string());
|
||||||
}
|
|
||||||
|
|
||||||
function reset_path(e) {
|
|
||||||
onLoad(1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
L.EditControl = L.Control.extend({
|
L.EditControl = L.Control.extend({
|
||||||
@ -138,33 +120,15 @@ if (editor_mode) {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
L.ResetPathControl = L.EditControl.extend({
|
|
||||||
options: {
|
|
||||||
position: 'topleft',
|
|
||||||
callback: reset_path,
|
|
||||||
title: 'Enter path coordinates',
|
|
||||||
html: '📂'
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
L.StartEditControl = L.EditControl.extend({
|
L.StartEditControl = L.EditControl.extend({
|
||||||
options: {
|
options: {
|
||||||
position: 'topleft',
|
position: 'topleft',
|
||||||
callback: start_editing,
|
callback: start_editing,
|
||||||
title: 'Start editing (forward)',
|
title: 'Start editing',
|
||||||
html: '\\/\\'
|
html: '\\/\\'
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
L.StartReverseEditControl = L.EditControl.extend({
|
|
||||||
options: {
|
|
||||||
position: 'topleft',
|
|
||||||
callback: start_reverse_editing,
|
|
||||||
title: 'Start editing (backward)',
|
|
||||||
html: '↺'
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
L.NewLineControl = L.EditControl.extend({
|
L.NewLineControl = L.EditControl.extend({
|
||||||
options: {
|
options: {
|
||||||
position: 'topleft',
|
position: 'topleft',
|
||||||
@ -175,9 +139,5 @@ if (editor_mode) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
mymap.addControl(new L.NewLineControl());
|
mymap.addControl(new L.NewLineControl());
|
||||||
mymap.addControl(new L.ResetPathControl());
|
|
||||||
mymap.addControl(new L.StartEditControl());
|
mymap.addControl(new L.StartEditControl());
|
||||||
mymap.addControl(new L.StartReverseEditControl());
|
|
||||||
|
|
||||||
onLoad();
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user