Merge pull request #26 from cedardevs/1080-antimeridian-bbox-parsing

Parsing bbox crossing antimeridian.

Author: forgo

schemas-parse/src/main/groovy/org/cedar/schemas/parse/ISOParser.groovy

@@ -6,6 +6,7 @@ import org.apache.commons.text.StringEscapeUtils
 import org.cedar.schemas.avro.geojson.LineString
 import org.cedar.schemas.avro.geojson.Point
 import org.cedar.schemas.avro.geojson.Polygon
+import org.cedar.schemas.avro.geojson.MultiPolygon
 import org.cedar.schemas.avro.psi.*
 
 class ISOParser {
@@ -324,6 +325,13 @@ class ISOParser {
       builder = LineString.newBuilder()
       coordinates = [[west, south], [east, north]]
     }
+    else if (west > east) {
+      builder = MultiPolygon.newBuilder()
+      coordinates = [
+        [[[-180, south], [east, south], [east, north], [-180, north], [-180, south]]],
+        [[[west, south], [180, south], [180, north], [west, north], [west, south]]]
+        ]
+    }
     else {
       // this returns with correlating null values as well
       builder = Polygon.newBuilder()

schemas-parse/src/test/groovy/org/cedar/schemas/parse/ISOParserSpec.groovy

@@ -3,6 +3,7 @@ package org.cedar.schemas.parse
 import org.cedar.schemas.avro.geojson.LineStringType
 import org.cedar.schemas.avro.geojson.PointType
 import org.cedar.schemas.avro.geojson.PolygonType
+import org.cedar.schemas.avro.geojson.MultiPolygonType
 import org.cedar.schemas.avro.psi.*
 import org.cedar.schemas.avro.util.AvroUtils
 import org.xml.sax.SAXParseException
@@ -201,6 +202,39 @@ class ISOParserSpec extends Specification {
     result.isGlobal
   }
 
+  def "Spatial bounding is correctly parsed when it crosses the antimeridian"() {
+
+    given:
+    def document = ClassLoader.systemClassLoader.getResourceAsStream("test-iso-discontinous-antimeridian-coords.xml").text
+    def metadata = new XmlSlurper().parseText(document)
+
+    when:
+    def result = ISOParser.parseSpatialInfo(metadata)
+
+
+    then:
+
+    def expectedCoordinates = [
+    [[
+      [-180.0, -81.3282],
+      [6.2995, -81.3282],
+      [6.2995, 81.3282],
+      [-180.0, 81.3282],
+      [-180.0, -81.3282]
+    ]],
+    [[
+      [141.7005, -81.3282],
+      [180.0, -81.3282],
+      [180.0, 81.3282],
+      [141.7005, 81.3282],
+      [141.7005, -81.3282]
+    ]]
+    ]
+    result.spatialBounding.coordinates == expectedCoordinates
+    result.spatialBounding.type == MultiPolygonType.MultiPolygon
+    !result.isGlobal
+  }
+
   def "Spatial bounding is correctly parsed when it contains zeros"() {
 
     given:

schemas-parse/src/test/resources/test-iso-discontinous-antimeridian-coords.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<gmi:MI_Metadata xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gmi="http://www.isotc211.org/2005/gmi" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmx="http://www.isotc211.org/2005/gmx" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.isotc211.org/2005/gmi">
+  <gmd:identificationInfo>
+    <gmd:MD_DataIdentification>
+      <gmd:extent>
+        <gmd:EX_Extent id="boundingExtent">
+          <gmd:geographicElement>
+            <gmd:EX_GeographicBoundingBox id="boundingGeographicBoundingBox">
+              <gmd:westBoundLongitude>
+              <gco:Decimal>141.7005</gco:Decimal>
+              </gmd:westBoundLongitude>
+              <gmd:eastBoundLongitude>
+              <gco:Decimal>6.2995</gco:Decimal>
+              </gmd:eastBoundLongitude>
+              <gmd:southBoundLatitude>
+              <gco:Decimal>-81.3282</gco:Decimal>
+              </gmd:southBoundLatitude>
+              <gmd:northBoundLatitude>
+              <gco:Decimal>81.3282</gco:Decimal>
+              </gmd:northBoundLatitude>
+            </gmd:EX_GeographicBoundingBox>
+          </gmd:geographicElement>
+        </gmd:EX_Extent>
+      </gmd:extent>
+      <gmd:supplementalInformation gco:nilReason="missing"/>
+    </gmd:MD_DataIdentification>
+  </gmd:identificationInfo>
+</gmi:MI_Metadata>