-
Notifications
You must be signed in to change notification settings - Fork 105
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
2b4dd89
commit 6d31598
Showing
10 changed files
with
284 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
src/main/java/org/javarosa/core/model/instance/geojson/GeoJsonExternalInstance.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
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 java.io.InputStream; | ||
import org.javarosa.core.model.instance.TreeElement; | ||
|
||
public class GeoJsonExternalInstance { | ||
public static TreeElement parse(String instanceId, String path) throws IOException { | ||
return parse(instanceId, new FileInputStream(path)); | ||
} | ||
|
||
protected static TreeElement parse(String instanceId, InputStream geojsonStream) throws IOException { | ||
final TreeElement root = new TreeElement("root", 0); | ||
root.setInstanceName(instanceId); | ||
|
||
ObjectMapper objectMapper = new ObjectMapper(); | ||
try (JsonParser jsonParser = objectMapper.getFactory().createParser(geojsonStream)) { | ||
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"); | ||
} | ||
} | ||
} |
29 changes: 29 additions & 0 deletions
29
src/main/java/org/javarosa/core/model/instance/geojson/GeojsonFeature.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
package org.javarosa.core.model.instance.geojson; | ||
|
||
import com.fasterxml.jackson.annotation.JsonAutoDetect; | ||
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) { | ||
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; | ||
} | ||
} |
38 changes: 38 additions & 0 deletions
38
src/main/java/org/javarosa/core/model/instance/geojson/GeojsonGeometry.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
/* | ||
* 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.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() { | ||
if (!(type.equals("Point") && coordinates.size() == 2)) { | ||
throw new UnsupportedOperationException("Only Points are currently supported"); | ||
} | ||
|
||
return coordinates.get(0) + " " + coordinates.get(1) + " 0 0"; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
135 changes: 135 additions & 0 deletions
135
src/test/java/org/javarosa/core/model/instance/geojson/GeoJsonExternalInstanceTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,135 @@ | ||
package org.javarosa.core.model.instance.geojson; | ||
|
||
import static org.hamcrest.CoreMatchers.is; | ||
import static org.hamcrest.MatcherAssert.assertThat; | ||
import static org.junit.Assert.fail; | ||
|
||
import com.fasterxml.jackson.databind.ObjectMapper; | ||
import java.io.ByteArrayInputStream; | ||
import java.io.IOException; | ||
import java.nio.charset.StandardCharsets; | ||
import org.javarosa.core.model.instance.TreeElement; | ||
import org.junit.Test; | ||
|
||
public class GeoJsonExternalInstanceTest { | ||
@Test | ||
public void parse_throwsException_ifTopLevelElementNotFeatureCollection() { | ||
try { | ||
GeoJsonExternalInstance.parse("id", new ByteArrayInputStream(GEOMETRY_COLLECTION_GEOJSON.getBytes(StandardCharsets.UTF_8))); | ||
fail("Exception expected"); | ||
} catch (IOException e) { | ||
// expected | ||
} | ||
} | ||
|
||
@Test | ||
public void parse_parsesMultipleFeatures() throws IOException { | ||
TreeElement featureCollection = GeoJsonExternalInstance.parse("id", new ByteArrayInputStream(FEATURE_COLLECTION_GEOJSON.getBytes(StandardCharsets.UTF_8))); | ||
assertThat(featureCollection.getNumChildren(), is(2)); | ||
} | ||
|
||
@Test | ||
public void parse_addsGeometryAsChild() throws IOException { | ||
TreeElement featureCollection = GeoJsonExternalInstance.parse("id", new ByteArrayInputStream(FEATURE_COLLECTION_GEOJSON.getBytes(StandardCharsets.UTF_8))); | ||
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", new ByteArrayInputStream(FEATURE_COLLECTION_GEOJSON.getBytes(StandardCharsets.UTF_8))); | ||
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 getOdkCoordinates_convertsPointGeoJsonGeometry() throws IOException { | ||
String point = "{ \"type\": \"Point\", \"coordinates\": [ 102, 0.5 ] }"; | ||
ObjectMapper objectMapper = new ObjectMapper(); | ||
GeojsonGeometry geometry = objectMapper.readValue(point, GeojsonGeometry.class); | ||
assertThat(geometry.getOdkCoordinates(), is("102 0.5 0 0")); | ||
} | ||
|
||
@Test | ||
public void getOdkCoordinates_throwsException_ifGeometryNotPoint() throws IOException { | ||
String notPoint = "{\n" + | ||
" \"type\": \"LineString\",\n" + | ||
" \"coordinates\": [102.0, 0.0]\n" + | ||
" }"; | ||
ObjectMapper objectMapper = new ObjectMapper(); | ||
GeojsonGeometry geometry = objectMapper.readValue(notPoint, GeojsonGeometry.class); | ||
|
||
try { | ||
geometry.getOdkCoordinates(); | ||
fail("Exception expected"); | ||
} catch (UnsupportedOperationException e) { | ||
// expected | ||
} | ||
} | ||
|
||
private static final String GEOMETRY_COLLECTION_GEOJSON = "{\n" + | ||
" \"geometries\": [\n" + | ||
" {\n" + | ||
" \"coordinates\": [\n" + | ||
" [\n" + | ||
" 10.0,\n" + | ||
" 11.2\n" + | ||
" ],\n" + | ||
" [\n" + | ||
" 10.5,\n" + | ||
" 11.9\n" + | ||
" ]\n" + | ||
" ],\n" + | ||
" \"type\": \"Linestring\"\n" + | ||
" },\n" + | ||
" {\n" + | ||
" \"coordinates\": [\n" + | ||
" 10.0,\n" + | ||
" 20.0\n" + | ||
" ],\n" + | ||
" \"type\": \"Point\"\n" + | ||
" }\n" + | ||
" ],\n" + | ||
" \"type\": \"GeometryCollection\"\n" + | ||
"}"; | ||
|
||
private static final String FEATURE_COLLECTION_GEOJSON = "{\n" + | ||
" \"type\": \"FeatureCollection\",\n" + | ||
" \"features\": [\n" + | ||
" {\n" + | ||
" \"type\": \"Feature\",\n" + | ||
" \"geometry\": {\n" + | ||
" \"type\": \"Point\",\n" + | ||
" \"coordinates\": [\n" + | ||
" 102,\n" + | ||
" 0.5\n" + | ||
" ]\n" + | ||
" },\n" + | ||
" \"properties\": {\n" + | ||
" \"id\": \"fs87b\",\n" + | ||
" \"name\": \"My cool point\",\n" + | ||
" \"foo\": \"bar\"\n" + | ||
" }\n" + | ||
" },\n" + | ||
" {\n" + | ||
" \"type\": \"Feature\",\n" + | ||
" \"geometry\": {\n" + | ||
" \"type\": \"Point\",\n" + | ||
" \"coordinates\": [\n" + | ||
" 104,\n" + | ||
" 0.5\n" + | ||
" ]\n" + | ||
" },\n" + | ||
" \"properties\": {\n" + | ||
" \"id\": \"67abie\",\n" + | ||
" \"name\": \"Your cool point\",\n" + | ||
" \"foo\": \"quux\",\n" + | ||
" \"special-property\": \"special value\"\n" + | ||
" }\n" + | ||
" }\n" + | ||
" ]\n" + | ||
"}"; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters