summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-03-22 16:19:51 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-03-22 16:19:51 +0100
commitdc7157fdec4e84b8439ae5081dad7ed112ec7ff4 (patch)
tree408dfb4d7fb6c3cfafa8fea37997cc13d74a7063
parentf65fd648b5def270a2e3f3b5cfeb75576aa3751c (diff)
downloadChimère-dc7157fdec4e84b8439ae5081dad7ed112ec7ff4.tar.bz2
Chimère-dc7157fdec4e84b8439ae5081dad7ed112ec7ff4.zip
JS: fix search display on map
-rw-r--r--chimere/static/chimere/js/search.js2
-rw-r--r--chimere/templates/search/search_js.html15
2 files changed, 9 insertions, 8 deletions
diff --git a/chimere/static/chimere/js/search.js b/chimere/static/chimere/js/search.js
index 97bba43..4ccc1f3 100644
--- a/chimere/static/chimere/js/search.js
+++ b/chimere/static/chimere/js/search.js
@@ -7,7 +7,7 @@ function load_search_box(){
function haystack_search(evt, page){
search_result = new Array();
- $('#categories').find('#ul_categories > li > input').attr("checked", false);
+ $('#categories').find('#ul_categories > li > input').prop("checked", false);
if (!$('#id_q').val()){
$('.ac-results').remove();
$('#search-result').html('').show('slow');
diff --git a/chimere/templates/search/search_js.html b/chimere/templates/search/search_js.html
index 814a3f4..2d545b4 100644
--- a/chimere/templates/search/search_js.html
+++ b/chimere/templates/search/search_js.html
@@ -11,11 +11,12 @@ $(function(){
geo_objects.push(c_lst[idx]);
}{% endif %}
var geo_features = {};
- for (idx=0 ; idx < geo_objects.length ; idx++){
- var c_idx = geo_objects[idx].properties.pk;
- if (search_result.indexOf(c_idx) == -1){
- search_result.push(c_idx);
- var geom_type = geo_objects[idx].geometry.type;
+ for (idx_obj=0 ; idx_obj < geo_objects.length ; idx_obj++){
+ var c_idx_obj = geo_objects[idx_obj].properties.pk;
+
+ if (search_result.indexOf(c_idx_obj) == -1){
+ search_result.push(c_idx_obj);
+ var geom_type = geo_objects[idx_obj].geometry.type;
if (geom_type == 'Point'){
action = 'addMarker';
} else if (geom_type == 'LineString'){
@@ -25,8 +26,8 @@ $(function(){
} else {
continue
}
- geo_features[c_idx] = $('#main-map').chimere(action,
- geo_objects[idx]);
+ geo_features[c_idx_obj] = $('#main-map').chimere(action,
+ geo_objects[idx_obj]);
}
}
if (geo_objects.length){