Skip to content

Commit 180c8cf

Browse files
TomBlockTomBlock
committed
refactoring, added test
1 parent 1392c3b commit 180c8cf

16 files changed

+61
-38
lines changed

‎core/src/main/java/com/bc/fiduceo/reader/slstr/SlstrPixelLocator.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.bc.fiduceo.reader.slstr;
22

3+
import com.bc.fiduceo.reader.slstr.utility.Transform;
34
import com.bc.fiduceo.reader.snap.SNAP_PixelLocator;
45
import org.esa.snap.core.datamodel.GeoCoding;
56

‎core/src/main/java/com/bc/fiduceo/reader/slstr/SlstrReader.java‎

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
import com.bc.fiduceo.reader.AcquisitionInfo;
99
import com.bc.fiduceo.reader.ReaderContext;
1010
import com.bc.fiduceo.reader.ReaderUtils;
11+
import com.bc.fiduceo.reader.slstr.utility.ManifestUtil;
12+
import com.bc.fiduceo.reader.slstr.utility.Transform;
13+
import com.bc.fiduceo.reader.slstr.utility.TransformFactory;
1114
import com.bc.fiduceo.reader.snap.SNAP_Reader;
1215
import com.bc.fiduceo.reader.snap.VariableProxy;
1316
import com.bc.fiduceo.reader.time.TimeLocator;
@@ -232,21 +235,6 @@ public Array readRaw(int centerX, int centerY, Interval interval, String variabl
232235

233236
readRawProductData(dataNode, readArray, width, height, xOffset, yOffset);
234237

235-
// final Index index = targetArray.getIndex();
236-
// int readIndex = 0;
237-
// for (int y = 0; y < width; y++) {
238-
// final int currentY = yOffset + y;
239-
// for (int x = 0; x < height; x++) {
240-
// final int currentX = xOffset + x;
241-
//
242-
// if (currentX >= 0 && currentX < rasterSize.getNx() && currentY >= 0 && currentY < rasterSize.getNy()) {
243-
// index.set(y, x);
244-
// targetArray.setObject(index, readArray.getObject(readIndex));
245-
// ++readIndex;
246-
// }
247-
// }
248-
// }
249-
250238
if (variableNames.isFlagVariable(variableName)) {
251239
return transform.processFlags(readArray, (int) noDataValue);
252240
} else {
@@ -379,13 +367,13 @@ private int getObliqueGridOffset() {
379367
if (element.getName().equalsIgnoreCase("nadirImageSize")) {
380368
final MetadataAttribute grid = element.getAttribute("grid");
381369
if (grid.getData().getElemString().equalsIgnoreCase("1 km")) {
382-
nadirTrackOffset = extractTrackOffset(element);
370+
nadirTrackOffset = ManifestUtil.extractTrackOffset(element);
383371
}
384372
}
385373
if (element.getName().equalsIgnoreCase("obliqueImageSize")) {
386374
final MetadataAttribute grid = element.getAttribute("grid");
387375
if (grid.getData().getElemString().equalsIgnoreCase("1 km")) {
388-
obliqueTrackOffset = extractTrackOffset(element);
376+
obliqueTrackOffset = ManifestUtil.extractTrackOffset(element);
389377
}
390378
}
391379
}
@@ -397,12 +385,6 @@ private int getObliqueGridOffset() {
397385
return nadirTrackOffset - obliqueTrackOffset;
398386
}
399387

400-
private int extractTrackOffset(MetadataElement element) {
401-
final MetadataAttribute trackOffset = element.getAttribute("trackOffset");
402-
final String trackOffsetString = trackOffset.getData().getElemString();
403-
return Integer.parseInt(trackOffsetString);
404-
}
405-
406388
private void ensureTimingVector() {
407389
if (subs_times == null) {
408390
final MetadataElement metadataRoot = product.getMetadataRoot();

core/src/main/java/com/bc/fiduceo/reader/slstr/Abstract500mTransform.java renamed to core/src/main/java/com/bc/fiduceo/reader/slstr/utility/Abstract500mTransform.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.bc.fiduceo.reader.slstr;
1+
package com.bc.fiduceo.reader.slstr.utility;
22

33
import com.bc.fiduceo.util.NetCDFUtils;
44
import ucar.ma2.Array;

‎core/src/main/java/com/bc/fiduceo/reader/slstr/utility/ManifestUtil.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package com.bc.fiduceo.reader.slstr.utility;
2+
3+
import org.esa.snap.core.datamodel.MetadataAttribute;
4+
import org.esa.snap.core.datamodel.MetadataElement;
5+
6+
public class ManifestUtil {
7+
8+
public static int extractTrackOffset(MetadataElement element) {
9+
final MetadataAttribute trackOffset = element.getAttribute("trackOffset");
10+
final String trackOffsetString = trackOffset.getData().getElemString();
11+
return Integer.parseInt(trackOffsetString);
12+
}
13+
}

core/src/main/java/com/bc/fiduceo/reader/slstr/Nadir1kmTransform.java renamed to core/src/main/java/com/bc/fiduceo/reader/slstr/utility/Nadir1kmTransform.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.bc.fiduceo.reader.slstr;
1+
package com.bc.fiduceo.reader.slstr.utility;
22

33
import com.bc.fiduceo.core.Dimension;
44
import com.bc.fiduceo.core.Interval;

core/src/main/java/com/bc/fiduceo/reader/slstr/Nadir500mTransform.java renamed to core/src/main/java/com/bc/fiduceo/reader/slstr/utility/Nadir500mTransform.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.bc.fiduceo.reader.slstr;
1+
package com.bc.fiduceo.reader.slstr.utility;
22

33
import com.bc.fiduceo.core.Dimension;
44
import com.bc.fiduceo.core.Interval;

core/src/main/java/com/bc/fiduceo/reader/slstr/Oblique1kmTransform.java renamed to core/src/main/java/com/bc/fiduceo/reader/slstr/utility/Oblique1kmTransform.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.bc.fiduceo.reader.slstr;
1+
package com.bc.fiduceo.reader.slstr.utility;
22

33
import com.bc.fiduceo.core.Dimension;
44
import com.bc.fiduceo.core.Interval;

core/src/main/java/com/bc/fiduceo/reader/slstr/Oblique500mTransform.java renamed to core/src/main/java/com/bc/fiduceo/reader/slstr/utility/Oblique500mTransform.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.bc.fiduceo.reader.slstr;
1+
package com.bc.fiduceo.reader.slstr.utility;
22

33
import com.bc.fiduceo.core.Dimension;
44
import com.bc.fiduceo.core.Interval;

core/src/main/java/com/bc/fiduceo/reader/slstr/Transform.java renamed to core/src/main/java/com/bc/fiduceo/reader/slstr/utility/Transform.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package com.bc.fiduceo.reader.slstr;
1+
package com.bc.fiduceo.reader.slstr.utility;
22

33
import com.bc.fiduceo.core.Dimension;
44
import com.bc.fiduceo.core.Interval;
55
import ucar.ma2.Array;
66

77
import java.io.IOException;
88

9-
interface Transform {
9+
public interface Transform {
1010

1111
Dimension getRasterSize();
1212

core/src/main/java/com/bc/fiduceo/reader/slstr/TransformFactory.java renamed to core/src/main/java/com/bc/fiduceo/reader/slstr/utility/TransformFactory.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
package com.bc.fiduceo.reader.slstr;
1+
package com.bc.fiduceo.reader.slstr.utility;
2+
3+
import com.bc.fiduceo.reader.slstr.VariableType;
24

35
import static com.bc.fiduceo.reader.slstr.VariableType.*;
46

5-
class TransformFactory {
7+
public class TransformFactory {
68

79
private final int rasterWidth;
810
private final int rasterHeight;
911
private final int obliqueRasterOffset;
1012

11-
TransformFactory(int rasterWidth, int rasterHeight, int obliqueRasterOffset) {
13+
public TransformFactory(int rasterWidth, int rasterHeight, int obliqueRasterOffset) {
1214
this.rasterWidth = rasterWidth;
1315
this.rasterHeight = rasterHeight;
1416
this.obliqueRasterOffset = obliqueRasterOffset;

0 commit comments

Comments
 (0)