From 57c1bea8411299ccf0b701467ef0f30e443b1f96 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 14 Jun 2023 14:44:33 -0600 Subject: [PATCH] Updated tests Fixed missing arg in one call for ensureOrientation --- .../nasa/cumulus/metadata/aggregator/UMMGranuleFile.java | 6 +++--- .../gov/nasa/cumulus/metadata/aggregator/UMMUtilsTest.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/gov/nasa/cumulus/metadata/aggregator/UMMGranuleFile.java b/src/main/java/gov/nasa/cumulus/metadata/aggregator/UMMGranuleFile.java index 4dd8465..1930be4 100644 --- a/src/main/java/gov/nasa/cumulus/metadata/aggregator/UMMGranuleFile.java +++ b/src/main/java/gov/nasa/cumulus/metadata/aggregator/UMMGranuleFile.java @@ -726,9 +726,9 @@ public JSONObject addPolygons(JSONObject geometry, ArrayList orientedCoordinates; if (orientation != desired_orientation) { - orientedCoordinates = Arrays.asList( - UMMUtils.ensureOrientation(desired_orientation, coordinates_array) - ); + orientedCoordinates = Arrays.asList( + UMMUtils.ensureOrientation(desired_orientation, orientation, coordinates_array) + ); } else { orientedCoordinates = Arrays.asList(coordinates_array); } diff --git a/src/test/java/gov/nasa/cumulus/metadata/aggregator/UMMUtilsTest.java b/src/test/java/gov/nasa/cumulus/metadata/aggregator/UMMUtilsTest.java index 897be71..bce683e 100644 --- a/src/test/java/gov/nasa/cumulus/metadata/aggregator/UMMUtilsTest.java +++ b/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) &&