Fix Workspace lookup issues.

Author: jericks

src/main/groovy/geoscript/workspace/Directory.groovy

@@ -133,12 +133,15 @@ class Directory extends Workspace {
             Map params = [:]
             if (!str.contains("=") && str.endsWith(".shp")) {
                 if (str.startsWith("file:/")) {
-                    params.put("url", URLs.fileToUrl(URLs.urlToFile(new URL(str)).getAbsoluteFile().getParentFile()))
+                    params.put("type","shapefile")
+                    params.put("file", URLs.urlToFile(new URL(str)).getAbsoluteFile().getParentFile())
                 } else {
-                    params.put("url", URLs.fileToUrl(new File(str).getAbsoluteFile().getParentFile()))
+                    params.put("type","shapefile")
+                    params.put("file",new File(str).getAbsoluteFile().getParentFile())
                 }
             } else if (!str.contains("=") && new File(str).isDirectory()) {
-                params.put("url", new File(str).toURL())
+                params.put("type","shapefile")
+                params.put("file", new File(str))
             } else {
                 params = super.getParametersFromString(str)
             }
@@ -149,7 +152,10 @@ class Directory extends Workspace {
         Directory create(String type, Map params) {
             if (type.equalsIgnoreCase('shapefile') && params.containsKey('file')) {
                 File file = params.get('file') instanceof File ? params.get('file') : new File(params.get('file'))
-                super.create([url: URLs.fileToUrl(file.absoluteFile)])
+                if (!file.isDirectory()) {
+                    file = file.parentFile
+                }
+                new Directory(file)
             } else if (type.equalsIgnoreCase('shapefile') && params.containsKey('url') && params.containsKey("dir")) {
                 URL url = params.get('url') instanceof URL ? params.get('url') : new URL(params.get('url'))
                 File dir = params.get('dir') instanceof File ? params.get('dir') : new File(params.get('dir'))
@@ -159,7 +165,7 @@ class Directory extends Workspace {
                 File file = File.createTempFile("download",".zip")
                 GeoScript.download(url, file, overwrite: params.get("overwrite", true) as boolean)
                 GeoScript.unzip(file, dir)
-                super.create([url: URLs.fileToUrl(dir.absoluteFile)])
+                new Directory(dir)
             } else {
                 null
             }

src/main/groovy/geoscript/workspace/FlatGeobuf.groovy

@@ -74,6 +74,7 @@ class FlatGeobuf extends Workspace {
                 if (!file.isDirectory()) {
                     file = file.parentFile
                 }
+                params.put("type", "flatgeobuf")
                 params.put("url", URLs.fileToUrl(file))
             } else {
                 params = super.getParametersFromString(str)
@@ -85,7 +86,6 @@ class FlatGeobuf extends Workspace {
         FlatGeobuf create(String type) {
             if (!type.contains("=") && type.endsWith(".fgb")) {
                 File file = new File(type)
-                println "File = ${file.absolutePath}"
                 new FlatGeobuf(file.isDirectory() ? file : file.getParentFile())
             } else {
                 null

src/main/groovy/geoscript/workspace/Geobuf.groovy

@@ -92,6 +92,7 @@ class Geobuf extends Workspace {
                 if (!file.isDirectory()) {
                     file = file.parentFile
                 }
+                params.put("type", "geobuf")
                 params.put("file", file.absolutePath)
             } else {
                 params = super.getParametersFromString(str)
@@ -106,7 +107,7 @@ class Geobuf extends Workspace {
                 if (!file.isDirectory()) {
                     file = file.parentFile
                 }
-                super.create([file: file])
+                new Geobuf(file)
             } else {
                 null
             }

src/main/groovy/geoscript/workspace/Workspace.groovy

@@ -1,6 +1,5 @@
 package geoscript.workspace
 
-import geoscript.GeoScript
 import geoscript.feature.Feature
 import geoscript.feature.Field
 import geoscript.feature.Schema

src/test/groovy/geoscript/workspace/WorkspaceTestCase.groovy

@@ -95,9 +95,10 @@ class WorkspaceTestCase {
 
         // Shapefile
         params = Workspace.getParametersFromString("/my/states.shp")
-        assertTrue(params.containsKey("url"))
-        assertTrue(params["url"] instanceof URL)
-        assertTrue(params["url"].toString().endsWith("my"))
+        assertEquals("shapefile", params.type)
+        assertTrue(params.containsKey("file"))
+        assertTrue(params["file"] instanceof File)
+        assertTrue(params["file"].toString().endsWith("my"))
 
         params = Workspace.getParametersFromString("url='/my/states.shp' 'create spatial index'=true")
         assertTrue(params.containsKey("url"))