Added bbox and crs schema validation

modified bbox.json schema to verify array of 4 items.
i62lotor · Nov 6, 2018 · 1a12bed · 1a12bed
1 parent 91ab7c8
commit 1a12bed
Show file tree

Hide file tree

Showing 6 changed files with 120 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ luego incluir la dependencia en tu proyecto
 <dependency>
 	<groupId>org.geowe.geojson</groupId>
 	<artifactId>geojson-validator</artifactId>
-	<version>0.0.3-SNAPSHOT</version>
+	<version>0.0.4-SNAPSHOT</version>
 </dependency>
 ```
 

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.geowe.geojson</groupId>
 	<artifactId>geojson-validator</artifactId>
-	<version>0.0.3-SNAPSHOT</version>
+	<version>0.0.4-SNAPSHOT</version>
 
 	<name>Geojson Validator</name>
 	<description>Utility to validate Geojson schema and geometry</description>

diff --git a/src/main/java/org/geowe/geojson/validation/GeojsonValidator.java b/src/main/java/org/geowe/geojson/validation/GeojsonValidator.java
@@ -49,10 +49,11 @@ public class GeojsonValidator {
 	 * @throws IOException
 	 * @throws ProcessingException
 	 */
-	public Optional<ProcessingReport> validateSchema(String geojson) throws ProcessingException, IOException {
+	public Optional<ProcessingReport> validateSchema(String geojson)
+			throws ProcessingException, IOException {
 
-		return validate(geojson,
-				new GeojsonSchemaProvider().getJsonSchema(GeojsonSchemaProvider.Schema.GEOJSON_SCHEMA));
+		return validate(geojson, new GeojsonSchemaProvider()
+				.getJsonSchema(GeojsonSchemaProvider.Schema.GEOJSON_SCHEMA));
 	}
 
 	/**
@@ -64,12 +65,43 @@ public Optional<ProcessingReport> validateSchema(String geojson) throws Processi
 	 * @throws ProcessingException
 	 * @throws IOException
 	 */
-	public Optional<ProcessingReport> validateGeometrySchema(String geojson) throws ProcessingException, IOException {
+	public Optional<ProcessingReport> validateGeometrySchema(String geojson)
+			throws ProcessingException, IOException {
 
-		return validate(geojson,
-				new GeojsonSchemaProvider().getJsonSchema(GeojsonSchemaProvider.Schema.GEOMETRY_SCHEMA));
+		return validate(geojson, new GeojsonSchemaProvider()
+				.getJsonSchema(GeojsonSchemaProvider.Schema.GEOMETRY_SCHEMA));
 	}
 
+	/**
+	 * Validate geoJSON optional bbox schema according to resources/schemas/bbox.json
+	 * 
+	 * @param geojson : bbox geojson
+	 * @return Optional<ProcessingReport> : validation report
+	 * @throws ProcessingException
+	 * @throws IOException
+	 */
+	public Optional<ProcessingReport> validateBboxSchema(String geojson)
+			throws ProcessingException, IOException {
+
+		return validate(geojson, new GeojsonSchemaProvider()
+				.getJsonSchema(GeojsonSchemaProvider.Schema.BBOX_SCHEMA));
+	}
+
+	/**
+	 * Validate geoJSON optional crs schema (not included in RFC) according to resources/schemas/crs.json
+	 * 
+	 * @param geojson : crs geojson
+	 * @return Optional<ProcessingReport> : validation report
+	 * @throws ProcessingException
+	 * @throws IOException
+	 */
+	public Optional<ProcessingReport> validateCrsSchema(String geojson)
+			throws ProcessingException, IOException {
+
+		return validate(geojson, new GeojsonSchemaProvider()
+				.getJsonSchema(GeojsonSchemaProvider.Schema.CRS_SCHEMA));
+	}
+
 	private Optional<ProcessingReport> validate(String geojson, JsonSchema jsonSchema)
 			throws ProcessingException, IOException {
 		JsonNode geoJsonNode = objectMapper.readTree(geojson);

diff --git a/src/main/resources/schemas/bbox.json b/src/main/resources/schemas/bbox.json
@@ -1,7 +1,26 @@
 {
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "id": "http://json-schema.org/geojson/bbox.json#",
-    "description": "A bounding box as defined by GeoJSON",
-    "type": "array",
-    "items": { "type": "number" }
-}
+	"$schema": "http://json-schema.org/draft-04/schema#",
+	"id": "http://json-schema.org/geojson/bbox.json#",
+	"description": "A bounding box as defined by GeoJSON",
+	"type": [
+		"object",
+		"null"
+	],
+	"required": [
+		"bbox"
+	],
+	"properties": {
+		"bbox": {
+			"id": "#/properties/bbox",
+			"type": "array",
+			"minItems": 4,
+			"maxItems": 4,
+			"title": "The Bbox Schema",
+			"items": {
+				"type": "number",
+				"title": "The Items Schema"
+			}
+		}
+	}
+}
+
diff --git a/src/test/java/org/geowe/geojson/validation/test/GeojsonSchemaValidatorTest.java b/src/test/java/org/geowe/geojson/validation/test/GeojsonSchemaValidatorTest.java
@@ -67,4 +67,52 @@ public void Given_validFeatureGeojson_When_validate_Expect_success() {
 			LOG.error("Validation fails: " + e);
 		}
 	}
+
+	@Test
+	public void Given_validBboxGeojson_When_validate_Expect_success() {
+		GeojsonValidator validator = new GeojsonValidator();
+		try {
+			Assert.assertTrue(validator.validateBboxSchema(TestDataProvider.VALID_BBOX_GEOJSON).get().isSuccess());
+		} catch (IOException | ProcessingException e) {
+			LOG.error("Validation fails: " + e);
+		}
+	}
+
+	@Test
+	public void Given_invalidBboxGeojson_When_validate_Expect_fails() {
+		GeojsonValidator validator = new GeojsonValidator();
+		try {
+			ProcessingReport validationResult = validator.validateBboxSchema(TestDataProvider.INVALID_BBOX_GEOJSON)
+					.get();
+			LOG.info(validationResult.toString());
+			Assert.assertFalse(validationResult.isSuccess());
+		} catch (IOException | ProcessingException e) {
+			LOG.error("Validation fails: " + e);
+		}
+	}
+
+	@Test
+	public void Given_validCrsGeojson_When_validate_Expect_success() {
+		GeojsonValidator validator = new GeojsonValidator();
+		try {
+			ProcessingReport validationResult = validator.validateCrsSchema(TestDataProvider.VALID_CRS_GEOJSON).get();
+			LOG.info(validationResult.toString());
+			Assert.assertTrue(validationResult.isSuccess());
+		} catch (IOException | ProcessingException e) {
+			LOG.error("Validation fails: " + e);
+		}
+	}
+
+	@Test
+	public void Given_invalidCrsGeojson_When_validate_Expect_fails() {
+		GeojsonValidator validator = new GeojsonValidator();
+		try {
+			ProcessingReport validationResult = validator.validateCrsSchema(TestDataProvider.INVALID_CRS_GEOJSON)
+					.get();
+			LOG.info(validationResult.toString());
+			Assert.assertFalse(validationResult.isSuccess());
+		} catch (IOException | ProcessingException e) {
+			LOG.error("Validation fails: " + e);
+		}
+	}
 }
diff --git a/src/test/java/org/geowe/geojson/validation/test/TestDataProvider.java b/src/test/java/org/geowe/geojson/validation/test/TestDataProvider.java
@@ -13,4 +13,11 @@ public class TestDataProvider {
 	public static final String VALID_POINT_GEOJSON = "{\"type\":\"Point\",\"coordinates\":[101.3818359375,-0.3790255558308115]}";
 	public static final String VALID_LINESTRING_GEOJSON = "{\"type\":\"LineString\",\"coordinates\":[[101.38170182704926,-0.37865273692742313],[101.38204783201218,-0.37883512315554363],[101.38206660747528,-0.3791006560396358],[101.38178765773773,-0.37937155321600796],[101.38165354728699,-0.3792454921547884]]}";
 	public static final String INVALID_POLYGON_GEOJSON = "{\"type\":\"Polygon\",\"coordinates\":[[[101.38203978538513,-0.37824236790011306],[101.38233482837676,-0.3783147859651637],[101.38202100992203,-0.3785856831661152],[101.38224631547928,-0.3787385657411375],[101.38234555721283,-0.37850790080234714],[101.38203978538513,-0.37824236790011306]]]}";
+
+	public static final String VALID_BBOX_GEOJSON = "{\"bbox\":[-180,-90,180,90]}";
+	public static final String INVALID_BBOX_GEOJSON = "{\"bbox\":[-180,-90,180]}";
+
+	public static final String VALID_CRS_GEOJSON = "{\"type\":\"name\",\"properties\":{\"name\":\"urn:ogc:def:crs:OGC:1.3:CRS84\"}}";
+	public static final String INVALID_CRS_GEOJSON = "{\"typ-e\":\"name\",\"properties\":{\"name\":\"urn:ogc:def:crs:OGC:1.3:CRS84\"}}";
 }
+