Skip to content

Commit

Permalink
v1.1.1 -> v1.2.0 changes (#5)
Browse files Browse the repository at this point in the history 
Co-authored-by: Brian Skidmore <[email protected]>
  • Loading branch information
@classicskids
classicskids and Brian Skidmore authored Sep 30, 2021
1 parent 867e12f commit 2de15c2
Show file tree
Hide file tree
Showing 3 changed files with 139 additions and 243 deletions.
58 changes: 56 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>com.airbus.snap</groupId>
<artifactId>snap-novasar-reader</artifactId>
<version>1.1.1</version>
<version>1.2.0</version>
<packaging>nbm</packaging>

<name>NovaSAR Product Reader</name>
Expand All @@ -23,48 +23,102 @@
<groupId>org.esa.snap</groupId>
<artifactId>ceres-core</artifactId>
<version>${snap.version}</version>
<exclusions>
<exclusion>
<groupId>com.sun</groupId>
<artifactId>tools</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.esa.snap</groupId>
<artifactId>ceres-jai</artifactId>
<version>${snap.version}</version>
<exclusions>
<exclusion>
<groupId>com.sun</groupId>
<artifactId>tools</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.esa.snap</groupId>
<artifactId>ceres-glayer</artifactId>
<version>${snap.version}</version>
<exclusions>
<exclusion>
<groupId>com.sun</groupId>
<artifactId>tools</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.esa.snap</groupId>
<artifactId>ceres-binio</artifactId>
<version>${snap.version}</version>
<exclusions>
<exclusion>
<groupId>com.sun</groupId>
<artifactId>tools</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.esa.snap</groupId>
<artifactId>snap-core</artifactId>
<version>${snap.version}</version>
<exclusions>
<exclusion>
<groupId>com.sun</groupId>
<artifactId>tools</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.esa.snap</groupId>
<artifactId>snap-engine-utilities</artifactId>
<version>${snap.version}</version>
<exclusions>
<exclusion>
<groupId>com.sun</groupId>
<artifactId>tools</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.esa.s1tbx</groupId>
<artifactId>s1tbx-commons</artifactId>
<version>${s1tbx.version}</version>
<exclusions>
<exclusion>
<groupId>com.sun</groupId>
<artifactId>tools</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.esa.s1tbx</groupId>
<artifactId>s1tbx-io</artifactId>
<version>${s1tbx.version}</version>
<exclusions>
<exclusion>
<groupId>com.sun</groupId>
<artifactId>tools</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.12</version>
<exclusions>
<exclusion>
<groupId>com.sun</groupId>
<artifactId>tools</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

Expand Down
98 changes: 22 additions & 76 deletions src/main/java/com/airbus/snap/dataio/novasar/NovaSARProductDirectory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
import java.util.Set;
import java.util.StringTokenizer;


//========================================================================================================================================================================================
// Class to represent a NovaSAR Product Directory
//========================================================================================================================================================================================
Expand All @@ -72,6 +73,7 @@ public class NovaSARProductDirectory extends XMLProductDirectory

private static final DateFormat standardDateFormat = ProductData.UTC.createDateFormat("yyyy-MM-dd HH:mm:ss");

// doesn't seem to amount to anything, I assume it's part of the RS2 loader that's not included for NovaSAR
private static final boolean flipToSARGeometry = System.getProperty(SystemUtils.getApplicationContextId() + ".flip.to.sar.geometry", "false").equals("true");

private final transient Map<String, String> polarizationMap = new HashMap<>(4);
Expand Down Expand Up @@ -102,7 +104,8 @@ protected void addImageFile(final String imgPath, final MetadataElement newRoot)
{
boolean valid = false;
int dataType = ProductData.TYPE_INT32;
if (name.startsWith("image")) {
// AFAIK, these are the only three names of files which are valid.
if (name.equals("image_HH.tif") || name.equals("image_VV.tif") || name.equals("image_HV.tif") || name.equals("image_VH.tif")) {
valid = true;
} else if (name.startsWith("rh") || name.startsWith("rv"))
{
Expand Down Expand Up @@ -185,13 +188,19 @@ protected void addBands(final Product product)
{

String bandName;
String betaBandName;
boolean real = true;
Band lastRealBand = null;
String unit;
final String defStr = AbstractMetadata.NO_METADATA_STRING;

final MetadataElement absRoot = AbstractMetadata.getAbstractedMetadata(product);
final MetadataElement origProdRoot = AbstractMetadata.getOriginalProductMetadata(product);
final MetadataElement productElem = origProdRoot.getElement("metadata");
final int width = absRoot.getAttributeInt(AbstractMetadata.num_samples_per_line);
final int height = absRoot.getAttributeInt(AbstractMetadata.num_output_lines);
final MetadataElement imageGenerationParameters = productElem.getElement("Image_Generation_Parameters");
final String radScaling = imageGenerationParameters.getAttributeString("RadiometricScaling");

final Set<String> keys = bandImageFileMap.keySet(); // The set of keys in the map.
for (String key : keys)
Expand Down Expand Up @@ -228,7 +237,8 @@ protected void addBands(final Product product)
}
else
{
ReaderUtils.createVirtualIntensityBand(product, lastRealBand, band, '_' + getPol(imgName));
betaBandName = radScaling + "_Intensity_";
ReaderUtils.createVirtualIntensityBand(product, lastRealBand, band, betaBandName, getPol(imgName));
}
real = !real;
}
Expand All @@ -244,8 +254,11 @@ protected void addBands(final Product product)

product.addBand(band);
bandMap.put(band, new ImageIOFile.BandInfo(band, img, i, b));

SARReader.createVirtualIntensityBand(product, band, '_' + getPol(imgName));
betaBandName = radScaling + "_Amplitude_" + getPol(imgName);
SARReader.createVirtualIntensityBand(product, band, getPol(imgName));
final String snapBandName = "Intensity" + getPol(imgName);
Band snapBand = product.getBand(snapBandName);
snapBand.setName(betaBandName);
}
}
}
Expand Down Expand Up @@ -476,7 +489,7 @@ protected void addAbstractedMetadataHeader(final MetadataElement root) throws IO

