add support for multipoint geometries

geographist · geographist · commit 1571672b9255 · 2013-05-25T22:58:26.000-06:00
diff --git a/src/com/esri/core/geometry/OperatorExportToGeoJsonCursor.java b/src/com/esri/core/geometry/OperatorExportToGeoJsonCursor.java
@@ -120,12 +120,33 @@ private void exportMultiPointToGeoJson(JsonGenerator g, MultiPoint mp) throws Js
         g.writeString("MultiPoint");
 
         g.writeFieldName("coordinates");
+        g.writeStartArray();
 
-        if (mp.isEmpty()) {
-            g.writeStartArray();
-            g.writeEndArray();
+        if (!mp.isEmpty()) {
+            MultiPointImpl mpImpl = (MultiPointImpl) mp._getImpl();
+            AttributeStreamOfDbl zs = mp.hasAttribute(Semantics.Z) ? (AttributeStreamOfDbl) mpImpl.getAttributeStreamRef(Semantics.Z) : null;
+
+            Point2D p = new Point2D();
+
+            int n = mp.getPointCount();
+
+            for(int i = 0; i < n; i++) {
+                mp.getXY(i, p);
+
+                g.writeStartArray();
+
+                writeDouble(p.x, g);
+                writeDouble(p.y, g);
+
+                if (zs != null)
+                    writeDouble(zs.get(i), g);
+
+                g.writeEndArray();
+            }
         }
 
+        g.writeEndArray();
+
         g.writeEndObject();
         g.close();
     }
diff --git a/unittest/com/esri/core/geometry/TestGeomToGeoJson.java b/unittest/com/esri/core/geometry/TestGeomToGeoJson.java
@@ -32,6 +32,16 @@ public void testEmptyPoint() {
         assertEquals("{\"type\":\"Point\",\"coordinates\":[]}", result);
     }
 
+    @Test
+    public void testMultiPoint() {
+        MultiPoint mp = new MultiPoint();
+        mp.add(10.0, 20.0);
+        mp.add(20.0, 30.0);
+        OperatorExportToGeoJson exporter = (OperatorExportToGeoJson) factory.getOperator(Operator.Type.ExportToGeoJson);
+        String result = exporter.execute(mp);
+        assertEquals("{\"type\":\"MultiPoint\",\"coordinates\":[[10.0,20.0],[20.0,30.0]]}", result);
+    }
+
     @Test
     public void testEmptyMultiPoint() {
         MultiPoint mp = new MultiPoint();
