implemented sort_by_index geoparm, updated all lua tests

datasets/gebco/selftests/gebco_reader.lua

@@ -19,7 +19,7 @@ local expDepth = { -64,  -4933, -4072}
 local expFlags = {  70,     40,    44}
 
 print(string.format("\n--------------------------------\nTest: GEBCO Correct Values\n--------------------------------"))
-local dem = geo.raster(geo.parms({ asset = "gebco-bathy", algorithm = "NearestNeighbour", with_flags=true}))
+local dem = geo.raster(geo.parms({ asset = "gebco-bathy", algorithm = "NearestNeighbour", with_flags=true, sort_by_index = true }))
 runner.check(dem ~= nil)
 
 for j, lon in ipairs(lons) do

datasets/landsat/selftests/landsat_reader.lua

@@ -47,7 +47,7 @@ local expResults = {{-0.259439707674, 1293577339.0, 'HLS.S30.T01UCS.2021001T2259
                     {-0.022610551591, 1295565136.0, 'HLS.S30.T01UCS.2021024T230841.v2.0 {"algo": "NDVI"}'},
                     {-1.105263157895, 1295737338.0, 'HLS.S30.T01UCS.2021026T225819.v2.0 {"algo": "NDVI"}'}}
 
-local dem = geo.raster(geo.parms({ asset = demType, algorithm = "NearestNeighbour", radius = 0, bands = {"NDVI"}, catalog = contents }))
+local dem = geo.raster(geo.parms({ asset = demType, algorithm = "NearestNeighbour", radius = 0, bands = {"NDVI"}, catalog = contents, sort_by_index = true}))
 local sampleCnt = 0
 local ndvi = 0
 local gpsTime = 0
@@ -58,7 +58,7 @@ else
     local value, fname, _time
     for i, v in ipairs(tbl) do
         value = v["value"]
-        _time  = v["time"]
+        _time = v["time"]
         fname = v["file"]
         print(string.format("(%02d) value %16.12f, time %.2f, fname: %s", i, value, _time, fname))
         sampleCnt = sampleCnt + 1
@@ -71,7 +71,6 @@ end
 runner.check(sampleCnt == #expResults)
 dem=nil
 
-
 expResults = {{ 0.065173116090, 1293577339.0, 'HLS.S30.T01UCS.2021001T225941.v2.0 {"algo": "NDSI"}'},
               {-0.259439707674, 1293577339.0, 'HLS.S30.T01UCS.2021001T225941.v2.0 {"algo": "NDVI"}'},
               {-0.203145478375, 1293577339.0, 'HLS.S30.T01UCS.2021001T225941.v2.0 {"algo": "NDWI"}'},
@@ -101,7 +100,7 @@ expResults = {{ 0.065173116090, 1293577339.0, 'HLS.S30.T01UCS.2021001T225941.v2.
               {-0.965811965812, 1295737338.0, 'HLS.S30.T01UCS.2021026T225819.v2.0 {"algo": "NDWI"}'}}
 
 print(string.format("\n-------------------------------------------------\nLandsat Plugin test (NDVI, NDSI, NDWI)\n-------------------------------------------------"))
-dem = geo.raster(geo.parms({ asset = demType, algorithm = "NearestNeighbour", radius = 0, bands = {"NDSI", "NDVI", "NDWI"}, catalog = contents }))
+dem = geo.raster(geo.parms({ asset = demType, algorithm = "NearestNeighbour", radius = 0, bands = {"NDSI", "NDVI", "NDWI"}, catalog = contents, sort_by_index = true }))
 sampleCnt = 0
 local ndviCnt= 0
 local ndsiCnt= 0
@@ -135,7 +134,7 @@ expResults = {{ 0.065173116090, 1293577339.0, 'HLS.S30.T01UCS.2021001T225941.v2.
 
 local url = "HLS.S30.T01UCS.2021001T22594"
 print(string.format("\n--------------------------------\nTest: %s URL/GROUP Filter: %s\n--------------------------------", demType, url))
-dem = geo.raster(geo.parms({ asset = demType, algorithm = "NearestNeighbour", radius = 0, with_flags=true, substr = url, bands = {"NDSI", "NDVI", "NDWI"}, catalog = contents }))
+dem = geo.raster(geo.parms({ asset = demType, algorithm = "NearestNeighbour", radius = 0, with_flags=true, substr = url, bands = {"NDSI", "NDVI", "NDWI"}, catalog = contents, sort_by_index = true }))
 sampleCnt = 0
 local invalidSamples = 0
 
@@ -165,7 +164,7 @@ local tstr = "2021:2:4:23:3:0"
 local expectedGroup = "T01UCS.2021026T225819.v2.0"
 
 print(string.format("\n--------------------------------\nTest: %s Temporal Filter: closest_time=%s\n--------------------------------", demType, tstr))
-dem = geo.raster(geo.parms({ asset = demType, algorithm = "NearestNeighbour", radius = 0, with_flags=true,  closest_time=tstr, bands = {"NDSI", "NDVI", "NDWI"}, catalog = contents }))
+dem = geo.raster(geo.parms({ asset = demType, algorithm = "NearestNeighbour", radius = 0, with_flags=true,  closest_time=tstr, bands = {"NDSI", "NDVI", "NDWI"}, catalog = contents, sort_by_index = true }))
 runner.check(dem ~= nil)
 tbl, err = dem:sample(lon, lat, height)
 runner.check(err == 0)
@@ -189,7 +188,7 @@ local tstrOverride  = "2000:2:4:23:3:0"
 local expectedGroup = "T01UCS.2021001T225941.v2.0"
 
 print(string.format("\n--------------------------------\nTest: %s Temporal Filter Override:  closest_time=%s\n--------------------------------", demType, tstrOverride, tstr))
-dem = geo.raster(geo.parms({ asset = demType, algorithm = "NearestNeighbour", radius = 0, with_flags=true, closest_time=tstr, bands = {"NDSI", "NDVI", "NDWI"}, catalog = contents }))
+dem = geo.raster(geo.parms({ asset = demType, algorithm = "NearestNeighbour", radius = 0, with_flags=true, closest_time=tstr, bands = {"NDSI", "NDVI", "NDWI"}, catalog = contents, sort_by_index = true }))
 runner.check(dem ~= nil)
 tbl, err = dem:sample(lon, lat, height, tstrOverride)
 runner.check(err == 0)
@@ -221,7 +220,7 @@ expResults = {{  523.0, 1293577339.0, 0xc2, '/vsis3/lp-prod-protected/HLSS30.020
 
 
 print(string.format("\n-------------------------------------------------\nLandsat Plugin test (BO3 and qualit flags)\n-------------------------------------------------"))
-dem = geo.raster(geo.parms({ asset = demType, algorithm = "NearestNeighbour", radius = 0, with_flags=true, bands = {"B03"}, catalog = contents }))
+dem = geo.raster(geo.parms({ asset = demType, algorithm = "NearestNeighbour", radius = 0, with_flags=true, bands = {"B03"}, catalog = contents, sort_by_index = true }))
 local fmaskCnt  = 0
 local sampleCnt = 0
 local b03 = 0
@@ -271,7 +270,7 @@ expResults = {{  523.0, 1293577339.0, 0xc2, '/vsis3/lp-prod-protected/HLSS30.020
 
 
 print(string.format("\n-------------------------------------------------\nLandsat Sample test (BO3 and Fmask raster)\n-------------------------------------------------"))
-dem = geo.raster(geo.parms({ asset = demType, algorithm = "NearestNeighbour", radius = 0, with_flags=true, bands = {"Fmask","B03"}, catalog = contents }))
+dem = geo.raster(geo.parms({ asset = demType, algorithm = "NearestNeighbour", radius = 0, with_flags=true, bands = {"Fmask","B03"}, catalog = contents, sort_by_index = true }))
 fmaskCnt  = 0
 sampleCnt = 0
 b03 = 0
@@ -303,7 +302,7 @@ dem = geo.raster(geo.parms({ asset = demType, algorithm = "NearestNeighbour", ra
                             bands = {"VAA", "VZA", "Fmask","SAA", "SZA", "NDSI", "NDVI", "NDWI",
                                      "B01", "B02", "B03", "B04", "B05", "B06",
                                      "B07", "B08", "B09", "B10", "B11", "B12", "B8A"},
-                            catalog = contents }))
+                            catalog = contents, sort_by_index = true }))
 
 sampleCnt = 0
 local starttime = time.latch();
@@ -337,7 +336,7 @@ dem = geo.raster(geo.parms({ asset = demType, algorithm = "NearestNeighbour", ra
                             bands = {"VAA", "VZA", "Fmask","SAA", "SZA", "NDSI", "NDVI", "NDWI",
                                      "B01", "B02", "B03", "B04", "B05", "B06",
                                      "B07", "B08", "B09", "B10", "B11", "B12", "B8A"},
-                            catalog = contents }))
+                            catalog = contents, sort_by_index = true }))
 
 local starttime = time.latch();
 local tbl, err = dem:subset(llx, lly, urx, ury)
@@ -417,7 +416,7 @@ local expectedFile = "HLS.S30.T12SYJ.2022004T180729.v2.0 {\"algo\": \"NDVI\"}"
 
 print(string.format("\n-------------------------------------------------\nLandsat Grand Mesa test\n-------------------------------------------------"))
 
-local dem = geo.raster(geo.parms({ asset = demType, algorithm = "NearestNeighbour", radius = 0, closest_time = "2022-01-05T00:00:00Z", bands = {"NDVI"}, catalog = contents }))
+local dem = geo.raster(geo.parms({ asset = demType, algorithm = "NearestNeighbour", radius = 0, closest_time = "2022-01-05T00:00:00Z", bands = {"NDVI"}, catalog = contents, sort_by_index = true }))
 sampleCnt = 0
 
 local starttime = time.latch();
@@ -446,8 +445,6 @@ runner.check(sampleCnt == maxSamples)
 dem = nil
 
 
-
-
 -- Report Results --
 
 runner.report()

datasets/landsat/selftests/plugin_unittest.lua

@@ -38,7 +38,7 @@ local pointCount = 100
 
 print(string.format("\n-------------------------------------------------\nLandsat Plugin test (NDVI)\n-------------------------------------------------"))
 local demType = "landsat-hls"
-local dem = geo.raster(geo.parms({ asset = demType, algorithm = "NearestNeighbour", radius = 0, bands = {"NDVI"}, catalog = contents }))
+local dem = geo.raster(geo.parms({ asset = demType, algorithm = "NearestNeighbour", radius = 0, bands = {"NDVI"}, catalog=contents, sort_by_index=true }))
 runner.check(dem ~= nil)
 
 ut = geo.ut_sample(dem)

datasets/pgc/selftests/aoi_bbox_test.lua

@@ -29,7 +29,7 @@ local expSamplesCnt = {8}
 for i = 1, #demTypes do
     local demType = demTypes[i];
     print(string.format("\n--------------------------------\nTest: %s Reading Correct Values with AOI box\n--------------------------------", demType))
-    dem = geo.raster(geo.parms({ asset = demType, algorithm = "NearestNeighbour", aoi_bbox=extentbox}))
+    dem = geo.raster(geo.parms({ asset = demType, algorithm = "NearestNeighbour", aoi_bbox=extentbox, sort_by_index=true}))
 
     for j, lon in ipairs(lons) do
         local sampleCnt = 0

datasets/pgc/selftests/arcticdem_reader.lua

@@ -24,7 +24,7 @@ local height = 0
 
 for i = 1, #demTypes do
     local demType = demTypes[i];
-    local dem = geo.raster(geo.parms({asset=demType, algorithm="NearestNeighbour", radius=0}))
+    local dem = geo.raster(geo.parms({asset=demType, algorithm="NearestNeighbour", radius=0, sort_by_index=true}))
     runner.check(dem ~= nil)
     local tbl, err = dem:sample(lon, lat, height)
     runner.check(err == 0)
@@ -86,7 +86,7 @@ for i = 1, #demTypes do
 
     local demType = demTypes[i];
     print(string.format("\n--------------------------------\nTest: %s Correct Values\n--------------------------------", demType))
-    local dem = geo.raster(geo.parms({ asset = demType, algorithm = "NearestNeighbour"}))
+    local dem = geo.raster(geo.parms({ asset = demType, algorithm = "NearestNeighbour", sort_by_index=true}))
 
     for j, lon in ipairs(lons) do
         local sampleCnt = 0

datasets/pgc/selftests/plugin_unittest.lua

@@ -58,7 +58,7 @@ pointCount = 2
 lon_incr = 2.0
 print('\n------------------\nTest04 RasterSampler::arcticdem-strips\n------------------')
 demType = "arcticdem-strips"
-dem = geo.raster(geo.parms({asset=demType, algorithm="NearestNeighbour", radius=0, with_flags=true}))
+dem = geo.raster(geo.parms({asset=demType, algorithm="NearestNeighbour", radius=0, with_flags=true, sort_by_index=true}))
 runner.check(dem ~= nil)
 
 ut = geo.ut_sample(dem)

datasets/pgc/selftests/proj_pipeline_test.lua

@@ -34,7 +34,7 @@ for i = 1, #demTypes do
     print(string.format("\n--------------------------------\nTest: %s Using proj pipeline\n--------------------------------", demType))
     print(string.format("%s", pipeline))
     print(string.format("\n----------------------------------------------------------------------------------------------------------------------", demType))
-    dem = geo.raster(geo.parms({ asset = demType, algorithm = "NearestNeighbour", proj_pipeline=pipeline}))
+    dem = geo.raster(geo.parms({ asset = demType, algorithm = "NearestNeighbour", proj_pipeline=pipeline, sort_by_index=true}))
 
     for j, lon in ipairs(lons) do
         local sampleCnt = 0

datasets/pgc/selftests/remadem_reader.lua

@@ -21,7 +21,7 @@ local demTypes = {"rema-mosaic", "rema-strips"}
 
 for i = 1, #demTypes do
     local demType = demTypes[i];
-    local dem = geo.raster(geo.parms({asset=demType, algorithm="NearestNeighbour", radius=0}))
+    local dem = geo.raster(geo.parms({asset=demType, algorithm="NearestNeighbour", radius=0, sort_by_index=true}))
     runner.check(dem ~= nil)
     print(string.format("\n--------------------------------\nTest: %s sample\n--------------------------------", demType))
     local tbl, err = dem:sample(lon, lat, height)
@@ -81,7 +81,7 @@ local expSamplesCnt = {10, 4, 6, 6}
 for i = 1, #demTypes do
     local demType = demTypes[i];
     print(string.format("\n--------------------------------\nTest: %s Correct Values\n--------------------------------", demType))
-    dem = geo.raster(geo.parms({ asset = demType, algorithm = "NearestNeighbour"}))
+    dem = geo.raster(geo.parms({ asset = demType, algorithm = "NearestNeighbour", sort_by_index=true}))
 
     for j, lon in ipairs(lons) do
         local sampleCnt = 0
@@ -138,7 +138,7 @@ local expSamplesCnt = {6}
 for i = 1, #demTypes do
     local demType = demTypes[i];
     print(string.format("\n--------------------------------\nTest: %s Reading Correct Values with AOI box\n--------------------------------", demType))
-    dem = geo.raster(geo.parms({ asset = demType, algorithm = "NearestNeighbour", aoi_bbox=extentbox}))
+    dem = geo.raster(geo.parms({ asset = demType, algorithm = "NearestNeighbour", aoi_bbox=extentbox, sort_by_index=true}))
 
     for j, lon in ipairs(lons) do
         local sampleCnt = 0

datasets/pgc/selftests/temporal_filter_test.lua

@@ -35,7 +35,7 @@ local expResults = {{452.48437500, 0x4, '/vsis3/pgc-opendata-dems/arcticdem/stri
                     { 49.92187500, 0x4, '/vsis3/pgc-opendata-dems/arcticdem/strips/s2s041/2m/n51w178/SETSM_s2s041_WV03_20210204_10400100656B9F00_1040010065903500_2m_lsf_seg1_dem.tif'}}
 
 print(string.format("\n--------------------------------\nTest: %s No Filter\n--------------------------------", demType))
-local dem = geo.raster(geo.parms({asset=demType, algorithm="NearestNeighbour", radius=0, with_flags=true}))
+local dem = geo.raster(geo.parms({asset=demType, algorithm="NearestNeighbour", radius=0, with_flags=true, sort_by_index=true}))
 tbl, err = dem:sample(lon, lat, height)
 runner.check(err == 0)
 runner.check(tbl ~= nil)
@@ -68,7 +68,7 @@ expResults = {{773.03906250, 0x4, '/vsis3/pgc-opendata-dems/arcticdem/strips/s2s
 
 
 print(string.format("\n--------------------------------\nTest: %s Temporal Filter: t0=%s, t1=%s\n--------------------------------", demType, t0str, t1str))
-local dem = geo.raster(geo.parms({asset=demType, algorithm="NearestNeighbour", radius=0, with_flags=true, t0=t0str, t1=t1str}))
+local dem = geo.raster(geo.parms({asset=demType, algorithm="NearestNeighbour", radius=0, with_flags=true, t0=t0str, t1=t1str, sort_by_index=true}))
 tbl, err = dem:sample(lon, lat, height)
 runner.check(err == 0)
 runner.check(tbl ~= nil)
@@ -99,7 +99,7 @@ expResults = {{ 80.65625000, 0x0, '/vsis3/pgc-opendata-dems/arcticdem/strips/s2s
 
 t0str = "2021:2:3:1:0:0"
 print(string.format("\n--------------------------------\nTest: %s Temporal Filter: t0=%s\n--------------------------------", demType, t0str))
-dem = geo.raster(geo.parms({asset=demType, algorithm="NearestNeighbour", radius=0, with_flags=true, t0=t0str}))
+dem = geo.raster(geo.parms({asset=demType, algorithm="NearestNeighbour", radius=0, with_flags=true, t0=t0str, sort_by_index=true}))
 tbl, err = dem:sample(lon, lat, height)
 runner.check(err == 0)
 runner.check(tbl ~= nil)
@@ -136,7 +136,7 @@ expResults = {{452.48437500, 0x4, '/vsis3/pgc-opendata-dems/arcticdem/strips/s2s
 
 t1str = "2021:2:3:1:0:0"
 print(string.format("\n--------------------------------\nTest: %s Temporal Filter: t1=%s\n--------------------------------", demType, t1str))
-dem = geo.raster(geo.parms({asset=demType, algorithm="NearestNeighbour", radius=0, with_flags=true, t1=t1str}))
+dem = geo.raster(geo.parms({asset=demType, algorithm="NearestNeighbour", radius=0, with_flags=true, t1=t1str, sort_by_index=true}))
 tbl, err = dem:sample(lon, lat, height)
 runner.check(err == 0)
 runner.check(tbl ~= nil)
@@ -161,7 +161,7 @@ expResults = {{ 82.89843750, 0x0, '/vsis3/pgc-opendata-dems/arcticdem/strips/s2s
 
 doy_range_str = "121:212" -- Keep only raster from 1st May to 31st July any year
 print(string.format("\n--------------------------------\nTest: %s Temporal Filter: doy_range=%s\n--------------------------------", demType, doy_range_str))
-dem = geo.raster(geo.parms({asset=demType, algorithm="NearestNeighbour", radius=0, with_flags=true, doy_range=doy_range_str}))
+dem = geo.raster(geo.parms({asset=demType, algorithm="NearestNeighbour", radius=0, with_flags=true, doy_range=doy_range_str, sort_by_index=true}))
 tbl, err = dem:sample(lon, lat, height)
 runner.check(err == 0)
 runner.check(tbl ~= nil)
@@ -198,7 +198,7 @@ local expResults = {{452.48437500, 0x4, '/vsis3/pgc-opendata-dems/arcticdem/stri
 
 doy_range_str = "!121:212" -- Filter out rasters from 1st May to 31st July any year
 print(string.format("\n--------------------------------\nTest: %s Temporal Filter: doy_range=%s\n--------------------------------", demType, doy_range_str))
-dem = geo.raster(geo.parms({asset=demType, algorithm="NearestNeighbour", radius=0, with_flags=true, doy_range=doy_range_str}))
+dem = geo.raster(geo.parms({asset=demType, algorithm="NearestNeighbour", radius=0, with_flags=true, doy_range=doy_range_str, sort_by_index=true}))
 tbl, err = dem:sample(lon, lat, height)
 runner.check(err == 0)
 runner.check(tbl ~= nil)
@@ -226,7 +226,7 @@ expResults = {{49.92187500, 0x4, '/vsis3/pgc-opendata-dems/arcticdem/strips/s2s0
 
 local tstr = "2021:2:4:23:3:0"
 print(string.format("\n--------------------------------\nTest: %s Temporal Filter: closest_time=%s\n--------------------------------", demType, tstr))
-dem = geo.raster(geo.parms({asset=demType, algorithm="NearestNeighbour", radius=0, with_flags=true, closest_time=tstr}))
+dem = geo.raster(geo.parms({asset=demType, algorithm="NearestNeighbour", radius=0, with_flags=true, closest_time=tstr, sort_by_index=true}))
 tbl, err = dem:sample(lon, lat, height)
 runner.check(err == 0)
 runner.check(tbl ~= nil)
@@ -253,7 +253,7 @@ local tstrOverride = "2016:6:0:0:0:0"
 expResults = {{80.22656250, 0x0, '/vsis3/pgc-opendata-dems/arcticdem/strips/s2s041/2m/n51w178/SETSM_s2s041_WV02_20160602_1030010057849C00_103001005607CA00_2m_lsf_seg1_dem.tif'}}
 
 print(string.format("\n--------------------------------\nTest: %s Temporal Filter Override closest_time: %s with %s\n--------------------------------", demType, tstr, tstrOverride))
-dem = geo.raster(geo.parms({asset=demType, algorithm="NearestNeighbour", radius=0, with_flags=true, closest_time=tstr}))
+dem = geo.raster(geo.parms({asset=demType, algorithm="NearestNeighbour", radius=0, with_flags=true, closest_time=tstr, sort_by_index=true}))
 tbl, err = dem:sample(lon, lat, height, tstrOverride)
 runner.check(err == 0)
 runner.check(tbl ~= nil)

datasets/pgc/selftests/url_filter_test.lua

@@ -37,7 +37,7 @@ local expResults = {{452.48437500, 0x4, '/vsis3/pgc-opendata-dems/arcticdem/stri
 --Nothing gets filtered since all rasters have vsis3 in their path name
 local url = "vsis3"
 print(string.format("\n--------------------------------\nTest: %s URL Filter: %s\n--------------------------------", demType, url))
-local dem = geo.raster(geo.parms({asset=demType, algorithm="NearestNeighbour", radius=0, with_flags=true}))
+local dem = geo.raster(geo.parms({asset=demType, algorithm="NearestNeighbour", radius=0, with_flags=true, sort_by_index=true}))
 tbl, err = dem:sample(lon, lat, height)
 runner.check(err == 0)
 runner.check(tbl ~= nil)
@@ -63,7 +63,7 @@ url = "SETSM_s2s041_WV01_20181210_102001007A560E00_10200100802C2300"
 expResults = {{452.48437500, 0x4, '/vsis3/pgc-opendata-dems/arcticdem/strips/s2s041/2m/n51w178/SETSM_s2s041_WV01_20181210_102001007A560E00_10200100802C2300_2m_lsf_seg3_dem.tif'}}
 
 print(string.format("\n--------------------------------\nTest: %s URL Filter: %s\n--------------------------------", demType, url))
-dem = geo.raster(geo.parms({asset=demType, algorithm="NearestNeighbour", radius=0, with_flags=true, substr=url}))
+dem = geo.raster(geo.parms({asset=demType, algorithm="NearestNeighbour", radius=0, with_flags=true, substr=url, sort_by_index=true, sort_by_index=true}))
 tbl, err = dem:sample(lon, lat, height)
 runner.check(err == 0)
 runner.check(tbl ~= nil)
@@ -93,7 +93,7 @@ expResults = {{452.48437500, 0x4, '/vsis3/pgc-opendata-dems/arcticdem/strips/s2s
 
 url = "WV01"
 print(string.format("\n--------------------------------\nTest: %s URL Filter: %s\n--------------------------------", demType, url))
-dem = geo.raster(geo.parms({asset=demType, algorithm="NearestNeighbour", radius=0, with_flags=true, substr=url}))
+dem = geo.raster(geo.parms({asset=demType, algorithm="NearestNeighbour", radius=0, with_flags=true, substr=url, sort_by_index=true}))
 tbl, err = dem:sample(lon, lat, height)
 runner.check(err == 0)
 runner.check(tbl ~= nil)