1 files changed, 19 insertions, 17 deletions

diff --git a/ishtar_common/static/js/ishtar-map.js b/ishtar_common/static/js/ishtar-map.js
index 56694772b..4d6ebcd48 100644
--- a/ishtar_common/static/js/ishtar-map.js
+++ b/ishtar_common/static/js/ishtar-map.js
@@ -619,12 +619,12 @@ var display_map = function(map_id, points, lines_and_polys, layers){
     } else {
         initialize_base_map(map_id, layers);
     }
-    console.log('map init')
-    console.log(map[map_id]);
+    //console.log('map init')
+    //console.log(map[map_id]);
     display_points(map_id, points);
     display_lines_and_polys(map_id, lines_and_polys);
-    console.log('map after points');
-    console.log(map[map_id]);
+    //console.log('map after points');
+    //console.log(map[map_id]);
 
     init_popup(map_id);
 
@@ -637,8 +637,8 @@ var display_map = function(map_id, points, lines_and_polys, layers){
 };
 
 var display_points = function(map_id, points){
-    console.log('points');
-    console.log(points);
+    //console.log('points');
+    //console.log(points);
     if (!points) return;
     point_features[map_id] = geojson_format.readFeatures(points);
     enable_clustering(map_id);
@@ -667,8 +667,8 @@ var display_lines_and_polys = function(map_id, lines_and_polys){
     }
 };
 
-var disp_geo_items = function(map_id, base_url, slug, pk,
-                              display_both, get_poly) {
+var display_geo_items = function(map_id, base_url, slug, pk,
+                              disp_cr, disp_bf, get_poly) {
     var url = base_url;
     if (slug === "operation") {
         url += "?operation_pk=";
@@ -683,7 +683,7 @@ var disp_geo_items = function(map_id, base_url, slug, pk,
     httpRequest.onreadystatechange = function() {
         if (httpRequest.readyState === XMLHttpRequest.DONE) {
             if (httpRequest.status === 200) {
-                geo_items = to_geo_items(JSON.parse(httpRequest.responseText), slug, display_both)
+                geo_items = to_geo_items(JSON.parse(httpRequest.responseText), slug, disp_cr, disp_bf)
                 if (current_test) {
                     geo_items_features[map_id] = [];
                 }
@@ -718,17 +718,19 @@ var disp_geo_items = function(map_id, base_url, slug, pk,
     httpRequest.send();
 };
 
-var to_geo_items = function (obj, slug, display_both) {
-    var objects = {'context-records': [], 'base-finds': []};
+var to_geo_items = function (obj, slug, disp_cr, disp_bf) {
+    const objects = {'context-records': [], 'base-finds': []};
     if (slug === "operation") {
-        var crs = obj['properties']['context-records'];
-        for (cr of crs['features']) {
-            if (display_both) {
+        const crs = obj['properties']['context-records'];
+        for (const cr of crs['features']) {
+            if (disp_bf) {
                 objects['base-finds'].push(cr['properties']['base-finds'])
             }
             delete cr['properties'];
         }
-        objects['context-records'].push(crs);
+        if (disp_cr) {
+            objects['context-records'].push(crs);
+        }
     }
     else {
         objects['base-finds'].push(obj['properties']['base-finds'])
@@ -778,8 +780,8 @@ var get_associated_context_record_style = function (feature) {
 };
 
 var display_associated_points = function (map_id, points, slug) {
-    console.log('geo items points')
-    console.log(points);
+    //console.log('geo items points')
+    //console.log(points);
     /*_point_features = geojson_format.readFeatures(points);
     _cluster_source = new ol.source.Cluster({
         distance: 40,