address issues from testing

Author: Adam Collins

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

@@ -484,7 +484,7 @@
                                     if (data[pt] instanceof Array) {
                                         g = [data[pt][1], data[pt][2]];
                                     } else {
-                                        g = data[pt].geometry.replace("POINT(", "").replace(")", "").split(" ");
+                                        g = data[pt].geometry.replace("POINT (", "").replace(")", "").split(" ");
                                     }
                                     var m = L.marker([g[1], g[0]])
                                         .bindLabel(data[pt].name, {noHide: true});
@@ -772,4 +772,4 @@
                 }, 0)
 
             }])
-}(angular));
+}(angular));

grails-app/assets/javascripts/spApp/directive/spLegend.js

@@ -301,17 +301,15 @@
                             var currentLayer = scope.selected.layer;
                             var selectedStyle = currentLayer.style
 
-                            if (currentLayer.metadataUrl != undefined) {
-                                //Raster style
-                                if (selectedStyle == 'non-linear') selectedStyle = currentLayer.defaultStyle   //e.g geomacs_gmean
-                                if (selectedStyle == 'linear') selectedStyle = currentLayer.defaultStyle + '_linear'
-                                //Vector sytle
-                                if (selectedStyle == 'default') selectedStyle = currentLayer.defaultStyle  //e.g cl1084
-                                if (selectedStyle == 'outline') selectedStyle = 'outline'
-                                if (selectedStyle == 'filled') selectedStyle = 'polygon'
-                                currentLayer.leaflet.layerOptions.layers[0].layerParams.styles = selectedStyle
-                                currentLayer.leaflet.layerOptions.layers[0].legendurl = currentLayer.leaflet.layerOptions.layers[0].legendurl.replace(/&style=[^&]*/, "&style=" + encodeURIComponent(selectedStyle));
-                            }
+                            //Raster style
+                            if (selectedStyle == 'non-linear') selectedStyle = currentLayer.defaultStyle   //e.g geomacs_gmean
+                            if (selectedStyle == 'linear') selectedStyle = currentLayer.defaultStyle + '_linear'
+                            //Vector sytle
+                            if (selectedStyle == 'default') selectedStyle = currentLayer.defaultStyle  //e.g cl1084
+                            if (selectedStyle == 'outline') selectedStyle = 'outline'
+                            if (selectedStyle == 'filled') selectedStyle = 'polygon'
+                            currentLayer.leaflet.layerOptions.layers[0].layerParams.styles = selectedStyle
+                            currentLayer.leaflet.layerOptions.layers[0].legendurl = currentLayer.leaflet.layerOptions.layers[0].legendurl.replace(/&style=[^&]*/, "&style=" + encodeURIComponent(selectedStyle));
 
                             $timeout(function () {
                                 MapService.reloadLayer(currentLayer)

grails-app/assets/javascripts/spApp/service/flickrService.js

@@ -21,15 +21,16 @@
             return {
                 getPhotos: function (bbox) {
                     var url = $SH.flickrUrl + $SH.flickrSearchPhotos
-                        + '&api_key=' + $SH.flickrApiKey + '&extras=' + encodeURIComponent($SH.flickrExtra)
-                        + '&tags=' + encodeURIComponent($SH.flickrTags)
-                        + '&geo_context=' + encodeURIComponent($SH.flickrGeoContext)
-                        + '&content_type=' + encodeURIComponent($SH.flickrContentType)
-                        + $SH.flickrFilter
+                        + '&api_key=' + $SH.flickrApiKey
                         + '&per_page=' + $SH.flickrNbrOfPhotosToDisplay
-                        + '&format=json&nojsoncallback=1&bbox=';
+                        + '&format=json&nojsoncallback=1&bbox=' + bbox;
+                    if ($SH.flickrExtra != '') url += '&extras=' + encodeURIComponent($SH.flickrExtra)
+                    if ($SH.flickrTags != '') url += '&tags=' + encodeURIComponent($SH.flickrTags)
+                    if ($SH.flickrGeoContext != '') url += '&geo_context=' + encodeURIComponent($SH.flickrGeoContext)
+                    if ($SH.flickrContentType != '') url += '&content_type=' + encodeURIComponent($SH.flickrContentType)
+                    if ($SH.flickrFilter != '') url += $SH.flickrFilter
 
-                    return $http.get(url + bbox, _httpDescription('getPhotos')).then(function (response) {
+                    return $http.get(url, _httpDescription('getPhotos')).then(function (response) {
                         return response.data;
                     });
                 },

grails-app/assets/javascripts/spApp/service/mapService.js

@@ -731,9 +731,12 @@
                                 var url = layer.layer.displaypath
                                 url = url.replace(/\?.*/, '')
 
+                                var source = 'analysis'
                                 if (layer.id.startsWith("el") || id.layertype == 'gridAsContextual') {
+                                    source = 'environmental'
                                     id.defaultStyle = layer.layer.name
                                 } else if (layer.id.startsWith("cl")) {
+                                    source = 'contextual'
                                     id.defaultStyle = layer.id
                                 }
 
@@ -751,14 +754,17 @@
                                     opacity: id.opacity / 100.0,
                                     url: url,
                                     layertype: id.layertype,
+                                    source: source,
                                     layerParams: {
                                         opacity: id.opacity / 100.0,
                                         layers: 'ALA:' + layer.layer.name,
                                         format: 'image/png',
-                                        transparent: true,
-                                        styles: style || id.id
+                                        transparent: true
                                     }
                                 };
+                                if (source != 'analysis' && !style) {
+                                    newLayer.layerParams.styles = style || id.id
+                                }
 
                                 if (id.layertype === 'scatterplotEnvelope') {
                                     var layer2 = LayersService.getLayer(id.layer2);

grails-app/assets/javascripts/spApp/service/toolExportSampleService.js

@@ -73,7 +73,7 @@
 
                             //include redirect to biocache-service/occurrences/search page
                             var sampleUrl = _this.species.ws + '/download/options1?searchParams=' +
-                                encodeURIComponent('q=' + query.qid) +
+                                encodeURIComponent('?q=' + encodeURIComponent(query.qid)) +
                                 "&targetUri=/occurrences/search%3F&downloadType=records";
 
                             if (_this.layers && (_this.layers.length > 0)) {

grails-app/assets/javascripts/spApp/templates/legendContent.tpl.htm

@@ -312,7 +312,7 @@
         </div>
 
         <div class="form-group row"
-             ng-show="selected.layer.layertype == 'grid' && selected.layer.metadataUrl == undefined">
+             ng-show="selected.layer.layertype == 'grid' && selected.layer.id.startsWith('el')">
             <label i18n="529" style=";width:70px">Style</label>
             <select style=";width:300px" id='gridStyle' ng-model="selected.layer.style"
                     ng-change="updateStyle()" testTag="layerStyleInLegend">

grails-app/conf/application.yml

@@ -647,8 +647,8 @@ environments:
         grails:
           serverURL: "http://local.ala.org.au:8087"
         layersService:
-#          url: "http://localhost:8081/ws"
-          url: "https://spatial.ala.org.au/ws"
+          url: "http://localhost:8081/ws"
+#          url: "https://spatial.ala.org.au/ws"
         geoserver:
           url: 'http://localhost:8079/geoserver'
     test:

grails-app/conf/logback.xml

@@ -12,8 +12,8 @@
         </encoder>
     </appender>
 
-    <logger name="org.hibernate.orm.deprecation" level="OFF"/>
-    <logger name="org.grails.config.NavigableMap" level="OFF"/>
+    <logger name="org.hibernate.orm.deprecation" level="ERROR"/>
+    <logger name="org.grails.config.NavigableMap" level="ERROR"/>
 
     <root level="info">
         <appender-ref ref="STDOUT" />

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

@@ -291,7 +291,7 @@ class PortalController {
         } else {
             def type = id
             MultipartFile mFile = ((MultipartHttpServletRequest) request).getFile('shapeFile')
-            def settings = [api_key: grailsApplication.config.api_key]
+            def settings = [apiKey: grailsApplication.config.api_key]
 
             String ce = grailsApplication.config.character.encoding