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

Compare commits

base: markus:9028fc646de7497cb4d321320f0d2ddc52bdf2e0
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

3 Commits
9028fc646d ... 4c7590a212

Author SHA1 Message Date
Markus Koch
4c7590a212 Only display search results 2020-04-19 20:21:13 +02:00
Markus Koch
e1baa251fb Fix Firefox compatibility once more 2020-04-19 20:12:57 +02:00
Markus Koch
d1e0c3fffa Fix x/y swap in jump_to function 2020-04-19 20:12:39 +02:00
1 changed files with 4 additions and 4 deletions
Show Stats Expand all files Collapse all files

8
htdocs/mapscript.js
View File

@ -184,7 +184,7 @@ function jump_to(latlng, zoom = -1) {
if (zoom == -1) if (zoom == -1)
zoom = mymap.getZoom(); zoom = mymap.getZoom();
if (!editor_mode) if (!editor_mode)
document.location.hash = "#" + Math.round(latlng.lat) + "," + Math.round(latlng.lng) + "," + zoom; document.location.hash = "#" + Math.round(latlng.lng) + "," + Math.round(latlng.lat) + "," + zoom;
else else
mymap.setView(latlng, zoom); mymap.setView(latlng, zoom);
} }
@ -235,6 +235,7 @@ function htmlEntities(str) {
var regex; var regex;
function search(e) { function search(e) {
var query = htmlEntities(document.getElementById("search_query").value); var query = htmlEntities(document.getElementById("search_query").value);
document.getElementById('search_results').innerHTML = "";
if (query.length > 0 || e.key == "Enter") { if (query.length > 0 || e.key == "Enter") {
results = document.createElement("ul"); results = document.createElement("ul");
for (var i = 0; i < layers._layers.length; i++) { for (var i = 0; i < layers._layers.length; i++) {
@ -248,7 +249,7 @@ function search(e) {
regex = new RegExp(query, 'i'); regex = new RegExp(query, 'i');
if (item.feature.properties.name.match(regex)) { if (item.feature.properties.name.match(regex)) {
el = document.createElement("li"); el = document.createElement("li");
el.innerHTML = "[" + layers._layers[i].name + "] " + '<a href="javascript:layers._layers[' + i + '].layer._layers[' + item._leaflet_id + '].fire(\'click\') ">' + item.feature.properties.name + "</a>"; el.innerHTML = "[" + layers._layers[i].name + "] " + '<a href="#" onclick="layers._layers[' + i + '].layer._layers[' + item._leaflet_id + '].fire(\'click\'); return false;">' + item.feature.properties.name + "</a>";
results.appendChild(el); results.appendChild(el);
} }
break; break;
@ -257,10 +258,9 @@ function search(e) {
} }
} }
} }
document.getElementById('search_results').innerHTML = "Search results for " + query;
document.getElementById('search_results').appendChild(results); document.getElementById('search_results').appendChild(results);
return false;
} }
return false;
} }
L.MyControl = L.Control.extend({ L.MyControl = L.Control.extend({