Map: manage a default limit to items displayed

2 files changed, 9 insertions, 1 deletions

diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html
index 7807769e5..2a757b6a4 100644
--- a/ishtar_common/templates/base.html
+++ b/ishtar_common/templates/base.html
@@ -35,6 +35,7 @@
     {{EXTRA_JS|safe}}
     <script type='text/javascript'>
     var static_path = "{{STATIC_URL}}";
+    var limit_map_nb = {{ISHTAR_MAP_MAX_ITEMS}};
     var shortcut_url = '{% url "shortcut-menu" %}';
     {% if DISPLAY_PIN_MENU %}var show_shortcut_menu = true;{% endif %}
     var alert_url = '{% url "alert-list" %}';
@@ -66,6 +67,8 @@
     var track_me_msg = "{% trans "Geolocalize me" %}";
     var geoloc_activated_msg = "{% trans "Geolocation activated" %}";
     var geoloc_disabled_msg = "{% trans "Geolocation disabled" %}";
+    var limit_map_msg = "{% trans "Limit to {0} items" %}";
+    var limit_map_help_msg = "{% trans "Unchecking this limit on a poorly performing device may result in web browser freeze" %}";
     </script>
     {% endcompress %}
     <link rel="stylesheet" href="{{STATIC_URL}}ol/ol.css?ver={{VERSION}}">
diff --git a/ishtar_common/templates/blocks/DataTables.html b/ishtar_common/templates/blocks/DataTables.html
index cf33a8cfa..75151615e 100644
--- a/ishtar_common/templates/blocks/DataTables.html
+++ b/ishtar_common/templates/blocks/DataTables.html
@@ -110,12 +110,17 @@ map_submit_search = function(){
     if (!nb_select) nb_select = 10;
 
     var url = "{{source}}json-map?length=" + nb_select + "&submited=1&" + data;
+    var use_map_limit = false;
+    if(data.indexOf("no_limit=true") == -1){
+        url += "&limit=" + current_map_limit;
+        use_map_limit = true;
+    }
     $.getJSON(url, function(data) {
         var timestamp = Math.floor(Date.now() / 1000);
         var map_id = "map-" + timestamp;
         $('.modal-progress .modal-header').html("{% trans 'Render map...' %}");
 
-        var html = render_map(map_id);
+        var html = render_map(map_id, use_map_limit);
         $("#tab-content-map-{{name}}").html(html);
         $("#id_{{name}}-length_map").change(map_submit_search);
         if ($('.modal-progress').length > 0){