Skip to content

Commit

Permalink
Feature/podaac 5770 divided over idl (#66)
Browse files Browse the repository at this point in the history
* support RiverAvg and LakeAvg with geometry footprint and empty pass

* commented out the hard coded granule beginning/ending datetime

* added RiverAvg sample iso.xml file for unit testing

* ummtest using schema version 1.6.5

* CHANGELOG

* support BasinID

* process nc.iso.xml based on collection config : "isoXmlSpatial": ["footprint"], // can be "footprint", "bbox", or "orbit"

* CHANGELOG

* move PODAAC-5770 to the Fixed section of CHANGELOG

* iso.xml use the POLYGON path, not the LINE

* code modification based on comments

* fixed compiling error

* divided over IDL

* New utility to perform XPath extraction with better logging

* better handle XPath extraction logging and remove MENDSIsoXMLSpatialTypeConstant

* change log for 5708

* removed unused code

* merge from develop. remove un-necessary code.

---------

Co-authored-by: Yen, David (398B-Affiliate) <david.yen@jpl.nasa.gov>
  • Loading branch information
yenes56 and Yen, David (398B-Affiliate) authored Sep 13, 2023
1 parent 902af16 commit da9b689
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Deprecated
### Removed
### Fixed
- **PODAAC-5708**
- .nc.iso.xml Polygon divided over IDL
### Security

-
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -450,10 +450,9 @@ private JSONObject exportSpatial() throws ParseException{
if(this.isoXMLSpatialTypeEnumHashSet.contains(MENDsIsoXMLSpatialTypeEnum.FOOTPRINT)) {
AdapterLogger.LogDebug(this.className + "UMMGranuleFile.exportSpatial FOOTPRINT Processing");
String polygon = ((IsoGranule) granule).getPolygon();
if (polygon != "" && polygon != null) {
// Export Polygon
addPolygon(geometry, polygon);
}
AdapterLogger.LogInfo(this.className + " nc.iso.xml footprint processing ... ");
this.isLineFormattedPolygon = true;
geometry = line2Polygons(geometry,polygon);
}
if(this.isoXMLSpatialTypeEnumHashSet.contains(MENDsIsoXMLSpatialTypeEnum.ORBIT)) {
AdapterLogger.LogDebug(this.className + "UMMGranuleFile.exportSpatial ORBIT Processing");
Expand Down

0 comments on commit da9b689

Please sign in to comment.