fixes for local and remote image links

Author: djtfmartin

Diff for: BiocacheHubsGrailsPlugin.groovy

@@ -18,21 +18,20 @@ import grails.util.Environment
 
 class BiocacheHubsGrailsPlugin {
     // the plugin version
-    def version = "0.36"
+    def version = "0.37"
     // the version or versions of Grails the plugin is designed for
     def grailsVersion = "2.3 > *"
     // resources that are excluded from plugin packaging
     def pluginExcludes = [
             "grails-app/views/error.gsp"
     ]
 
-    // TODO Fill in these fields
     def title = "Biocache Hubs Plugin" // Headline display name of the plugin
     def author = "Nick dos Remedios"
     def authorEmail = "nick.dosremedios@csiro.au"
     def description = '''\
-A client web application for searching and displaying biodiversity data from the
-Atlas of Living Australia (ALA). Data access is via JSON REST web services from
+A client web application for searching and displaying biodiversity data from biocache web services.
+Data access is via JSON REST web services from
 the ALA biocache-service app (no local DB is required for this app).
 '''
 
@@ -48,7 +47,10 @@ the ALA biocache-service app (no local DB is required for this app).
     def organization = [ name: "Atlas of Living Australia", url: "http://www.ala.org.au/" ]
 
     // Any additional developers beyond the author specified above.
-    def developers = [ [ name: "Dave Martin", email: "david.martin@csiro.au" ]]
+    def developers = [
+            [ name: "Dave Martin", email: "david.martin@csiro.au" ],
+            [ name: "Dave Baird", email: "david.baird@csiro.au" ]
+    ]
 
     // Location of the plugin's issue tracker.
     def issueManagement = [ system: "Google Code", url: "https://code.google.com/p/ala/issues/list" ]
@@ -108,26 +110,17 @@ the ALA biocache-service app (no local DB is required for this app).
     }
 
     def doWithDynamicMethods = { ctx ->
-        // TODO Implement registering dynamic methods to classes (optional)
     }
 
     def doWithApplicationContext = { ctx ->
-        // TODO Implement post initialization spring config (optional)
     }
 
     def onChange = { event ->
-        // TODO Implement code that is executed when any artefact that this plugin is
-        // watching is modified and reloaded. The event contains: event.source,
-        // event.application, event.manager, event.ctx, and event.plugin.
     }
 
     def onConfigChange = { event ->
-        //this.mergeConfig(application)
-        // TODO Implement code that is executed when the project configuration changes.
-        // The event is the same as for 'onChange'.
     }
 
     def onShutdown = { event ->
-        // TODO Implement code that is executed when the application shuts down (optional)
     }
 }

Diff for: grails-app/conf/defaultConfig.groovy

@@ -51,7 +51,10 @@ biocache.downloads.extra = "dataResourceUid,dataResourceName.p"
 biocache.ajax.useProxy = false
 collections.baseUrl = "http://collections.ala.org.au"
 
-images.baseUrl="http://images.ala.org.au"
+// images
+images.baseUrl = "http://images.ala.org.au"
+images.viewerUrl = "http://images.ala.org.au/image/viewer?imageId="
+images.metadataUrl = "http://images.ala.org.au/image/details?imageId="
 
 // For sandbox environment
 //spatial.params = "&dynamic=true&ws=http%3A%2F%2Fsandbox.ala.org.au%2Fhubs-webapp&bs=http%3A%2F%2Fsandbox.ala.org.au%2Fbiocache-service"

Diff for: grails-app/controllers/au/org/ala/biocache/hubs/OccurrenceController.groovy

@@ -14,14 +14,11 @@
  */
 
 package au.org.ala.biocache.hubs
-
 import grails.converters.JSON
-import org.codehaus.groovy.grails.web.json.JSONArray
 import org.codehaus.groovy.grails.web.json.JSONElement
 import org.codehaus.groovy.grails.web.json.JSONObject
 
 import java.text.SimpleDateFormat
-
 /**
  * Controller for occurrence searches and records
  */
