2 files changed, 11 insertions, 7 deletions
diff --git a/ishtar_common/templates/blocks/DataTables.html b/ishtar_common/templates/blocks/DataTables.html
index 3e0faffd0..cf33a8cfa 100644
--- a/ishtar_common/templates/blocks/DataTables.html
+++ b/ishtar_common/templates/blocks/DataTables.html
@@ -114,14 +114,15 @@ map_submit_search = function(){
         var timestamp = Math.floor(Date.now() / 1000);
         var map_id = "map-" + timestamp;
         $('.modal-progress .modal-header').html("{% trans 'Render map...' %}");
-        var result = render_map(data, "{{name}}", nb_select, map_id);
-        $("#tab-content-map-{{name}}").html(result["html"]);
+
+        var html = render_map(map_id);
+        $("#tab-content-map-{{name}}").html(html);
         $("#id_{{name}}-length_map").change(map_submit_search);
         if ($('.modal-progress').length > 0){
             $('.modal-progress').modal('hide');
             $('.modal-progress .modal-header').html(modal_base_text);
         }
-        register_map(map_id, result["points"]);
+        register_map(map_id, data);
     });
 
     return false;
diff --git a/ishtar_common/templates/ishtar/blocks/sheet_simple_map.html b/ishtar_common/templates/ishtar/blocks/sheet_simple_map.html
index bf25db653..d0ec50b5f 100644
--- a/ishtar_common/templates/ishtar/blocks/sheet_simple_map.html
+++ b/ishtar_common/templates/ishtar/blocks/sheet_simple_map.html
@@ -1,8 +1,12 @@
 {% if geo_item.point_2d or geo_item.multi_polygon %}
-<div class="window-map"
-     id="map-{{window_id}}-{{geo_item.SLUG}}-{{geo_item.pk}}"></div>
-
+<div class="col-12 col-lg-6 flex-wrap">
+<div class="window-map" id="map-{{window_id}}-{{geo_item.SLUG}}-{{geo_item.pk}}">
+</div>
+<div id="map-content-{{window_id}}-{{geo_item.SLUG}}-{{geo_item.pk}}"></div>
+</div>
 <script type="text/javascript">
+var html = render_map("map-{{window_id}}-{{geo_item.SLUG}}-{{geo_item.pk}}");
+$("#map-content-{{window_id}}-{{geo_item.SLUG}}-{{geo_item.pk}}").html(html);
 {% if geo_item.point_source == 'P' or not geo_item.multi_polygon %}
 var {{geo_item.SLUG}}{{geo_item.pk}} = {{geo_item.point_2d_geojson|safe}};
 display_map("map-{{window_id}}-{{geo_item.SLUG}}-{{geo_item.pk}}", {{geo_item.SLUG}}{{geo_item.pk}});
@@ -11,5 +15,4 @@ var {{geo_item.SLUG}}{{geo_item.pk}} = {{geo_item.multi_polygon_geojson|safe}};
 display_map("map-{{window_id}}-{{geo_item.SLUG}}-{{geo_item.pk}}", null, {{geo_item.SLUG}}{{geo_item.pk}});
 {% endif %}
 </script>
-
 {% endif %}