Merge pull request #2 from petergarnaes/fix-temporal-interval

Temporal interval adjusted to adhere to spec

Author: bosborn

src/main/java/mil/nga/oapi/features/json/Temporal.java

@@ -14,11 +14,13 @@
 public class Temporal {
 
 	/**
-	 * Begin and end times of the time interval. The timestamps are in the
-	 * coordinate reference system specified in `trs`. By default this is the
-	 * Gregorian calendar.
+	 * One or more time intervals that describe the temporal extent of the dataset.
+	 * The value `null` is supported and indicates an unbounded interval end.
+	 * In the Core only a single time interval is supported. Extensions may support
+	 * multiple intervals. If multiple intervals are provided, the union of the
+	 * intervals describes the temporal extent.
 	 */
-	private List<String> interval = new ArrayList<>();
+	private List<List<String>> interval = new ArrayList<>(new ArrayList<>());
 
 	/**
 	 * Coordinate reference system of the coordinates in the temporal extent
@@ -41,7 +43,7 @@ public Temporal() {
 	 * 
 	 * @return interval
 	 */
-	public List<String> getInterval() {
+	public List<List<String>> getInterval() {
 		return interval;
 	}
 
@@ -51,7 +53,7 @@ public List<String> getInterval() {
 	 * @param interval
 	 *            interval
 	 */
-	public void setInterval(List<String> interval) {
+	public void setInterval(List<List<String>> interval) {
 		this.interval = interval;
 	}
 

src/test/java/mil/nga/oapi/features/json/FeaturesTest.java

@@ -55,7 +55,7 @@ public void testCollections() {
 				+ "    \"name\" : \"flurstueck\",\n"
 				+ "    \"title\" : \"Flurstück\",\n" + "    \"extent\" : {\n"
 				+ "      \"spatial\" : { \"bbox\" : [ 5.61272621360749, 50.2373512077239, 9.58963433710139, 52.5286304537795 ] },\n"
-				+ "      \"temporal\" : { \"interval\" : [ \"2018-05-18T14:45:44Z\", \"2019-06-17T21:41:19Z\" ] }\n"
+				+ "      \"temporal\" : { \"interval\" : [[ \"2018-05-18T14:45:44Z\", \"2019-06-17T21:41:19Z\" ]] }\n"
 				+ "    },\n" + "    \"links\" : [ {\n"
 				+ "      \"rel\" : \"item\",\n"
 				+ "      \"type\" : \"application/geo+json\",\n"
@@ -91,7 +91,7 @@ public void testCollections() {
 				+ "    \"title\" : \"Gebäude, Bauwerk\",\n"
 				+ "    \"extent\" : {\n"
 				+ "      \"spatial\" : { \"bbox\" : [ 5.61272621360749, 50.2373512077239, 9.58963433710139, 52.5286304537795 ] },\n"
-				+ "      \"temporal\" : { \"interval\" : [ \"2018-05-18T14:45:44Z\", \"2019-06-17T21:41:19Z\" ] }\n"
+				+ "      \"temporal\" : { \"interval\" : [[ \"2018-05-18T14:45:44Z\", \"2019-06-17T21:41:19Z\" ]] }\n"
 				+ "    },\n" + "    \"links\" : [ {\n"
 				+ "      \"rel\" : \"item\",\n"
 				+ "      \"type\" : \"application/geo+json\",\n"
@@ -123,7 +123,7 @@ public void testCollections() {
 				+ "    \"title\" : \"Verwaltungseinheit\",\n"
 				+ "    \"extent\" : {\n"
 				+ "      \"spatial\" : { \"bbox\" : [ 5.61272621360749, 50.2373512077239, 9.58963433710139, 52.5286304537795 ] },\n"
-				+ "      \"temporal\" : { \"interval\" : [ \"2018-05-18T14:45:44Z\", \"2019-06-17T21:41:19Z\" ] }\n"
+				+ "      \"temporal\" : { \"interval\" : [[ \"2018-05-18T14:45:44Z\", \"2019-06-17T21:41:19Z\" ]] }\n"
 				+ "    },\n" + "    \"links\" : [ {\n"
 				+ "      \"rel\" : \"item\",\n"
 				+ "      \"type\" : \"application/geo+json\",\n"
@@ -172,7 +172,7 @@ public void testCollection() {
 				+ "  \"description\": \"Buildings in the city of Bonn.\",\n"
 				+ "  \"extent\": {\n"
 				+ "  \"spatial\": { \"bbox\" : [ 7.01, 50.63, 7.22, 50.78 ] },\n"
-				+ "  \"temporal\": { \"interval\" : [ \"2010-02-15T12:34:56Z\", \"2018-03-18T12:11:00Z\" ] }\n"
+				+ "  \"temporal\": { \"interval\" : [[ \"2010-02-15T12:34:56Z\", \"2018-03-18T12:11:00Z\" ]] }\n"
 				+ "  },\n" + "  \"links\": [\n"
 				+ "  { \"href\": \"http://data.example.org/collections/buildings/items\",\n"
 				+ "  \"rel\": \"item\", \"type\": \"application/geo+json\",\n"
@@ -194,11 +194,12 @@ public void testCollection() {
 		TestCase.assertEquals(50.63, extent.getSpatial().getBbox().get(1));
 		TestCase.assertEquals(7.22, extent.getSpatial().getBbox().get(2));
 		TestCase.assertEquals(50.78, extent.getSpatial().getBbox().get(3));
-		TestCase.assertEquals(2, extent.getTemporal().getInterval().size());
+		TestCase.assertEquals(1, extent.getTemporal().getInterval().size());
+		TestCase.assertEquals(2, extent.getTemporal().getInterval().get(0).size());
 		TestCase.assertEquals("2010-02-15T12:34:56Z",
-				extent.getTemporal().getInterval().get(0));
+				extent.getTemporal().getInterval().get(0).get(0));
 		TestCase.assertEquals("2018-03-18T12:11:00Z",
-				extent.getTemporal().getInterval().get(1));
+				extent.getTemporal().getInterval().get(0).get(1));
 		List<Link> links = collection.getLinks();
 		TestCase.assertNotNull(extent);
 		TestCase.assertEquals(2, links.size());