Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NDCUM-1016 #57

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

NDCUM-1016 #57

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c285f88
Updated call to updatePolygon so we're calling updatePolygons instead…
mikedorfman May 31, 2023
c9a0ee5
- Used StringUtils to determine whether a string is empty
mikedorfman Jun 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 6 additions & 30 deletions src/main/java/gov/nasa/cumulus/metadata/aggregator/UMMGranuleFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,10 +423,13 @@ private JSONObject exportSpatial() throws ParseException{
spatialExtent.put("HorizontalSpatialDomain", horizontalSpatialDomain);

if (granule instanceof IsoGranule) {
String polygon = ((IsoGranule) granule).getPolygon();
if (polygon != "" && polygon != null) {
String polygonString = ((IsoGranule) granule).getPolygon();
if (!StringUtils.isEmpty(StringUtils.trim(polygonString))) {
// Export Polygon
addPolygon(geometry, polygon);
ArrayList<Coordinate> polygonCoordinates = UMMUtils.lineString2Coordinates(polygonString);
ArrayList<ArrayList<Coordinate>> polygonCoordinatesArrayList = new ArrayList<ArrayList<Coordinate>>(1);
polygonCoordinatesArrayList.add(polygonCoordinates);
addPolygons(geometry, polygonCoordinatesArrayList);
}
// Export Orbit
// Commented out for now since UMM v1.5 only allows for either Geometry or Orbit not both
Expand Down Expand Up @@ -865,33 +868,6 @@ private JSONObject exportQAStats(IsoGranule granule) {
return parameter;
}

private void addPolygon(JSONObject geometry, String polygon) {
JSONArray polygons = new JSONArray();
geometry.put("GPolygons", polygons);

JSONObject gPolygon = new JSONObject();
JSONObject boundary = new JSONObject();
gPolygon.put("Boundary", boundary);
polygons.add(gPolygon);

JSONArray points = new JSONArray();
String[] polygonArray = polygon.split(" ");

for (int i = 0; i < polygonArray.length; i += 2) {
JSONObject point = new JSONObject();
String lon = polygonArray[i + 1];
String lat = polygonArray[i];
if (BoundingTools.allParsable(lon, lat)) {
point.put("Longitude", Double.parseDouble(lon));
point.put("Latitude", Double.parseDouble(lat));
points.add(point);
} else {
AdapterLogger.LogWarning("Unable to parse polygon, lon: " + lon + ", lat: " + lat);
}
}
boundary.put("Points", points);
}

/**
* Parses line string and adds it to lines array in geometry JSON object.
* Points are sorted by longitude. Duplicate points are removed.
Expand Down