Jackson JSON deserialization didn't support WKT

Closes #175

Author: dsmiley

CHANGES.md

@@ -1,6 +1,6 @@
 ## VERSION 0.8
 
-DATE: unreleased
+DATE: _unreleased_
 
 * \#177: Improve conversion of a Circle to Shape. JtsShapeFactory allows converting from a Shape
   object to a JTS Geometry object. Geodetic circles now translate to a polygon that has points
@@ -13,6 +13,17 @@ DATE: unreleased
 * \#162: Fixed WKT & GeoJSON \[de\]serialization of "empty" points and geometrycollections.
   (Jeen Broekstra, David Smiley)
 
+* \#165: Added ShapeFactory.pointLatLon convenience method.
+ (MoeweX)
+
+* \#167: WKTWriter now has a means to customize the NumberFromat.
+ (MoeweX)
+ 
+* \#175: ShapesAsWKTModule, a Jackson databind module,
+ didn't deserialize WKT inside JSON to a Spatial4j Shape at all.
+ Now it does.  It continues to serialize correctly.
+ (David Smiley)
+  
 ## VERSION 0.7
 
 DATE: 27 December 2017

src/main/java/org/locationtech/spatial4j/io/jackson/ShapeDeserializer.java

@@ -220,7 +220,7 @@ public Shape deserialize(JsonParser jp, DeserializationContext ctxt)
       return read( jp, ctx.getShapeFactory() );
     }
     if (t.isScalarValue()) {
-      String txt = t.asString();
+      String txt = jp.getValueAsString();
       if(txt!=null && txt.length()>0) {
         try {
           return ctx.getFormats().read(txt);

src/test/java/org/locationtech/spatial4j/io/jackson/SimpleJacksonTest.java

@@ -8,43 +8,60 @@
 
 package org.locationtech.spatial4j.io.jackson;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import org.junit.Test;
+import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.spatial4j.context.jts.JtsSpatialContext;
 import org.locationtech.spatial4j.shape.RandomizedShapeTest;
-import org.locationtech.spatial4j.util.GeomBuilder;
+import org.locationtech.spatial4j.shape.jts.JtsShapeFactory;
 
 import java.io.IOException;
 
+import static org.junit.Assert.assertEquals;
+
 public class SimpleJacksonTest extends RandomizedShapeTest {
 
   public SimpleJacksonTest() {
     super(JtsSpatialContext.GEO);
   }
-  
-  @Test
-  public void testReadWrite() throws IOException {
 
-    GeomBuilder builder = new GeomBuilder();
-    
+  @Test
+  public void testReadWriteShapeAsGeoJSON() throws IOException {
     ObjectWithGeometry obj = new ObjectWithGeometry();
     obj.name = "Hello";
-    obj.shape = randomPointIn(ctx.getWorldBounds());
+    obj.shape = ctx.getShapeFactory().pointXY(11,12); // Spatial4j type
     obj.geo = null; //
-    
+
     ObjectMapper mapper = new ObjectMapper();
     mapper.enable(SerializationFeature.INDENT_OUTPUT);
     mapper.registerModule(new ShapesAsGeoJSONModule());
-//    mapper.registerModule(new ShapesAsWKTModule());
-    
+
     String json = mapper.writeValueAsString(obj);
-    
-    System.out.println( json );
-    
+
     ObjectWithGeometry out = mapper.readValue(json, ObjectWithGeometry.class);
+    assertEquals(obj.shape, out.shape);
+  }
+
+  @Test
+  public void testReadWriteJtsAsWKT() throws IOException {
+    final JtsShapeFactory shapeFactory = ((JtsSpatialContext) ctx).getShapeFactory();
+
+    ObjectWithGeometry obj = new ObjectWithGeometry();
+    obj.name = "Hello";
+    obj.shape = null;
+    obj.geo = shapeFactory.getGeometryFactory().createPoint(new Coordinate(11, 12)); // JTS type
+
+    ObjectMapper objectMapper = new ObjectMapper();
+    objectMapper.registerModule(new ShapesAsWKTModule());
+    objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+
+    String json = objectMapper.writeValueAsString(obj);
+
+    assertEquals("{\"name\":\"Hello\",\"geo\":\"POINT (11 12)\"}", json);
 
-    System.out.println( ">> AFTER <<" );
-    System.out.println( mapper.writeValueAsString(out) );
+    ObjectWithGeometry deserialized = objectMapper.readValue(json, ObjectWithGeometry.class);
+    assertEquals(obj.geo, deserialized.geo);
   }
 }