Add geojson parsing support

build.gradle

@@ -31,12 +31,16 @@ sourceCompatibility = '1.8'
 
 dependencies {
     // Be sure to update dependencies in pom.xml to match
-    implementation 'joda-time:joda-time:2.10.10'
-    implementation 'org.slf4j:slf4j-api:1.7.31'
+    implementation 'joda-time:joda-time:2.10.13'
+    implementation 'org.slf4j:slf4j-api:1.7.33'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.1'
+
     // Upgrade to version higher than 1.4 when Collect minSDK >= 26
     implementation 'org.apache.commons:commons-csv:1.4'
+
     compileOnly 'net.sf.kxml:kxml2:2.3.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.3'
+
+    testImplementation 'ch.qos.logback:logback-classic:1.2.10'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'net.sf.kxml:kxml2:2.3.0'
     testImplementation 'org.hamcrest:hamcrest-all:1.3'

pom.xml

@@ -53,9 +53,14 @@
     <dependency>
        <groupId>joda-time</groupId>
        <artifactId>joda-time</artifactId>
-       <version>2.10.10</version>
+       <version>2.10.13</version>
        <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.13.1</version>
+    </dependency>
     <dependency>
        <groupId>org.apache.commons</groupId>
        <artifactId>commons-csv</artifactId>
@@ -64,12 +69,12 @@
       <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.7.31</version>
+      <version>1.7.33</version>
     </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.2.3</version>
+      <version>1.2.10</version>
       <scope>test</scope>
     </dependency>
     <dependency>

src/main/java/org/javarosa/core/model/instance/ExternalDataInstance.java

@@ -4,6 +4,7 @@
 import java.io.DataOutputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import org.javarosa.core.model.instance.geojson.GeoJsonExternalInstance;
 import org.javarosa.core.reference.InvalidReferenceException;
 import org.javarosa.core.reference.ReferenceManager;
 import org.javarosa.core.util.externalizable.DeserializationException;
@@ -68,10 +69,12 @@ public static ExternalDataInstance build(String instanceSrc, String instanceId)
         return new ExternalDataInstance(root, instanceId, instanceSrc);
     }
 
-    private static TreeElement parseExternalInstance(String instanceSrc, String instanceId) throws IOException, InvalidReferenceException, InvalidStructureException, XmlPullParserException, UnfullfilledRequirementsException {
+    private static TreeElement parseExternalInstance(String instanceSrc, String instanceId)
+        throws IOException, InvalidReferenceException, InvalidStructureException, XmlPullParserException, UnfullfilledRequirementsException {
         String path = getPath(instanceSrc);
-        return instanceSrc.contains("file-csv") ?
-            CsvExternalInstance.parse(instanceId, path) : XmlExternalInstance.parse(instanceId, path);
+        return instanceSrc.contains("file-csv") ? CsvExternalInstance.parse(instanceId, path)
+            : instanceSrc.endsWith("geojson") ? GeoJsonExternalInstance.parse(instanceId, path)
+            : XmlExternalInstance.parse(instanceId, path);
     }
 
     @Override

src/main/java/org/javarosa/core/model/instance/geojson/GeoJsonExternalInstance.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2022 ODK
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.javarosa.core.model.instance.geojson;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.FileInputStream;
+import java.io.IOException;
+import org.javarosa.core.model.instance.TreeElement;
+
+public class GeoJsonExternalInstance {
+    public static TreeElement parse(String instanceId, String path) throws IOException {
+        final TreeElement root = new TreeElement("root", 0);
+        root.setInstanceName(instanceId);
+
+        ObjectMapper objectMapper = new ObjectMapper();
+        try (JsonParser jsonParser = objectMapper.getFactory().createParser(new FileInputStream(path))) {
+            validatePreamble(jsonParser);
+
+            int multiplicity = 0;
+            while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+                GeojsonFeature feature = objectMapper.readValue(jsonParser, GeojsonFeature.class);
+
+                root.addChild(feature.toTreeElement(multiplicity));
+                multiplicity++;
+            }
+        }
+
+        return root;
+    }
+
+    private static void validatePreamble(JsonParser jsonParser) throws IOException {
+        if (jsonParser.nextToken() != JsonToken.START_OBJECT) {
+            throw new IOException("GeoJSON file must contain a top-level Object");
+        }
+
+        jsonParser.nextToken();
+        String propertyName = jsonParser.getCurrentName();
+        jsonParser.nextToken();
+        if (!(propertyName.equals("type") && jsonParser.getValueAsString().equals("FeatureCollection"))) {
+            throw new IOException("GeoJSON file must contain a top-level FeatureCollection");
+        }
+
+        jsonParser.nextToken();
+        propertyName = jsonParser.getCurrentName();
+
+        if (!(propertyName.equals("features") && jsonParser.nextToken() == JsonToken.START_ARRAY)) {
+            throw new IOException("GeoJSON FeatureCollection must contain an array of features");
+        }
+    }
+}

