Disable biocollect integration

Author: Adam Collins

grails-app/assets/javascripts/spApp/controller/leafletMapController.js

@@ -679,11 +679,12 @@
                                 }).addTo(map);
                             }
 
-                            if ($SH.biocollectUrl) {
-                                new L.Control.Poi({
-                                    togglePoi: $scope.togglePoi
-                                }).addTo(map);
-                            }
+                            // does not work with the current biocollect version
+                            // if ($SH.biocollectUrl) {
+                            //     new L.Control.Poi({
+                            //         togglePoi: $scope.togglePoi
+                            //     }).addTo(map);
+                            // }
 
                             var measureControl = new L.Control.Measure({
                                 position: 'topleft',
@@ -728,18 +729,20 @@
                                 if (e.target.imagesControl && e.target.imagesControl._images_state) {
                                     $scope.addImagesToMap();
                                 }
-                                if (e.target.poiControl && e.target.poiControl._poi_state) {
-                                    $scope.addPoiToMap();
-                                }
+                                // does not work with the current biocollect version
+                                // if (e.target.poiControl && e.target.poiControl._poi_state) {
+                                //     $scope.addPoiToMap();
+                                // }
                             });
 
                             map.on('zoomend', function (e) {
                                 if (e.target.imagesControl && e.target.imagesControl._images_state) {
                                     $scope.addImagesToMap();
                                 }
-                                if (e.target.poiControl && e.target.poiControl._poi_state) {
-                                    $scope.addPoiToMap();
-                                }
+                                // does not work with the current biocollect version
+                                // if (e.target.poiControl && e.target.poiControl._poi_state) {
+                                //     $scope.addPoiToMap();
+                                // }
                             });
 
                             $scope.bounds.southWest.lng = map.getBounds().getWest();

grails-app/controllers/au/org/ala/spatial/portal/BiocollectController.groovy

@@ -1,14 +1,13 @@
 package au.org.ala.spatial.portal
 
 import grails.converters.JSON
-import org.apache.http.client.methods.HttpGet
 import grails.util.Holders
+import org.apache.http.entity.ContentType
 
 
 class BiocollectController {
-    def hubWebService
+    def webService
     def authService
-    def allowCalls = ["/nocas/geoService"]
     String biocollectUrl = Holders.config.biocollect.url
 
     /**
@@ -20,22 +19,24 @@ class BiocollectController {
         if (!authService.userId || !isAllowed(url)) {
             notAuthorised()
         } else {
-            def headers = [:]
-            headers.put ("apiKey",grailsApplication.config.api_key)
-            def r = hubWebService.urlResponse(HttpGet.METHOD_NAME, url, null, headers)
+            def r = webService.get(url, [:], ContentType.APPLICATION_JSON, false, true, [:])
             return r
         }
     }
 
     private boolean isAllowed(url) {
         if (url.startsWith(biocollectUrl)) {
-            //url.matches(".*(?i)(Nocas|test).*")
-            String pattern = ".*(?i)("+ allowCalls.join("|") +").*"
-            return url.matches(pattern)
+            // must be one of the allowed URLs
+            List items = Holders.config.biocollect.areaReport
+            for (def item : items) {
+                if (item.count && url.startsWith(item.count.replace("_geoSearchJSON_", ""))) {
+                    return true
+                }
+            }
+            return false;
         } else {
             return false
         }
-
     }
 
     private def notAuthorised() {