Skip to content

Commit ccb31b8

Browse files
elidwaelidwa
committed
updated target crs, switched to aws_s3_endpoint in GdalRaster.cpp
1 parent 02252d5 commit ccb31b8

File tree

6 files changed

+90
-51
lines changed

6 files changed

+90
-51
lines changed

‎clients/python/tests/test_copernicus_30meter.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
vrtLon = -108.1
1313
vrtLat = 39.1
1414

15-
vrtValue = 2637.057758605255
15+
vrtValue = 2637.891093719017
1616
vrtFile = "/vsis3/raster/COP30/COP30_hh.vrt"
1717
vrtFileTime = 1386633618
1818

‎datasets/opendata/package/EsaCopernicus30meterRaster.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ class EsaCopernicus30meterRaster: public GeoRaster
8686
static OGRErr overrideTargetCRS(OGRSpatialReference& target, const void* param=NULL)
8787
{
8888
static_cast<void>(param);
89-
return target.SetFromUserInput("EPSG:4326+3855");
89+
return target.SetFromUserInput("EPSG:9055+3855");
9090
}
9191
};
9292

‎datasets/opendata/selftests/copernicus_reader.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ local height = 0.0
1515

1616
print(string.format("\n-------------------------------------------------\nESA Copernicus 30meter sample POI\n-------------------------------------------------"))
1717

18-
local expResults = {{2637.057758605255, 1386633618, "/vsis3/raster/COP30/COP30_hh.vrt"}}
18+
local expResults = {{2637.891093719017, 1386633618, "/vsis3/raster/COP30/COP30_hh.vrt"}}
1919

2020
local demType = "esa-copernicus-30meter"
2121
local dem = geo.raster(geo.parms({ asset = demType, algorithm = "NearestNeighbour", radius = 0}))

