NDCUM-1035

src/main/java/gov/nasa/cumulus/metadata/aggregator/IsoGranule.java

@@ -21,6 +21,7 @@ public class IsoGranule extends UMMGranule {
     private String PGEVersionClass;
 
     private IsoType isoType;
+    private int orientation;
 
     public IsoGranule() {
         this.identifiers = new HashMap<>();
@@ -107,6 +108,14 @@ public void setPolygon(String polygon) {
         this.polygon = polygon;
     }
 
+    public int getOrientation() {
+        return this.orientation;
+    }
+
+    public void setOrientation(int orientation) {
+        this.orientation = orientation;
+    }
+
     public void addIdentifier(String name, String value) {
         this.identifiers.put(name, value);
     }

src/main/java/gov/nasa/cumulus/metadata/aggregator/MetadataFilesToEcho.java

@@ -51,6 +51,9 @@
 import gov.nasa.podaac.inventory.api.Constant.GranuleArchiveType;
 import gov.nasa.cumulus.metadata.umm.model.UMMGranuleArchive;
 import org.xml.sax.SAXException;
+
+import com.vividsolutions.jts.algorithm.CGAlgorithms;
+
 import cumulus_message_adapter.message_parser.AdapterLogger;
 
 public class MetadataFilesToEcho {
@@ -421,6 +424,7 @@ public IsoGranule readIsoMendsMetadataFile(String s3Location, Document doc, XPat
                     Double.parseDouble(xpath.evaluate(IsoMendsXPath.WEST_BOUNDING_COORDINATE, doc)));
         }
         ((IsoGranule) granule).setPolygon(xpath.evaluate(IsoMendsXPath.POLYGON, doc));
+		((IsoGranule) granule).setOrientation(CGAlgorithms.COUNTERCLOCKWISE);
 
         NodeList nodes = (NodeList) xpath.evaluate(IsoMendsXPath.DATA_FILE, doc, XPathConstants.NODESET);
         for (int i = 0; i < nodes.getLength(); i++) {
@@ -530,20 +534,20 @@ public IsoGranule readIsoMendsMetadataFile(String s3Location, Document doc, XPat
 			additionalAttributes.remove("publishAll");
 			((IsoGranule) granule).setDynamicAttributeNameMapping(additionalAttributes);
 		}
-		
-					
+
+
         String mgrsId = xpath.evaluate(IsoMendsXPath.MGRS_ID, doc);
         if (mgrsId != null && !mgrsId.equals("")) {
             // If MGRS_ID field is not null, set as additional attribute
             AdditionalAttributeType mgrsAttr = new AdditionalAttributeType("MGRS_TILE_ID", Collections.singletonList(mgrsId));
-            
+
             List<AdditionalAttributeType> additionalAttributeTypes = ((IsoGranule) granule).getAdditionalAttributeTypes();
             if (additionalAttributeTypes == null) {
                 additionalAttributeTypes = Collections.singletonList(mgrsAttr);
             } else {
                 additionalAttributeTypes.add(mgrsAttr);
             }
-            
+
             JSONObject dynamicAttributeNameMapping = ((IsoGranule) granule).getDynamicAttributeNameMapping();
             if (dynamicAttributeNameMapping == null) {
                 ((IsoGranule) granule).setDynamicAttributeNameMapping(additionalAttributes);
@@ -788,6 +792,7 @@ private void readIsoSmapMetadataFile(String s3Location, Document doc, XPath xpat
 
         ((IsoGranule) granule).setSwotTrack(xpath.evaluate(IsoSmapXPath.SWOT_TRACK, doc));
 		((IsoGranule) granule).setPolygon(xpath.evaluate(IsoSmapXPath.POLYGON, doc));
+		((IsoGranule) granule).setOrientation(CGAlgorithms.CLOCKWISE);
 
         Source source = new Source();
         source.setSourceShortName(xpath.evaluate(IsoSmapXPath.PLATFORM, doc));
@@ -829,7 +834,7 @@ public void readSwotArchiveXmlFile(String file) throws ParserConfigurationExcept
 		// No spatial extent exists for SWOT L0 data so set as global
 		setGranuleBoundingBox(90.0, -90.0, 180.0, -180.0);
 	}
-    
+
     /**
      * Parse metadata from SWOT Cal/Val XML file
      * @param file path to SWOT Cal/Val XML file on local file system
@@ -840,19 +845,19 @@ public void readSwotCalValXmlFile(String file) throws ParserConfigurationExcepti
         docBuilderFactory.setNamespaceAware(true);
         DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
         Document doc = docBuilder.parse(new File(file));
-    
+
         XPath xpath = XPathFactory.newInstance().newXPath();
         xpath.setNamespaceContext(new NamespaceResolver(doc));
-    
+
         String startTime = xpath.evaluate(SwotCalValXmlPath.BEGINNING_DATE_TIME, doc);
         String stopTime = xpath.evaluate(SwotCalValXmlPath.ENDING_DATE_TIME, doc);
         String createTime = xpath.evaluate(SwotCalValXmlPath.CREATION_DATE_TIME, doc);
-    
+
         String north = xpath.evaluate(SwotCalValXmlPath.NORTH_BOUNDING_COORDINATE, doc);
         String south = xpath.evaluate(SwotCalValXmlPath.SOUTH_BOUNDING_COORDINATE, doc);
         String east = xpath.evaluate(SwotCalValXmlPath.EAST_BOUNDING_COORDINATE, doc);
         String west = xpath.evaluate(SwotCalValXmlPath.WEST_BOUNDING_COORDINATE, doc);
-    
+
         try {
             granule.setStartTime(DatatypeConverter.parseDateTime(startTime).getTime());
             granule.setStopTime(DatatypeConverter.parseDateTime(stopTime).getTime());
@@ -861,7 +866,7 @@ public void readSwotCalValXmlFile(String file) throws ParserConfigurationExcepti
             throw new IllegalArgumentException(String.format("Failed to parse datetime start=%s stop=%s create=%s",
                     startTime, stopTime, createTime), exception);
         }
-    
+
         try {
             setGranuleBoundingBox(Double.parseDouble(north),
                     Double.parseDouble(south),

src/main/java/gov/nasa/cumulus/metadata/aggregator/UMMGranuleFile.java

@@ -593,7 +593,7 @@ private JSONObject exportSpatial() throws ParseException{
         Set<GranuleCharacter> granuleCharacters = granule.getGranuleCharacterSet();
         for (GranuleCharacter granuleCharacter : granuleCharacters) {
             if (granuleCharacter.getDatasetElement().getElementDD().getShortName().equals("line")) {
-                geometry = line2Polygons(geometry,granuleCharacter.getValue());
+                geometry = line2Polygons(geometry, granuleCharacter.getValue());
                 break;
             }
         }
@@ -711,6 +711,9 @@ public JSONObject addPolygons(JSONObject geometry, ArrayList<ArrayList<Coordinat
         geometry.put("GPolygons", polygons);
         GeometryFactory geometryFactory = new GeometryFactory();
 
+        int orientation = ((IsoGranule) granule).getOrientation();
+        int desired_orientation = CGAlgorithms.COUNTERCLOCKWISE;
+
         for(int i =0; i<inputPolygons.size(); i++) {
             ArrayList<Coordinate> geo = inputPolygons.get(i);
 
@@ -719,9 +722,16 @@ public JSONObject addPolygons(JSONObject geometry, ArrayList<ArrayList<Coordinat
             AdapterLogger.LogInfo(this.className + " Polygon is valid: " + polygon.isValid());
             AdapterLogger.LogInfo(this.className + " Polygon WKT: " + UMMUtils.getWKT(polygon));
             AdapterLogger.LogInfo(this.className + " ------------------------------------------");
-            List<Coordinate> counterClockwiseCoordinates = Arrays.asList(
-                    UMMUtils.ensureOrientation(CGAlgorithms.COUNTERCLOCKWISE, geo.toArray(new Coordinate[geo.size()]))
-                    );
+
+            Coordinate[] coordinates_array = geo.toArray(new Coordinate[geo.size()]);
+            List<Coordinate> orientedCoordinates;
+            if (orientation != desired_orientation) {
+            orientedCoordinates = Arrays.asList(
+                UMMUtils.ensureOrientation(desired_orientation, orientation, coordinates_array)
+                );
+            } else {
+                orientedCoordinates = Arrays.asList(coordinates_array);
+            }
 
             // valid polygon by vividsolution again
             if(polygon.isValid() || invalidOK) {
@@ -730,9 +740,9 @@ public JSONObject addPolygons(JSONObject geometry, ArrayList<ArrayList<Coordinat
                 gPolygon.put("Boundary", boundary);
                 polygons.add(gPolygon);
                 JSONArray points = new JSONArray();
-                for(int j=0; j<counterClockwiseCoordinates.size(); j++) {
+                for(int j=0; j<orientedCoordinates.size(); j++) {
                     JSONObject point = new JSONObject();
-                    Coordinate c = counterClockwiseCoordinates.get(j);
+                    Coordinate c = orientedCoordinates.get(j);
                     point.put("Longitude", c.x);
                     point.put("Latitude", c.y);
                     points.add(point);

src/main/java/gov/nasa/cumulus/metadata/aggregator/UMMUtils.java

@@ -230,14 +230,15 @@ public static boolean isGlobalBoundingBox(ArrayList<Coordinate> coordinates) {
      * @return  an array of coordinates in the desired counterclockwise or clockwise sequence
      */
     public static Coordinate[] ensureOrientation(
-            final int desiredOrientation, final Coordinate... coord) {
+            final int desiredOrientation, int inputOrientation, final Coordinate... coord) {
         if (coord.length == 0) {
             return coord;
         }
-        final int orientation = CGAlgorithms.isCCW(coord) ? CGAlgorithms.COUNTERCLOCKWISE
+        if (inputOrientation != CGAlgorithms.COUNTERCLOCKWISE && inputOrientation != CGAlgorithms.CLOCKWISE) {
+            inputOrientation = CGAlgorithms.isCCW(coord) ? CGAlgorithms.COUNTERCLOCKWISE
                 : CGAlgorithms.CLOCKWISE;
-
-        if (orientation != desiredOrientation) {
+        }
+        if (inputOrientation != desiredOrientation) {
             final Coordinate[] reverse = coord.clone();
             reverse(reverse);
 

src/test/java/gov/nasa/cumulus/metadata/aggregator/UMMUtilsTest.java

@@ -112,7 +112,7 @@ public void testEnsureClockwise2CounterclockwisePolygon() throws ParseException
         Geometry geometry = wktReader.read(clockwisePolygonWKT);
         Coordinate[] coordinates = geometry.getCoordinates();
         // the original input array's trailing 3 coordinates will become leading 3 coordinates
-        Coordinate[] reversedCoordinates = UMMUtils.ensureOrientation(CGAlgorithms.COUNTERCLOCKWISE, coordinates);
+        Coordinate[] reversedCoordinates = UMMUtils.ensureOrientation(CGAlgorithms.COUNTERCLOCKWISE, 0, coordinates);
         assertTrue(reversedCoordinates[0].x == Double.valueOf(45.261678) &&
                 reversedCoordinates[0].y == Double.valueOf(-65.651128));
         assertTrue(reversedCoordinates[1].x == Double.valueOf(45.36766) &&
@@ -132,7 +132,7 @@ public void testEnsureCounterclockwise2CounterclockwisePolygon() throws ParseExc
         WKTReader wktReader = new WKTReader();
         Geometry geometry = wktReader.read(clockwisePolygonWKT);
         Coordinate[] coordinates = geometry.getCoordinates();
-        Coordinate[] sameSequenceCoordinates = UMMUtils.ensureOrientation(CGAlgorithms.COUNTERCLOCKWISE, coordinates);
+        Coordinate[] sameSequenceCoordinates = UMMUtils.ensureOrientation(CGAlgorithms.COUNTERCLOCKWISE, 0, coordinates);
         assertTrue(sameSequenceCoordinates[0].x == Double.valueOf(-66.1897) &&
                 sameSequenceCoordinates[0].y == Double.valueOf(63.1972));
         assertTrue(sameSequenceCoordinates[1].x == Double.valueOf(-83.1304) &&