fix for EYA - don't show absence data

AtlasOfLivingAustralia · Nov 13, 2017 · 9a9a466 · 9a9a466
1 parent 5090e9c
commit 9a9a466
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 179 deletions.
diff --git a/grails-app/assets/javascripts/yourAreaMap.js b/grails-app/assets/javascripts/yourAreaMap.js
@@ -41,7 +41,7 @@ var radiusForZoom = {
 };
 
 // Load Google maps via AJAX API
-if(EYA_CONF !== undefined && !EYA_CONF.hasGoogleKey){
+if(typeof EYA_CONF != 'undefined' && !EYA_CONF.hasGoogleKey){
  google.load("maps", "3.3", {other_params:"sensor=false"});
 }
 
@@ -372,7 +372,7 @@ function loadRecordsLayer(retry) {
         lat: $('#latitude').val(),
         lon: $('#longitude').val(),
         radius: $('#radius').val(),
-        fq: "geospatial_kosher:true",
+        fq: EYA_CONF.filters,
         qc: EYA_CONF.queryContext,
         zoom: zoom
     };
@@ -601,7 +601,7 @@ function groupClicked(el) {
         lat: $('#latitude').val(),
         lon: $('#longitude').val(),
         radius: $('#radius').val(),
-        fq: "geospatial_kosher:true",
+        fq: EYA_CONF.filters,
         qc: EYA_CONF.queryContext,
         pageSize: 50
     };
@@ -735,7 +735,7 @@ function processSpeciesJsonData(data, appendResults) {
                 lat: $('#latitude').val(),
                 lon: $('#longitude').val(),
                 radius: $('#radius').val(),
-                fq: "geospatial_kosher:true",
+                fq: EYA_CONF.filters,
                 start: start,
                 common: commonName,
                 sort: sortParam,
@@ -773,7 +773,7 @@ function loadGroups() {
         lat: $('#latitude').val(),
         lon: $('#longitude').val(),
         radius: $('#radius').val(),
-        fq: "geospatial_kosher:true",
+        fq: EYA_CONF.filters,
         facets: "species_group",
         qc: EYA_CONF.queryContext
     }

diff --git a/grails-app/conf/defaultConfig.groovy b/grails-app/conf/defaultConfig.groovy
@@ -90,6 +90,7 @@ exploreYourArea.lat = "-35.0"
 exploreYourArea.lng = "149.0"
 exploreYourArea.location = "Canberra, ACT"
 exploreYourArea.zoomLevels = [ 1: 14, 5: 12, 10: 11, 50: 9 ]
+exploreYourArea.filters = "geospatial_kosher:true AND occurrence_status:present"
 
 facets.includeDynamicFacets = "false" // sandbox
 facets.limit = "100"

diff --git a/grails-app/views/index.gsp.bak b/grails-app/views/index.gsp.bak
diff --git a/grails-app/views/index.gsp.new b/grails-app/views/index.gsp.new
diff --git a/grails-app/views/occurrence/exploreYourArea.gsp b/grails-app/views/occurrence/exploreYourArea.gsp
@@ -53,6 +53,7 @@
             imagesUrlPrefix: '${ raw(asset.assetPath(src: '/eya-images')) }',
             zoom: ${zoom},
             radius: ${radius},
+            filters: '${raw(grailsApplication.config.exploreYourArea.filters)}',
             speciesPageUrl: "${speciesPageUrl}",
             queryContext: "${queryContext}",
             locale: "${org.springframework.web.servlet.support.RequestContextUtils.getLocale(request)}",