// Verify Product Format (e.g. GEOTIFF)
final String pf = imageAttributes.getAttributeString("ProductFormat", defStr);
verifyProductFormat(pf);
// verifyProductFormat(pf); // removed as wasn't really useful

// Extract Number of Lines in Image
AbstractMetadata.setAttribute(absRoot, AbstractMetadata.num_output_lines, imageAttributes.getAttributeInt("NumberOfLinesInImage", defInt));
Expand Down Expand Up @@ -756,6 +769,7 @@ protected void addGeoCoding(final Product product)

MetadataElement absRoot = AbstractMetadata.getAbstractedMetadata(product);
final boolean isAscending = absRoot.getAttributeString(AbstractMetadata.PASS).equals("ASCENDING");
// final boolean isAscending = false;
final boolean isAntennaPointingRight = absRoot.getAttributeString(AbstractMetadata.antenna_pointing).equals("right");

final MetadataElement origProdRoot = AbstractMetadata.getOriginalProductMetadata(product);
Expand Down Expand Up @@ -795,67 +809,6 @@ protected void addGeoCoding(final Product product)
}
}

if (flipToSARGeometry)
{
float[] flippedLatList = new float[numberOfTiepoints];
float[] flippedLonList = new float[numberOfTiepoints];
int is, id;
if (isAscending)
{
if (isAntennaPointingRight)
{ // flip upside down
for (int r = 0; r < gridHeight; r++)
{
is = r * gridWidth;
id = (gridHeight - r - 1) * gridWidth;
for (int c = 0; c < gridWidth; c++)
{
flippedLatList[id + c] = latList[is + c];
flippedLonList[id + c] = lngList[is + c];
}
}
}
else
{ // flip upside down then left to right
for (int r = 0; r < gridHeight; r++)
{
is = r * gridWidth;
id = (gridHeight - r) * gridWidth;
for (int c = 0; c < gridWidth; c++)
{
flippedLatList[id - c - 1] = latList[is + c];
flippedLonList[id - c - 1] = lngList[is + c];
}
}
}

}
else
{ // descending

if (isAntennaPointingRight) { // flip left to right
for (int r = 0; r < gridHeight; r++)
{
is = r * gridWidth;
id = r * gridWidth + gridWidth;
for (int c = 0; c < gridWidth; c++)
{
flippedLatList[id - c - 1] = latList[is + c];
flippedLonList[id - c - 1] = lngList[is + c];
}
}
}
else
{ // no flipping is needed
flippedLatList = latList;
flippedLonList = lngList;
}
}

latList = flippedLatList;
lngList = flippedLonList;
}

double subSamplingX = (double) (product.getSceneRasterWidth() - 1) / (gridWidth - 1);
double subSamplingY = (double) (product.getSceneRasterHeight() - 1) / (gridHeight - 1);

Expand Down Expand Up @@ -901,6 +854,7 @@ private static void setLatLongMetadata(Product product, TiePointGrid latGrid, Ti
//========================================================================================================================================================================================
// Function to
//========================================================================================================================================================================================

@Override
protected void addTiePointGrids(final Product product)
{
Expand Down Expand Up @@ -970,11 +924,6 @@ protected void addTiePointGrids(final Product product)
if (i % subSamplingX == 0)
{
int index = k++;

if (!flipToSARGeometry && (isDescending && isAntennaPointingRight || (!isDescending && !isAntennaPointingRight))) {// flip
index = gridWidth - 1 - index;
}

incidenceAngles[index] = (float) (alpha * Constants.RTOD);
}

Expand All @@ -986,6 +935,7 @@ protected void addTiePointGrids(final Product product)
}

float[] incidenceAngleList = new float[gridWidth * gridHeight];

for (int j = 0; j < gridHeight; j++)
{
System.arraycopy(incidenceAngles, 0, incidenceAngleList, j * gridWidth, gridWidth);
Expand Down Expand Up @@ -1086,11 +1036,7 @@ class coefList
// get slant range time in nanoseconds from range distance in meters
for (int i = 0; i < rangeDist.length; i++)
{
int index = i;
if (!flipToSARGeometry && (isDescending && isAntennaPointingRight || !isDescending && !isAntennaPointingRight)) // flip for descending RS2
index = rangeDist.length - 1 - i;

rangeTime[index] = (float) (rangeDist[i] / Constants.halfLightSpeed * Constants.oneBillion); // in ns
rangeTime[i] = (float) (rangeDist[i] / Constants.halfLightSpeed * Constants.oneBillion); // in ns
}

final TiePointGrid slantRangeGrid = new TiePointGrid(OperatorUtils.TPG_SLANT_RANGE_TIME,gridWidth, gridHeight, 0, 0, subSamplingX, subSamplingY, rangeTime);
Expand Down
Loading

0 comments on commit 2de15c2

Please sign in to comment.