markus/lifomapserver
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: markus:ab2e50f851467363ff643a165b4f0e1d4dabbe5c
Branches Tags
markus:dev
markus:master
markus:feature/trainlines
markus:feature/trainlines-wip
markus:feature/configurable_geojson
..
compare: markus:4c7590a212c3900b6f6bf37d00afd6a0c72b84b3
Branches Tags
markus:dev
markus:master
markus:feature/trainlines
markus:feature/trainlines-wip
markus:feature/configurable_geojson

No commits in common. "ab2e50f851467363ff643a165b4f0e1d4dabbe5c" and "4c7590a212c3900b6f6bf37d00afd6a0c72b84b3" have entirely different histories.
ab2e50f851 ... 4c7590a212

2 changed files with 9 additions and 49 deletions
Show Stats Expand all files Collapse all files

2
htdocs/mapscript.js
View File

@ -297,7 +297,7 @@ L.GotoControl = L.MyControl.extend({
options: {
position: 'topleft',
callback: prompt_location,
title: 'Jump to coordinates',
title: 'Jump to coordinates.',
html: '⌖'
}
});

56
htdocs/streeteditor.js
View File

@ -1,7 +1,6 @@
const queryString = window.location.search;
const urlParams = new URLSearchParams(queryString);
editor_mode = urlParams.has('editor');
if (editor_mode) {
var draw_layer;
var polyline;
@ -14,21 +13,13 @@ if (editor_mode) {
return latlng;
}
function start_editing(dir = 1) {
function start_editing(e) {
// 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
if (polyline) {
if (dir)
polyline.editor.continueForward();
else
polyline.editor.continueBackward();
} else {
if (polyline)
polyline.editor.continueForward();
else
polyline = mymap.editTools.startPolyline();
}
}
function start_reverse_editing() {
start_editing(0);
}
function strToPoints(str) {
@ -57,17 +48,10 @@ if (editor_mode) {
"* Double click a waypoint to delete it.\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));
if (!str)
return;
} else {
str = window.location.hash.slice(1);
}
if (polyline) {
polyline.remove(mymap);
polyline = undefined;
}
if (str) {
coords = strToPoints(str);
for (var i = 0; i < coords.length; i++) {
@ -81,6 +65,7 @@ if (editor_mode) {
function editor_onHashChange() {
if (("#" + get_location_string()) != window.location.hash) {
polyline.remove(mymap);
onLoad(0);
}
}
@ -93,6 +78,7 @@ if (editor_mode) {
document.getElementById('mapid').classList.add("no-aa");
mymap.setMaxZoom(14);
mymap.off('click', onMapClick);
onLoad();
function get_location_string() {
var latlngs = polyline.getLatLngs();
@ -109,11 +95,7 @@ if (editor_mode) {
}
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());
}
function reset_path(e) {
onLoad(1);
prompt("Copy this string back into the Wiki and wait for a few hours:", get_location_string());
}
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({
options: {
position: 'topleft',
callback: start_editing,
title: 'Start editing (forward)',
title: 'Start editing',
html: '\\/\\'
}
});
L.StartReverseEditControl = L.EditControl.extend({
options: {
position: 'topleft',
callback: start_reverse_editing,
title: 'Start editing (backward)',
html: '↺'
}
});
L.NewLineControl = L.EditControl.extend({
options: {
position: 'topleft',
@ -175,9 +139,5 @@ if (editor_mode) {
});
mymap.addControl(new L.NewLineControl());
mymap.addControl(new L.ResetPathControl());
mymap.addControl(new L.StartEditControl());
mymap.addControl(new L.StartReverseEditControl());
onLoad();
}