[GEOS-11797]: fix on sorting bands (geoserver#8499)

Author: dromagnoli

src/main/src/main/java/org/geoserver/catalog/CoverageViewReader.java

@@ -100,7 +100,6 @@
 import org.geotools.referencing.CRS;
 import org.geotools.referencing.crs.DefaultGeographicCRS;
 import org.geotools.util.NumberRange;
-import org.geotools.util.factory.GeoTools;
 import org.geotools.util.factory.Hints;
 import org.geotools.util.logging.Logging;
 
@@ -427,15 +426,20 @@ public GridCoverage2D readUsingBandSelect(
 
     private GridCoverage2D readUsingJiffle(ViewInputs viewInputs) {
         HashMap<String, GridCoverage2D> inputCoverages = viewInputs.getInputCoverages();
+        List<String> coverageOrder = new ArrayList<>(inputCoverages.keySet());
         GridCoverage2D[] coverages = inputCoverages.values().toArray(new GridCoverage2D[0]);
         GridCoverage2D reference = coverages[0];
 
         String destName = coverageView.getOutputName();
         String script = coverageView.getDefinition();
         List<CoverageBand> outputBands = coverageView.getCoverageBands();
         List<InputCoverageBand> inputBands = outputBands.get(0).getInputCoverageBands();
+        Set<String> usedBandNames =
+                inputBands.stream().map(InputCoverageBand::getCoverageName).collect(Collectors.toSet());
+
+        // Make sure sourceBands are sorted the same way as the coverages
         List<String> sourceBands =
-                inputBands.stream().map(icb -> icb.getCoverageName()).collect(Collectors.toList());
+                coverageOrder.stream().filter(usedBandNames::contains).collect(Collectors.toList());
 
         RenderedImage[] sources = new RenderedImage[inputCoverages.size()];
         sources[0] = reference.getRenderedImage();
@@ -446,7 +450,7 @@ private GridCoverage2D readUsingJiffle(ViewInputs viewInputs) {
             } else {
                 double[] nodata = CoverageUtilities.getBackgroundValues(coverage);
                 ROI roi = CoverageUtilities.getROIProperty(coverage);
-                sources[i] = GridCoverage2DRIA.create(coverage, reference, nodata, GeoTools.getDefaultHints(), roi);
+                sources[i] = GridCoverage2DRIA.create(coverage, reference, nodata, hints, roi);
             }
         }
 
@@ -455,20 +459,10 @@ private GridCoverage2D readUsingJiffle(ViewInputs viewInputs) {
         Range[] nodatas = new Range[sources.length];
         nodatas = getNodatas(nodatas, coverages);
         RenderedOp result = JiffleDescriptor.create(
-                sources,
-                sourceNames,
-                destName,
-                script,
-                null,
-                null,
-                outputBandCount,
-                null,
-                null,
-                nodatas,
-                GeoTools.getDefaultHints());
+                sources, sourceNames, destName, script, null, null, outputBandCount, null, null, nodatas, hints);
 
         GridSampleDimension[] sampleDimensions = getSampleDimensions(result, destName);
-        GridCoverageFactory factory = new GridCoverageFactory(GeoTools.getDefaultHints());
+        GridCoverageFactory factory = new GridCoverageFactory(hints);
         return factory.create("jiffle", result, reference.getEnvelope(), sampleDimensions, coverages, null);
     }
 

src/main/src/test/java/org/geoserver/catalog/CoverageViewTest.java

@@ -62,6 +62,7 @@ public class CoverageViewTest extends GeoServerSystemTestSupport {
     private static final String RGB_IR_VIEW = "RgbIrView";
     private static final String BANDS_FLAGS_VIEW = "BandsFlagsView";
     private static final String NDVI_VIEW = "NDVI";
+    private static final String NDVI_VIEW2 = "NDVI2";
     private static final String BGR_VIEW = "BGR";
     private static final double ERROR = 1E-5;
     protected static QName WATTEMP = new QName(MockData.SF_URI, "watertemp", MockData.SF_PREFIX);
@@ -96,6 +97,7 @@ protected void onSetUp(SystemTestData testData) throws Exception {
         configureIROnCatalog(cat);
         configureBandsFlagsOnCatalog(cat);
         configureNDVIonCatalog(cat);
+        configureNDVI2(cat);
         configureBGRonCatalogWithJiffle(cat);
     }
 
@@ -129,7 +131,7 @@ private void configureNDVIonCatalog(Catalog cat) throws Exception {
         final CoverageStoreInfo storeInfo = cat.getCoverageStoreByName("s2reduced");
         InputCoverageBand ib04 = new InputCoverageBand("B04", "0");
         InputCoverageBand ib08 = new InputCoverageBand("B08", "0");
-        final CoverageBand ndvi = new CoverageBand(Arrays.asList(ib04, ib08), "ndvi", 0, CompositionType.JIFFLE);
+        final CoverageBand ndvi = new CoverageBand(Arrays.asList(ib04, ib08), "NDVI", 0, CompositionType.JIFFLE);
         final CoverageView coverageView = new CoverageView(NDVI_VIEW, Collections.singletonList(ndvi));
         coverageView.setOutputName("NDVI");
         coverageView.setDefinition("NDVI = (B08 - B04) / (B04 + B08);");
@@ -140,6 +142,22 @@ private void configureNDVIonCatalog(Catalog cat) throws Exception {
         cat.add(coverageInfo);
     }
 
+    private void configureNDVI2(Catalog cat) throws Exception {
+        final CoverageStoreInfo storeInfo = cat.getCoverageStoreByName("s2reduced");
+        InputCoverageBand ib04 = new InputCoverageBand("B04", "0");
+        InputCoverageBand ib08 = new InputCoverageBand("B08", "0");
+        // set bands in a different order
+        final CoverageBand ndvi = new CoverageBand(Arrays.asList(ib08, ib04), "NDVI2", 0, CompositionType.JIFFLE);
+        final CoverageView coverageView = new CoverageView(NDVI_VIEW2, Collections.singletonList(ndvi));
+        coverageView.setOutputName("NDVI2");
+        coverageView.setDefinition("A=B08; B=B04; NDVI2=(A-B)/(B+A);");
+        coverageView.setCompositionType(CompositionType.JIFFLE);
+        final CatalogBuilder builder = new CatalogBuilder(cat);
+        builder.setStore(storeInfo);
+        final CoverageInfo coverageInfo = coverageView.createCoverageInfo(NDVI_VIEW2, storeInfo, builder);
+        cat.add(coverageInfo);
+    }
+
     private void configureBGRonCatalogWithJiffle(Catalog cat) throws Exception {
         // Let's do bands swap with jiffle
         final CoverageStoreInfo storeInfo = cat.getCoverageStoreByName("ir-rgb");
@@ -250,12 +268,14 @@ public void testCoverageView() throws Exception {
     }
 
     private void disposeCoverage(GridCoverage coverage) {
-        RenderedImage ri = coverage.getRenderedImage();
-        if (coverage instanceof GridCoverage2D) {
-            ((GridCoverage2D) coverage).dispose(true);
-        }
-        if (ri instanceof PlanarImage) {
-            ImageUtilities.disposePlanarImageChain((PlanarImage) ri);
+        if (coverage != null) {
+            RenderedImage ri = coverage.getRenderedImage();
+            if (coverage instanceof GridCoverage2D) {
+                ((GridCoverage2D) coverage).dispose(true);
+            }
+            if (ri instanceof PlanarImage) {
+                ImageUtilities.disposePlanarImageChain((PlanarImage) ri);
+            }
         }
     }
 
@@ -309,19 +329,30 @@ public void testBands() throws Exception {
 
     @Test
     public void testNDVIJiffle() throws Exception {
-        Catalog cat = getCatalog();
-        CoverageInfo coverageInfo = cat.getCoverageByName(NDVI_VIEW);
-        final ResourcePool rp = cat.getResourcePool();
-        GridCoverageReader reader = rp.getGridCoverageReader(coverageInfo, NDVI_VIEW, null);
-        GridCoverage2D solidCoverage = (GridCoverage2D) reader.read(NDVI_VIEW, null);
+        assertNdvi("NDVI");
+    }
 
-        GridCoverageReader rb04 = rp.getGridCoverageReader(cat.getCoverageByName("B04"), "B04", null);
-        GridCoverageReader rb08 = rp.getGridCoverageReader(cat.getCoverageByName("B08"), "B08", null);
-        GridCoverage b04Coverage = rb04.read("B04", null);
-        GridCoverage b08Coverage = rb08.read("B08", null);
+    @Test
+    public void testNDVI2Jiffle() throws Exception {
+        assertNdvi("NDVI2");
+    }
 
+    private void assertNdvi(String viewName) throws Exception {
+        GridCoverage2D solidCoverage = null;
+        GridCoverage b04Coverage = null;
+        GridCoverage b08Coverage = null;
         try {
-            assertBandNames(solidCoverage, "NDVI");
+            Catalog cat = getCatalog();
+            CoverageInfo coverageInfo = cat.getCoverageByName(viewName);
+            final ResourcePool rp = cat.getResourcePool();
+            GridCoverageReader reader = rp.getGridCoverageReader(coverageInfo, viewName, null);
+            solidCoverage = (GridCoverage2D) reader.read(viewName, null);
+            assertBandNames(solidCoverage, viewName);
+            GridCoverageReader rb04 = rp.getGridCoverageReader(cat.getCoverageByName("B04"), "B04", null);
+            GridCoverageReader rb08 = rp.getGridCoverageReader(cat.getCoverageByName("B08"), "B08", null);
+            b04Coverage = rb04.read("B04", null);
+            b08Coverage = rb08.read("B08", null);
+
             RenderedImage ri = solidCoverage.getRenderedImage();
             Raster raster = ri.getData();
             Raster b04 = b04Coverage.getRenderedImage().getData();
@@ -339,7 +370,6 @@ public void testNDVIJiffle() throws Exception {
                     assertEquals(d, ndvi, ERROR);
                 }
             }
-
         } finally {
             disposeCoverage(solidCoverage);
             disposeCoverage(b04Coverage);