add more geo tests, fix the way json-property elements are serialized

Author: sammefford

src/main/java/com/marklogic/client/query/StructuredQueryBuilder.java

@@ -1814,10 +1814,9 @@ void innerSerialize(XMLStreamWriter serializer) throws Exception {
         	serializer.writeEndElement();
         }
     }
-    class JSONPropertyImpl extends ElementImpl implements JSONProperty {
+    class JSONPropertyImpl extends IndexImpl implements JSONProperty {
     	String name;
     	JSONPropertyImpl(String name) {
-    		super(name);
     		this.name = name;
     	}
         @Override
@@ -1848,12 +1847,20 @@ class GeoElementImpl extends IndexImpl implements GeospatialIndex {
     	}
         @Override
         void innerSerialize(XMLStreamWriter serializer) throws Exception {
-        	if (parent != null) {
+        	if (parent != null && parent instanceof ElementImpl) {
         		ElementImpl parentImpl  = (ElementImpl) parent;
         		serializeNamedIndex(serializer, "parent",  parentImpl.qname,  parentImpl.name);
+        	} else if (parent != null && parent instanceof IndexImpl) {
+        		IndexImpl parentImpl  = (IndexImpl) parent;
+        		parentImpl.innerSerialize(serializer);
+        	}
+        	if ( element instanceof ElementImpl ) {
+        		ElementImpl elementImpl = (ElementImpl) element;
+        		serializeNamedIndex(serializer, "element", elementImpl.qname, elementImpl.name);
+        	} else if ( element instanceof IndexImpl ) {
+        		IndexImpl indexImpl  = (IndexImpl) element;
+        		indexImpl.innerSerialize(serializer);
         	}
-        	ElementImpl elementImpl = (ElementImpl) element;
-        	serializeNamedIndex(serializer, "element", elementImpl.qname, elementImpl.name);
         }
     }
     class GeoElementPairImpl extends IndexImpl implements GeospatialIndex {

src/test/java/com/marklogic/client/test/BulkReadWriteTest.java

@@ -300,6 +300,9 @@ public static City newCity(String line, Map<String, Country> countries) {
               .setAlternateNames( fields[3].split(",") );
             if ( !fields[4].equals("") ) city.setLatitude( Double.parseDouble(fields[4]) );
             if ( !fields[5].equals("") ) city.setLongitude( Double.parseDouble(fields[5]) );
+            if ( !fields[4].equals("") && !fields[5].equals("") ) {
+                city.setLatLong( fields[4] + " " + fields[5] );
+            }
             if ( !fields[14].equals("") ) city.setPopulation( Long.parseLong(fields[14]) );
             if ( !fields[16].equals("") ) city.setElevation( Integer.parseInt(fields[16]) );
             if ( !fields[8].equals("") ) {

src/test/java/com/marklogic/client/test/City.java

@@ -27,6 +27,7 @@ public class City {
     private String[] alternateNames;
     private double latitude;
     private double longitude;
+    private String latLong;
     private String countryIsoCode;
     private String countryName;
     private String continent;
@@ -90,6 +91,15 @@ public City setLongitude(double longitude) {
         return this;
     }
 
+    public String getLatLong() {
+        return latLong;
+    }
+
+    public City setLatLong(String latLong) {
+        this.latLong = latLong;
+        return this;
+    }
+
     public String getCountryIsoCode() {
         return countryIsoCode;
     }

src/test/java/com/marklogic/client/test/PojoFacadeTest.java

@@ -132,6 +132,38 @@ public void testC_QueryPojos() throws Exception {
         assertEquals("Failed to find number of records expected", 11, numRead);
         assertEquals("PojoPage failed to report number of records expected", numRead, page.size());
 
+        query = qb.geospatial(
+            qb.geoField("latLong"),
+            qb.circle(-34, -58, 1)
+        );
+        page = repository.search(query, 1);
+        iterator = page.iterator();
+        numRead = 0;
+        while ( iterator.hasNext() ) {
+            City city = iterator.next();
+            numRead++;
+        }
+        // this currently doesn't work even in the cts:search layer
+        // when this works we'll find out how many we expect
+        assertEquals("Failed to find number of records expected", -1, numRead);
+        assertEquals("PojoPage failed to report number of records expected", numRead, page.size());
+
+        query = qb.geospatial(
+            qb.geoPath("latLong"),
+            qb.circle(-34, -58, 100)
+        );
+        page = repository.search(query, 1);
+        iterator = page.iterator();
+        numRead = 0;
+        while ( iterator.hasNext() ) {
+            City city = iterator.next();
+            numRead++;
+        }
+        // this currently doesn't work even in the cts:search layer
+        // when this works we'll find out how many we expect
+        assertEquals("Failed to find number of records expected", -1, numRead);
+        assertEquals("PojoPage failed to report number of records expected", numRead, page.size());
+
         query = qb.geospatial(
             qb.geoPair("latitude", "longitude"),
             qb.circle(-34, -58, 100)