src/main/java/org/javarosa/core/model/instance/geojson/GeojsonFeature.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2022 ODK
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.javarosa.core.model.instance.geojson;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import java.io.IOException;
+import java.util.Map;
+import org.javarosa.core.model.data.UncastData;
+import org.javarosa.core.model.instance.TreeElement;
+
+@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
+public class GeojsonFeature {
+    private String type;
+    private GeojsonGeometry geometry;
+    private Map<String, String> properties;
+
+    public TreeElement toTreeElement(int multiplicity) throws IOException {
+        TreeElement item = new TreeElement("item", multiplicity);
+
+        TreeElement geoField = new TreeElement("geometry", 0);
+        geoField.setValue(new UncastData(geometry.getOdkCoordinates()));
+        item.addChild(geoField);
+
+       for (String property : properties.keySet()) {
+           TreeElement field = new TreeElement(property, 0);
+           field.setValue(new UncastData(properties.get(property)));
+           item.addChild(field);
+       }
+
+       return item;
+    }
+}

src/main/java/org/javarosa/core/model/instance/geojson/GeojsonGeometry.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2022 ODK
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.javarosa.core.model.instance.geojson;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import java.io.IOException;
+import java.util.ArrayList;
+
+@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
+public class GeojsonGeometry {
+    private String type;
+    private ArrayList<String> coordinates;
+
+    public String getType() {
+        return type;
+    }
+
+    public String getOdkCoordinates() throws IOException {
+        if (!(getType().equals("Point") && coordinates.size() == 2)) {
+            throw new IOException("Only Points are currently supported");
+        }
+
+        return coordinates.get(0) + " " + coordinates.get(1) + " 0 0";
+    }
+}

src/main/java/org/javarosa/core/util/GeoUtils.java

@@ -21,18 +21,17 @@
 
 package org.javarosa.core.util;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.List;
-
+import static java.lang.Math.PI;
 import static java.lang.Math.abs;
 import static java.lang.Math.acos;
 import static java.lang.Math.cos;
 import static java.lang.Math.sin;
 import static java.lang.Math.toRadians;
-import static java.lang.Math.PI;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Author: Meletis Margaritis

src/test/java/org/javarosa/core/model/instance/geojson/GeoJsonExternalInstanceTest.java

@@ -0,0 +1,96 @@
+/*
+ * Copyright 2022 ODK
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.javarosa.core.model.instance.geojson;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.javarosa.test.utils.ResourcePathHelper.r;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+import org.javarosa.core.model.instance.TreeElement;
+import org.junit.Test;
+
+public class GeoJsonExternalInstanceTest {
+    @Test
+    public void parse_throwsException_ifNoTopLevelObject() {
+        try {
+            GeoJsonExternalInstance.parse("id", r("not-object.geojson").toString());
+            fail("Exception expected");
+        } catch (IOException e) {
+            // expected
+        }
+    }
+
+    @Test
+    public void parse_throwsException_ifTopLevelObjectTypeNotFeatureCollection() {
+        try {
+            GeoJsonExternalInstance.parse("id", r("invalid-type.geojson").toString());
+            fail("Exception expected");
+        } catch (IOException e) {
+            // expected
+        }
+    }
+
+    @Test
+    public void parse_throwsException_ifNoFeaturesArray() {
+        try {
+            GeoJsonExternalInstance.parse("id", r("bad-futures-collection.geojson").toString());
+            fail("Exception expected");
+        } catch (IOException e) {
+            // expected
+        }
+    }
+
+    @Test
+    public void parse_throwsException_ifFeaturesNotArray() {
+        try {
+            GeoJsonExternalInstance.parse("id", r("bad-features-not-array.geojson").toString());
+            fail("Exception expected");
+        } catch (IOException e) {
+            // expected
+        }
+    }
+
+    @Test
+    public void parse_addsGeometriesAsChildren_forMultipleFeatures() throws IOException {
+        TreeElement featureCollection = GeoJsonExternalInstance.parse("id", r("feature-collection.geojson").toString());
+        assertThat(featureCollection.getNumChildren(), is(2));
+        assertThat(featureCollection.getChildAt(0).getChild("geometry", 0).getValue().getValue(), is("102 0.5 0 0"));
+        assertThat(featureCollection.getChildAt(1).getChild("geometry", 0).getValue().getValue(), is("104 0.5 0 0"));
+    }
+
+    @Test
+    public void parse_addsAllOtherPropertiesAsChildren() throws IOException {
+        TreeElement featureCollection = GeoJsonExternalInstance.parse("id", r("feature-collection.geojson").toString());
+        assertThat(featureCollection.getChildAt(0).getNumChildren(), is(4));
+        assertThat(featureCollection.getChildAt(0).getChild("name", 0).getValue().getValue(), is("My cool point"));
+
+        assertThat(featureCollection.getChildAt(1).getNumChildren(), is(5));
+        assertThat(featureCollection.getChildAt(1).getChild("special-property", 0).getValue().getValue(), is("special value"));
+    }
+
+    @Test
+    public void parse_throwsException_whenGeometryNotPoint() {
+        try {
+            GeoJsonExternalInstance.parse("id", r("feature-collection-with-line.geojson").toString());
+            fail("Exception expected");
+        } catch (IOException e) {
+            // expected
+        }
+    }
+}