Release 1.5.2

build.gradle

@@ -75,8 +75,9 @@ dependencies {
  compile group: 'org.grails.plugins', name: 'ala-bootstrap3', version: '3.2.3'
  compile group: 'org.grails.plugins', name: 'ala-auth', version:'3.1.3'
  compile group: 'au.org.ala.plugins.grails', name: 'ala-citation-plugin', version: '1.0'
- runtime group: 'au.org.ala.plugins.grails', name: 'ala-charts-plugin', version: '2.0.1'
+ runtime group: 'au.org.ala.plugins.grails', name: 'ala-charts-plugin', version: '2.0.2-SNAPSHOT'
  compile group: 'au.org.ala.plugins.grails', name: 'images-client-plugin', version: '1.2'
+ compile "au.org.ala:data-quality-filter-service-client:1.0.0"
 }
 
 bootRun {

grails-app/assets/javascripts/species.show.js

@@ -103,7 +103,9 @@ function loadMap() {
 
  //add an occurrence layer for this taxon
  var taxonLayer = L.tileLayer.wms(SHOW_CONF.biocacheServiceUrl + "/mapping/wms/reflect?q=lsid:" +
- SHOW_CONF.guid + "&qc=" + SHOW_CONF.mapQueryContext + SHOW_CONF.additionalMapFilter, {
+ SHOW_CONF.guid + (SHOW_CONF.qualityProfile? "&qualityProfile="+SHOW_CONF.qualityProfile : "")
+ +"&qc=" + SHOW_CONF.mapQueryContext + SHOW_CONF.additionalMapFilter
+ , {
  layers: 'ALA:occurrences',
  format: 'image/png',
  transparent: true,
@@ -624,7 +626,7 @@ function loadGalleryType(category, start) {
  var url = SHOW_CONF.biocacheServiceUrl +
  '/occurrences/search.json?q=lsid:' +
  SHOW_CONF.guid +
- '&fq=multimedia:"Image"&pageSize=' + pageSize +
+ (SHOW_CONF.qualityProfile ? "&qualityProfile=" + SHOW_CONF.qualityProfile : "") + '&fq=multimedia:"Image"&pageSize=' + pageSize +
  '&facet=off&start=' + start + imageCategoryParams[category] + '&im=true&callback=?';
 
  //console.log("URL: " + url);

grails-app/init/bie/plugin/BootStrap.groovy

@@ -1,7 +1,14 @@
 package bie.plugin
 
+import au.org.ala.dataquality.api.DataProfilesApi
+import au.org.ala.dataquality.api.QualityServiceRpcApi
+import au.org.ala.dataquality.client.ApiClient
+import au.org.ala.dataquality.model.QualityProfile
+import retrofit2.Call
+
 class BootStrap {
  def messageSource
+ def grailsApplication
 
  def init = { servletContext ->
  messageSource.setBasenames(
@@ -30,8 +37,47 @@ class BootStrap {
  }
  return trimString
  }
+
+ initConfig()
  }
 
  def destroy = {
  }
+
+ void initConfig(){
+ //Check if qualityProfile is used
+ if ( grailsApplication.config.dataquality.enabled ) {
+ if (grailsApplication.config.dataquality.baseUrl) {
+ QualityServiceRpcApi api
+ DataProfilesApi dataProfilesApi
+ def apiClient = new ApiClient()
+ apiClient.adapterBuilder.baseUrl(grailsApplication.config.dataquality.baseUrl)
+
+ api = apiClient.createService(QualityServiceRpcApi)
+ def profile = (QualityProfile) responseOrThrow(api.activeProfile(null))
+ if (profile) {
+ grailsApplication.config.with {
+ qualityProfile = profile.shortName
+ }
+ log.info("Quality Profile: " + grailsApplication.config.qualityProfile)
+ }
+ } else {
+ log.warn("Data quality is enabled, but the url of data quality service is not defined!")
+ }
+ }
+ }
+
+ private <T> T responseOrThrow(Call<T> call) {
+ def response
+ try {
+ response = call.execute()
+ } catch (IOException e) {
+ log.error("IOException executing call {}", call.request(), e)
+ }
+ if (response.successful) {
+ return response.body()
+ } else {
+ log.error("Non-successful call {} returned response {}", call.request(), response)
+ }
+ }
 }

grails-app/views/species/_overview.gsp

@@ -91,7 +91,7 @@
  <div id="leafletMap"></div>
 
  <g:if test="${grailsApplication.config.spatial.baseURL}">
- <g:set var="mapUrl">${grailsApplication.config.spatial.baseURL}?q=lsid:${tc?.taxonConcept?.guid}</g:set>
+ <g:set var="mapUrl">${grailsApplication.config.spatial.baseURL}?q=lsid:${tc?.taxonConcept?.guid}${grailsApplication.config.qualityProfile ? '&qualityProfile=' + grailsApplication.config.qualityProfile : ''}</g:set>
  </g:if>
  <g:else>
  <g:set var="mapUrl">${biocacheUrl}/occurrences/search?q=lsid:${tc?.taxonConcept?.guid}#tab_mapView</g:set>

grails-app/views/species/search.gsp

@@ -38,7 +38,8 @@
  biocacheServicesUrl: "${grailsApplication.config.biocacheService.baseURL}",
  bhlUrl: "${grailsApplication.config.bhl.url}",
  biocacheQueryContext: '${raw(grailsApplication.config.biocacheService.queryContext)}',
- geocodeLookupQuerySuffix: "${grailsApplication.config.geocode.querySuffix}"
+ geocodeLookupQuerySuffix: "${grailsApplication.config.geocode.querySuffix}",
+ qualityProfile: "${grailsApplication.config.qualityProfile}"
  }
  </asset:script>
  <asset:javascript src="autocomplete-configuration"/>

grails-app/views/species/show.gsp

@@ -364,6 +364,7 @@
  var SHOW_CONF = {
  biocacheUrl: "${grailsApplication.config.biocache.baseURL}",
  biocacheServiceUrl: "${grailsApplication.config.biocacheService.baseURL}",
+ qualityProfile: "${grailsApplication.config.qualityProfile}",
  layersServiceUrl: "${grailsApplication.config.layersService.baseURL}",
  collectoryUrl: "${grailsApplication.config.collectory.baseURL}",
  profileServiceUrl: "${grailsApplication.config.profileService.baseURL}",
@@ -433,7 +434,8 @@
  biocacheWebappUrl="${grailsApplication.config.biocache.baseURL}"
  q="lsid:${guid}"
  qc="${grailsApplication.config.biocacheService.queryContext ?: ''}"
- fq=""/>
+ fq=""
+ />
  }
  if(target == '#overview'){
  loadMap();