‎packages/core/extensions/earth_data_query.lua‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ASSETS = {
1616
identity = "nsidc-cloud",
1717
driver = "cumulus",
1818
path = "nsidc-cumulus-prod-protected",
19-
region = "us-west-2",
19+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com",
2020
provider = "NSIDC_CPRD",
2121
version = "007",
2222
api = "cmr",
@@ -27,7 +27,7 @@ ASSETS = {
2727
identity = "nsidc-cloud",
2828
driver = "cumulus",
2929
path = "nsidc-cumulus-prod-protected",
30-
region = "us-west-2",
30+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com",
3131
provider = "NSIDC_CPRD",
3232
version = "007",
3333
api = "cmr",
@@ -38,7 +38,7 @@ ASSETS = {
3838
identity = "nsidc-cloud",
3939
driver = "cumulus",
4040
path = "nsidc-cumulus-prod-protected",
41-
region = "us-west-2",
41+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com",
4242
provider = "NSIDC_CPRD",
4343
version = "007",
4444
api = "cmr",
@@ -49,7 +49,7 @@ ASSETS = {
4949
identity = "nsidc-cloud",
5050
driver = "cumulus",
5151
path = "nsidc-cumulus-prod-protected",
52-
region = "us-west-2",
52+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com",
5353
provider = "NSIDC_CPRD",
5454
version = "006",
5555
api = "cmr",
@@ -60,7 +60,7 @@ ASSETS = {
6060
identity = "nsidc-cloud",
6161
driver = "s3atl13",
6262
path = "nsidc-cumulus-prod-protected",
63-
region = "us-west-2",
63+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com",
6464
provider = "NSIDC_CPRD",
6565
version = "006",
6666
api = "ams",
@@ -72,7 +72,7 @@ ASSETS = {
7272
identity = "nsidc-cloud",
7373
driver = "s3atl24",
7474
path = "nsidc-cumulus-prod-protected",
75-
region = "us-west-2",
75+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com",
7676
provider = "NSIDC_CPRD",
7777
version = "001",
7878
api = "cmr",
@@ -83,7 +83,7 @@ ASSETS = {
8383
identity = "ornl-cloud",
8484
driver = "s3",
8585
path = "ornl-cumulus-prod-protected/gedi/GEDI_L4A_AGB_Density_V2_1/data",
86-
region = "us-west-2",
86+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com",
8787
provider = "ORNL_CLOUD",
8888
api = "cmr",
8989
formats = {".h5"}
@@ -93,47 +93,47 @@ ASSETS = {
9393
identity = "ornl-cloud",
9494
driver = "s3",
9595
path = "/vsis3/ornl-cumulus-prod-protected/gedi/GEDI_L4B_Gridded_Biomass_V2_1/data/GEDI04_B_MW019MW223_02_002_02_R01000M_V2.tif",
96-
region = "us-west-2",
96+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com",
9797
provider = "ORNL_CLOUD",
9898
formats = {".tiff"}
9999
},
100100
["gedil3-elevation"] = {
101101
name = "GEDI_L3_LandSurface_Metrics_V2_1952",
102102
identity = "ornl-cloud",
103103
path = "/vsis3/ornl-cumulus-prod-protected/gedi/GEDI_L3_LandSurface_Metrics_V2/data/GEDI03_elev_lowestmode_mean_2019108_2022019_002_03.tif",
104-
region = "us-west-2",
104+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com",
105105
provider = "ORNL_CLOUD",
106106
formats = {".tiff"}
107107
},
108108
["gedil3-canopy"] = {
109109
name = "GEDI_L3_LandSurface_Metrics_V2_1952",
110110
identity = "ornl-cloud",
111111
path = "/vsis3/ornl-cumulus-prod-protected/gedi/GEDI_L3_LandSurface_Metrics_V2/data/GEDI03_rh100_mean_2019108_2022019_002_03.tif",
112-
region = "us-west-2",
112+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com",
113113
provider = "ORNL_CLOUD",
114114
formats = {".tiff"}
115115
},
116116
["gedil3-elevation-stddev"] = {
117117
name = "GEDI_L3_LandSurface_Metrics_V2_1952",
118118
identity = "ornl-cloud",
119119
path = "/vsis3/ornl-cumulus-prod-protected/gedi/GEDI_L3_LandSurface_Metrics_V2/data/GEDI03_elev_lowestmode_stddev_2019108_2022019_002_03.tif",
120-
region = "us-west-2",
120+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com",
121121
provider = "ORNL_CLOUD",
122122
formats = {".tiff"}
123123
},
124124
["gedil3-canopy-stddev"] = {
125125
name = "GEDI_L3_LandSurface_Metrics_V2_1952",
126126
identity = "ornl-cloud",
127127
path = "/vsis3/ornl-cumulus-prod-protected/gedi/GEDI_L3_LandSurface_Metrics_V2/data/GEDI03_rh100_stddev_2019108_2022019_002_03.tif",
128-
region = "us-west-2",
128+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com",
129129
provider = "ORNL_CLOUD",
130130
formats = {".tiff"}
131131
},
132132
["gedil3-counts"] = {
133133
name = "GEDI_L3_LandSurface_Metrics_V2_1952",
134134
identity = "ornl-cloud",
135135
path = "/vsis3/ornl-cumulus-prod-protected/gedi/GEDI_L3_LandSurface_Metrics_V2/data/GEDI03_counts_2019108_2022019_002_03.tif",
136-
region = "us-west-2",
136+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com",
137137
provider = "ORNL_CLOUD",
138138
formats = {".tiff"}
139139
},
@@ -142,7 +142,7 @@ ASSETS = {
142142
identity = "lpdaac-cloud",
143143
driver = "s3gedi",
144144
path = "lp-prod-protected",
145-
region = "us-west-2",
145+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com",
146146
provider = "LPCLOUD",
147147
version = "002",
148148
api = "cmr",
@@ -153,7 +153,7 @@ ASSETS = {
153153
identity = "lpdaac-cloud",
154154
driver = "s3gedi",
155155
path = "lp-prod-protected",
156-
region = "us-west-2",
156+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com",
157157
provider = "LPCLOUD",
158158
version = "002",
159159
api = "cmr",
@@ -164,7 +164,7 @@ ASSETS = {
164164
identity = "podaac-cloud",
165165
driver = "s3",
166166
path = "podaac-ops-cumulus-protected/SWOT_SIMULATED_L2_KARIN_SSH_ECCO_LLC4320_CALVAL_V1",
167-
region = "us-west-2",
167+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com",
168168
provider = "POCLOUD",
169169
api = "cmr",
170170
formats = {".nc"},
@@ -175,7 +175,7 @@ ASSETS = {
175175
identity = "podaac-cloud",
176176
driver = "s3",
177177
path = "podaac-ops-cumulus-protected/SWOT_SIMULATED_L2_KARIN_SSH_GLORYS_CALVAL_V1",
178-
region = "us-west-2",
178+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com",
179179
provider = "POCLOUD",
180180
api = "cmr",
181181
formats = {".nc"},
@@ -184,33 +184,33 @@ ASSETS = {
184184
["usgs3dep-1meter-dem"] = {
185185
name = "Digital Elevation Model (DEM) 1 meter",
186186
path = "/vsis3/prd-tnm",
187-
region = "us-west-2",
187+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com",
188188
provider = "USGS",
189189
api = "tnm",
190190
formats = {".tiff"}
191191
},
192192
["3dep1m"] = {
193193
name = "3dep1m",
194194
path = "/vsis3/prd-tnm",
195-
region = "us-west-2",
195+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com",
196196
api = "ams",
197197
endpoint = "3dep",
198198
stac = true
199199
},
200200
["usgs3dep-10meter-dem"] = {
201201
path = "/vsis3/prd-tnm",
202202
index = "/vsis3/prd-tnm/StagedProducts/Elevation/13/TIFF/USGS_Seamless_DEM_13.vrt",
203-
region = "us-west-2",
203+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com",
204204
},
205205
["esa-worldcover-10meter"] = {
206206
path = "/vsis3/esa-worldcover/v200/2021/map",
207207
index = "/vsis3/sliderule/data/WORLDCOVER/ESA_WorldCover_10m_2021_v200_Map.vrt",
208-
region = "eu-central-1",
208+
aws_s3_endpoint = "s3.eu-central-1.amazonaws.com",
209209
},
210210
["meta-globalcanopy-1meter"] = {
211211
path = "/vsis3/dataforgood-fb-data/forests/v1/alsgedi_global_v6_float/",
212212
index = "/vsis3/sliderule/data/GLOBALCANOPY/META_GlobalCanopyHeight_1m_2024_v1.vrt",
213-
region = "us-east-1",
213+
aws_s3_endpoint = "s3.us-east-1.amazonaws.com",
214214
},
215215
["esa-copernicus-30meter"] = {
216216
-- Hosted at SDSC (San Diego Supercomputer Center) and exposed through an
@@ -223,13 +223,13 @@ ASSETS = {
223223
identity = "iam-role",
224224
path = "/vsis3/noaa-ocs-nationalbathymetry-pds/BlueTopo/",
225225
index = "_BlueTopo_Tile_Scheme",
226-
region = "us-east-1",
226+
aws_s3_endpoint = "s3.us-east-1.amazonaws.com",
227227
},
228228
["landsat-hls"] = {
229229
name = "HLS",
230230
identity = "lpdaac-cloud",
231231
path = "/vsis3/lp-prod-protected",
232-
region = "us-west-2",
232+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com",
233233
provider = "LPCLOUD",
234234
api = "stac",
235235
formats = {".tiff"},
@@ -239,12 +239,12 @@ ASSETS = {
239239
["arcticdem-mosaic"] = {
240240
path = "/vsis3/pgc-opendata-dems/arcticdem/mosaics/v4.1",
241241
index = "/vsis3/sliderule/data/PGC/arcticdem_2m_v4_1_tiles.vrt",
242-
region = "us-west-2"
242+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com"
243243
},
244244
["arcticdem-strips"] = {
245245
name = "arcticdem-strips",
246246
path = "/vsis3/pgc-opendata-dems/",
247-
region = "us-west-2",
247+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com",
248248
provider = "PGC",
249249
api = "stac",
250250
formats = {".tiff"},
@@ -254,12 +254,12 @@ ASSETS = {
254254
["rema-mosaic"] = {
255255
path = "/vsis3/pgc-opendata-dems/rema/mosaics/v2.0/2m",
256256
index = "/vsis3/sliderule/data/PGC/rema_2m_v2_0_tiles.vrt",
257-
region = "us-west-2"
257+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com"
258258
},
259259
["rema-strips"] = {
260260
name = "rema-strips",
261261
path = "/vsis3/pgc-opendata-dems/",
262-
region = "us-west-2",
262+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com",
263263
provider = "PGC",
264264
api = "stac",
265265
formats = {".tiff"},
@@ -269,34 +269,34 @@ ASSETS = {
269269
["nisar-L2-geoff"] = {
270270
identity = "asf-cloud",
271271
path = "/vsis3/sds-n-cumulus-prod-nisar-sample-data",
272-
region = "us-west-2"
272+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com"
273273
},
274274
["gedtm-30meter"] = {
275275
identity = "iam-role",
276276
path = "/vsis3/sliderule/data/GEDTM/legendtm_rf_30m_m_s_20000101_20231231_go_epsg.4326_v20250130.tif",
277-
region = "us-west-2"
277+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com"
278278
},
279279
["gedtm-std"] = {
280280
identity = "iam-role",
281281
path = "/vsis3/sliderule/data/GEDTM/gendtm_rf_30m_std_s_20000101_20231231_go_epsg.4326_v20250209.tif",
282-
region = "us-west-2"
282+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com"
283283
},
284284
["gedtm-dfm"] = {
285285
identity = "iam-role",
286286
path = "/vsis3/sliderule/data/GEDTM/dfme_edtm_m_30m_s_20000101_20221231_go_epsg.4326_v20241230.tif",
287-
region = "us-west-2"
287+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com"
288288
},
289289
["atlas-s3"] = {
290290
identity = "iam-role",
291291
driver = "s3",
292292
path = "sliderule/data/ATLAS",
293-
region = "us-west-2"
293+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com"
294294
},
295295
["atl24-s3"] = {
296296
identity = "iam-role",
297297
driver = "s3",
298298
path = "sliderule/data/ATL24r2",
299-
region = "us-west-2",
299+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com",
300300
provider = "NSIDC_CPRD",
301301
version = "002",
302302
api = "ams",
@@ -307,26 +307,26 @@ ASSETS = {
307307
identity = "iam-role",
308308
driver = "s3",
309309
path = "sliderule/data/SWOT",
310-
region = "us-west-2"
310+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com"
311311
},
312312
["viirsj1-s3"] = {
313313
identity = "iam-role",
314314
driver = "s3",
315315
path = "sliderule/data/VIIRSJ1",
316-
region = "us-west-2"
316+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com"
317317
},
318318
["merit-s3"] = {
319319
identity = "iam-role",
320320
driver = "s3",
321321
path = "sliderule/data/MERIT",
322-
region = "us-west-2"
322+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com"
323323
},
324324
["gebco-s3"] = {
325325
identity = "iam-role",
326326
driver = "s3",
327327
path = "/vsis3/sliderule/data/GEBCO",
328328
index = "index.geojson",
329-
region = "us-west-2"
329+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com"
330330
},
331331
["atlas-local"] = {
332332
driver = "file",
@@ -340,7 +340,7 @@ ASSETS = {
340340
identity = "iam-role",
341341
driver = "s3",
342342
path = "sliderule-public",
343-
region = "us-west-2"
343+
aws_s3_endpoint = "s3.us-west-2.amazonaws.com"
344344
},
345345
}
346346

0 commit comments

Comments
 (0)