Merge pull request #50 from ossimlabs/OP-15

Op 15
ossimlabs · Aug 20, 2019 · ff106cc · ff106cc
2 parents bb6028d + d7a3694
commit ff106cc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/plugins/omar-geoscript-plugin/grails-app/init/omar/geoscript/OmarGeoScriptBootStrap.groovy b/plugins/omar-geoscript-plugin/grails-app/init/omar/geoscript/OmarGeoScriptBootStrap.groovy
@@ -39,7 +39,6 @@ class OmarGeoScriptBootStrap
       new JsonSlurper().parseText(it.geoJSON)
     }
 
-/*
     Function.registerFunction( "queryCollection" ) { String layerName, String attributeName, String filter ->
       def (workspace, layer) = getWorkspaceAndLayer( layerName )
       def results = layer?.collectFromFeature( filter ) { it[attributeName] }
@@ -52,8 +51,6 @@ class OmarGeoScriptBootStrap
 
       Class.forName( multiType ).newInstance( geometries )
     }
-*/    
-
   }
 
   def destroy = {

diff --git a/plugins/omar-geoscript-plugin/grails-app/services/omar/geoscript/GeoscriptService.groovy b/plugins/omar-geoscript-plugin/grails-app/services/omar/geoscript/GeoscriptService.groovy
@@ -202,6 +202,7 @@ class GeoscriptService implements InitializingBean
   @Override
   void afterPropertiesSet() throws Exception
   {
+/*    
 //    Thread.start {      
       Function.registerFunction( "queryCollection" ) { String layerName, String attributeName, String filter ->
         def (workspace, layer) = getWorkspaceAndLayer( layerName )
@@ -216,7 +217,7 @@ class GeoscriptService implements InitializingBean
         Class.forName( multiType ).newInstance( geometries )
       }
 //    }
-
+*/
     defaultMaxFeatures = grailsApplication.config.geoscript.defaultMaxFeatures as Integer
   }
 
@@ -488,6 +489,17 @@ class GeoscriptService implements InitializingBean
 
   def queryLayer(String typeName, Map<String,Object> options, String resultType='results', String featureFormat=null, Boolean includeNumberMatched=null)
   {
+    def info = [
+      name: 'queryLayer',
+      typeName: typeName,
+      options: options,
+      resultType: resultType,
+      featureFormat: featureFormat,
+      includeNumberMatched: includeNumberMatched
+    ]
+
+    log.info( info as String )
+
       def requestType = "GET"
       def requestMethod = "QueryLayer"
       Date startTime = new Date()