Merge pull request #52 from geoscript/GSG-ISSUE49

Add geometry twkb reader

Author: jericks

src/main/groovy/geoscript/geom/io/TWkbReader.groovy

@@ -0,0 +1,43 @@
+package geoscript.geom.io
+
+import geoscript.geom.Geometry
+import org.geotools.data.postgis.TWKBReader
+import org.locationtech.jts.geom.GeometryFactory
+import org.locationtech.jts.io.WKBReader
+
+/**
+ * Read a {@link geoscript.geom.Geometry Geometry} from a TWKB hex String or byte array.
+ * <p><blockquote><pre>
+ * TWkbReader reader = new TWkbReader()
+ * {@link geoscript.geom.Point Point} pt = reader.read("01000204")
+ *
+ * POINT (1 2)
+ * </pre></blockquote></p>
+ * @author Jared Erickson
+ */
+class TWkbReader implements Reader {
+
+    /**
+     * The GeoTools TWKBReader
+     */
+    private final static TWKBReader reader = new TWKBReader(new GeometryFactory())
+
+    /**
+     * Read a Geometry from a String
+     * @param str The String
+     * @return A Geometry
+     */
+    Geometry read(String str) {
+        read(WKBReader.hexToBytes(str))
+    }
+
+    /**
+     * Read a Geometry from a byte array
+     * @param bytes The byte array
+     * @return A Geometry
+     */
+    Geometry read(byte[] bytes) {
+        Geometry.wrap(reader.read(bytes))
+    }
+
+}

src/main/resources/META-INF/services/geoscript.geom.io.Reader

@@ -8,4 +8,5 @@ geoscript.geom.io.KmlReader
 geoscript.geom.io.WkbReader
 geoscript.geom.io.WktReader
 geoscript.geom.io.GeoPackageReader
-geoscript.geom.io.GooglePolylineEncoder
+geoscript.geom.io.GooglePolylineEncoder
+geoscript.geom.io.TWkbReader

src/test/groovy/geoscript/geom/io/ReadersTestCase.groovy

@@ -19,6 +19,12 @@ class ReadersTestCase {
         Reader reader = Readers.find("wkt")
         assertNotNull reader
 
+        reader = Readers.find("wkb")
+        assertNotNull reader
+
+        reader = Readers.find("twkb")
+        assertNotNull reader
+
         reader = Readers.find("asdf")
         assertNull reader
     }

src/test/groovy/geoscript/geom/io/TWkbReaderTestCase.groovy

@@ -0,0 +1,18 @@
+package geoscript.geom.io
+
+import geoscript.geom.Geometry
+import org.junit.Test
+import static org.junit.Assert.assertEquals
+
+class TWkbReaderTestCase {
+
+    @Test
+    void read() {
+        TWkbReader reader = new TWkbReader()
+        Geometry geometry = reader.read("01000204")
+        assertEquals("POINT (1 2)", geometry.wkt)
+        geometry = reader.read("01000204".decodeHex())
+        assertEquals("POINT (1 2)", geometry.wkt)
+    }
+
+}