diff options
Diffstat (limited to 'ishtar_common/static/js/ishtar-map.js')
| -rw-r--r-- | ishtar_common/static/js/ishtar-map.js | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ishtar_common/static/js/ishtar-map.js b/ishtar_common/static/js/ishtar-map.js index 67d29cc48..e2090eec6 100644 --- a/ishtar_common/static/js/ishtar-map.js +++ b/ishtar_common/static/js/ishtar-map.js @@ -58,12 +58,16 @@ var _map_submit_search = function(query_vars, name, source, extra){ url += "&limit=" + current_map_limit; use_map_limit = true; } + var display_polygons = false; + if(data.indexOf("display_polygon=true") != -1){ + display_polygons = true; + } $.getJSON(url, function(data) { var timestamp = Math.floor(Date.now() / 1000); var map_id = "map-" + extra + "-" + timestamp; $('.modal-progress .modal-header').html("{% trans 'Render map...' %}"); - var html = render_map(map_id, use_map_limit); + var html = render_map(map_id, use_map_limit, false, display_polygons); $("#tab-content-map-" + name + " #map-" + name + "-" + extra).html(html); $("#id_" + name + "-length_map").change(map_submit_search); if ($('.modal-progress').length > 0){ @@ -716,7 +720,8 @@ var display_map = function(map_id, points, lines_and_polys, layers){ } else { initialize_base_map(map_id, layers); } - display_points(map_id, points, true); + if (lines_and_polys) display_lines_and_polys(map_id, lines_and_polys, true); + if (points) display_points(map_id, points, true); init_popup(map_id); |