@@ -57,7 +54,7 @@ class OccurrenceController {
         List taxaQueries = (ArrayList<String>) params.list("taxa") // will be list for even one instance
         log.debug "skin.useAlaBie = ${grailsApplication.config.skin.useAlaBie}"
 
-        if (grailsApplication.config.skin.useAlaBie && !params.q && taxaQueries && taxaQueries[0]) { // check for list with empty string
+        if (grailsApplication.config.skin.useAlaBie && grailsApplication.config.skin.bie.baseUrl && !params.q && taxaQueries && taxaQueries[0]) { // check for list with empty string
             // taxa query - attempt GUID lookup via BIE
             List guidsForTaxa = webServicesService.getGuidsForTaxa(taxaQueries)
             requestParams.q = postProcessingService.createQueryWithTaxaParam(taxaQueries, guidsForTaxa)

Diff for: grails-app/i18n/messages.properties

@@ -130,8 +130,8 @@ show.sidebar03.title = Images
 show.sidebar03.cite01 = Photographer
 show.sidebar03.cite02 = Rights
 show.sidebar03.cite03 = Rights holder
-show.sidebardiv.occurrenceimages.navigator01 = Original image
-show.sidebardiv.occurrenceimages.navigator02 = Image details
+show.sidebardiv.occurrenceimages.navigator01 = View image details
+show.sidebardiv.occurrenceimages.navigator02 = View original image
 show.occurrencemap.title = Location of record
 show.soundsheader.title = Sounds
 show.sidebar04.cite = Rights

Diff for: grails-app/services/au/org/ala/biocache/hubs/WebServicesService.groovy

@@ -47,7 +47,7 @@ class WebServicesService {
     }
 
     def JSONArray getMapLegend(String queryString) {
-        def url = "${grailsApplication.config.biocache.baseUrl}/webportal/legend?${queryString}"
+        def url = "${grailsApplication.config.biocache.baseUrl}/mapping/legend?${queryString}"
         JSONArray json = getJsonElements(url)
         def facetName
         Map facetLabelsMap = [:]
@@ -158,7 +158,7 @@ class WebServicesService {
     @Cacheable('longTermCache')
     def Map getLayersMetaData() {
         Map layersMetaMap = [:]
-        def url = "${grailsApplication.config.spatial.baseUrl}/layers.json"
+        def url = "${grailsApplication.config.spatial.baseUrl}/ws/layers"
         def jsonArray = getJsonElements(url)
 
         jsonArray.each {

Diff for: grails-app/views/occurrence/_recordSidebar.gsp

@@ -1,4 +1,3 @@
-
 <g:if test="${collectionLogo}">
     <div class="sidebar">
         <img src="${collectionLogo}" alt="institution logo" id="institutionLogo"/>
@@ -212,9 +211,9 @@
         <div id="occurrenceImages" style="margin-top:5px;">
             <g:each in="${record.images}" var="image">
                 <div style="margin-bottom:10px;">
-                    <g:if test="${useImageService}">
-                        <a href="${grailsApplication.config.images.baseUrl}/image/view?imageId=${image.filePath}" target="_blank">
-                            <img src="${image.alternativeFormats.smallImageUrl}" style="max-width: 100%;"/>
+                    <g:if test="${grailsApplication.config.skin.useAlaImageService.toBoolean()}">
+                        <a href="${grailsApplication.config.images.viewerUrl}${image.filePath}" target="_blank">
+                            <img src="${image.alternativeFormats.smallImageUrl}" style="max-width: 100%;" alt="Click to view this image in a large viewer"/>
                         </a>
                     </g:if>
                     <g:else>
@@ -232,8 +231,8 @@
                     <g:if test="${record.raw.occurrence.rightsholder}">
                         <cite><g:message code="show.sidebar03.cite03" default="Rights holder"/>: ${record.raw.occurrence.rightsholder}</cite><br/>
                     </g:if>
-                    <g:if test="${useImageService}">
-                        <a href="${grailsApplication.config.images.baseUrl}/image/details?imageId=${image.filePath}" target="_blank"><g:message code="show.sidebardiv.occurrenceimages.navigator01" default="Image details"/></a>
+                    <g:if test="${grailsApplication.config.skin.useAlaImageService.toBoolean()}">
+                        <a href="${grailsApplication.config.images.images.metadataUrl}${image.filePath}" target="_blank"><g:message code="show.sidebardiv.occurrenceimages.navigator01" default="View image details"/></a>
                     </g:if>
                     <g:else>
                         <a href="${image.alternativeFormats.imageUrl}" target="_blank"><g:message code="show.sidebardiv.occurrenceimages.navigator02" default="Original image"/></a>

Diff for: grails-app/views/occurrence/show.gsp

@@ -11,7 +11,6 @@
 <g:set var="bieWebappContext" value="${grailsApplication.config.bie.baseUrl}"/>
 <g:set var="collectionsWebappContext" value="${grailsApplication.config.collections.baseUrl}"/>
 <g:set var="useAla" value="${grailsApplication.config.skin.useAlaBie?.toBoolean() ? 'true' : 'false'}"/>
-<g:set var="useImageService" value="${grailsApplication.config.skin.useAlaImageService?.toBoolean()} "/>
 <g:set var="taxaLinks" value="${grailsApplication.config.skin.taxaLinks}"/>
 <g:set var="dwcExcludeFields" value="${grailsApplication.config.dwc.exclude}"/>
 <g:set var="hubDisplayName" value="${grailsApplication.config.skin.orgNameLong}"/>