diff options
| -rw-r--r-- | chimere/static/chimere/js/jquery.chimere.js | 25 | ||||
| -rw-r--r-- | version.py | 2 |
2 files changed, 20 insertions, 7 deletions
diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js index dbbc97d..04cf0f7 100644 --- a/chimere/static/chimere/js/jquery.chimere.js +++ b/chimere/static/chimere/js/jquery.chimere.js @@ -852,6 +852,10 @@ function transformCoordToLonLat(coord) { var current_feature = ''; if (settings[map_id].current_feature) current_feature = settings[map_id].current_feature.getId(); + var current_search = ""; + if ($("#id_q").val()){ + current_search = $("#id_q").val(); + } var routing_speed = ''; if (settings[map_id].routing_speed) routing_speed = settings[map_id].routing_speed; @@ -891,6 +895,7 @@ function transformCoordToLonLat(coord) { + layers + ';' + settings[map_id].checked_categories.join('-')+ ';' + current_feature + ';' + + current_search + ';' + routing_speed + ';' + routing_transport + ';' + routing_start + ';' @@ -952,17 +957,19 @@ function transformCoordToLonLat(coord) { } }); } + /* search */ + var current_search = items[5]; - var routing_speed = items[5]; + var routing_speed = items[6]; if (routing_speed) settings[map_id].routing_speed = routing_speed; - var routing_transport = items[6]; + var routing_transport = items[7]; if (routing_transport) settings[map_id].routing_transport = routing_transport; - var steps = items[9]; + var steps = items[10]; if (steps){ - for (var step_i = 9 ; step_i < items.length ; step_i++){ + for (var step_i = 10 ; step_i < items.length ; step_i++){ var coords = items[step_i].split(':'); coords = [Math.round(coords[0] * 1000) / 1000, Math.round(coords[1] * 1000) / 1000]; @@ -972,7 +979,7 @@ function transformCoordToLonLat(coord) { } } - var routing_start = items[7]; + var routing_start = items[8]; if (routing_start){ var coords = routing_start.split(':'); var geom = ol.proj.transform( @@ -983,7 +990,7 @@ function transformCoordToLonLat(coord) { methods.routingFrom(geom); } - var routing_end = items[8]; + var routing_end = items[9]; if (routing_end){ var coords = routing_end.split(':'); var geom = ol.proj.transform( @@ -1007,6 +1014,12 @@ function transformCoordToLonLat(coord) { settings[map_id].layerDbFeatures.dispatchEvent('change'); settings[map_id].clusterLayer.dispatchEvent('change'); settings[map_id].map.render(); + if (current_search){ + $("#id_q").val(current_search); + if (!current_feature){ + $("#haystack-search").click(); + } + } }, 1500); } @@ -1,4 +1,4 @@ -VERSION = (3, 1, 25) +VERSION = (3, 1, 26) def get_version(): |