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

Compare commits

base: markus:b2958f15d7534e50c8ac457c2e67e29aba868264
Branches Tags
markus:dev
markus:master
markus:feature/trainlines
markus:feature/trainlines-wip
markus:feature/configurable_geojson
..
compare: markus:9c703b50aa4f382a882a5d142bb11d313188833f
Branches Tags
markus:dev
markus:master
markus:feature/trainlines
markus:feature/trainlines-wip
markus:feature/configurable_geojson

No commits in common. "b2958f15d7534e50c8ac457c2e67e29aba868264" and "9c703b50aa4f382a882a5d142bb11d313188833f" have entirely different histories.
b2958f15d7 ... 9c703b50aa

2 changed files with 5 additions and 28 deletions
Show Stats Expand all files Collapse all files

28
htdocs/mapscript.js
View File

@ -232,16 +232,7 @@ function toggle_search() {
function htmlEntities(str) {
return String(str).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
}
function polyline_get_middle_coords(coords) {
var ret = [2];
ret[0] = coords[0][0] + (coords[coords.length - 1][0] - coords[0][0]) / 2;
ret[1] = coords[0][1] + (coords[coords.length - 1][1] - coords[0][1]) / 2;
return ret;
}
var highlighted_line;
var default_street_color = "#3388ff";
var regex;
function search(e) {
var query = htmlEntities(document.getElementById("search_query").value);
document.getElementById('search_results').innerHTML = "";
@ -262,23 +253,6 @@ function search(e) {
results.appendChild(el);
}
break;
case "LineString":
if (item.options.color != default_street_color) { // De-hilight last search
item.options.color = default_street_color;
item.redraw();
}
regex = new RegExp(query, 'i');
if (item.feature.properties.name.match(regex)) {
console.log(item.options.color);
item.options.color = "#FF0000";
item.redraw();
el = document.createElement("li");
zpos = polyline_get_middle_coords(item.feature.geometry.coordinates);
el.innerHTML = "[" + layers._layers[i].name + "] " + '<a href="#" onclick="latLng2 = L.latLng(' + zpos[1] + ',' + zpos[0] + '); jump_to(latLng2); return false;">' + item.feature.properties.name + "</a>";
results.appendChild(el);
}
break;
default:
break;
}

5
htdocs/streeteditor.js
View File

@ -77,7 +77,10 @@ if (editor_mode) {
// polyline.on('dragend', onDragEnd); // TODO: Doesn't work, see "workaround" below
polyline.enableEdit();
if (interactive) {
latlng = L.latLng(polyline_get_middle_coords(coords));
console.log(coords);
latlng = L.latLng(coords[0][0] + (coords[coords.length - 1][0] - coords[0][0]) / 2,
coords[0][1] + (coords[coords.length - 1][1] - coords[0][1]) / 2);
console.log("NEW=" + latlng);
jump_to(latlng, 8);
}
}