Skip to content

Commit 4d82b2e

Browse files
zansinergisezansinergise
authored
Merge pull request #291 from sentinel-hub/make-sure-otc-deploy-works
Make sure OTC deploy works
2 parents 4f885c7 + 3406fd8 commit 4d82b2e

File tree

3 files changed

+148
-0
lines changed

3 files changed

+148
-0
lines changed

‎src/layer/LayersFactory.ts

+24
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,14 @@ import {
4242
DATASET_CDAS_S3OLCI,
4343
DATASET_CDAS_S5PL2,
4444
DATASET_CDAS_S3OLCIL2,
45+
DATASET_CDAS_OTC_S2L2A,
46+
DATASET_CDAS_OTC_S1GRD,
47+
DATASET_CDAS_OTC_S2L1C,
48+
DATASET_CDAS_OTC_S3SLSTR,
49+
DATASET_CDAS_OTC_S3OLCI,
50+
DATASET_CDAS_OTC_S3OLCIL2,
51+
DATASET_CDAS_OTC_S5PL2,
52+
DATASET_CDAS_OTC_DEM,
4553
} from './dataset';
4654
import { AbstractLayer } from './AbstractLayer';
4755
import { WmsLayer } from './WmsLayer';
@@ -88,17 +96,24 @@ export class LayersFactory {
8896
private static readonly DATASET_FROM_JSON_GETCAPAPABILITIES = [
8997
DATASET_AWSEU_S1GRD,
9098
DATASET_CDAS_S1GRD,
99+
DATASET_CDAS_OTC_S1GRD,
91100
DATASET_S2L2A,
92101
DATASET_S2L1C,
93102
DATASET_CDAS_S2L2A,
103+
DATASET_CDAS_OTC_S2L2A,
94104
DATASET_CDAS_S2L1C,
105+
DATASET_CDAS_OTC_S2L1C,
95106
DATASET_S3SLSTR,
96107
DATASET_S3OLCI,
97108
DATASET_CDAS_S3SLSTR,
109+
DATASET_CDAS_OTC_S3SLSTR,
98110
DATASET_CDAS_S3OLCI,
111+
DATASET_CDAS_OTC_S3OLCI,
99112
DATASET_CDAS_S3OLCIL2,
113+
DATASET_CDAS_OTC_S3OLCIL2,
100114
DATASET_S5PL2,
101115
DATASET_CDAS_S5PL2,
116+
DATASET_CDAS_OTC_S5PL2,
102117
DATASET_AWS_L8L1C,
103118
DATASET_AWS_LOTL1,
104119
DATASET_AWS_LOTL2,
@@ -111,23 +126,31 @@ export class LayersFactory {
111126
DATASET_MODIS,
112127
DATASET_AWS_DEM,
113128
DATASET_CDAS_DEM,
129+
DATASET_CDAS_OTC_DEM,
114130
DATASET_BYOC,
115131
];
116132

117133
private static readonly LAYER_FROM_DATASET_V3 = {
118134
[DATASET_AWSEU_S1GRD.id]: S1GRDAWSEULayer,
119135
[DATASET_CDAS_S1GRD.id]: S1GRDCDASLayer,
136+
[DATASET_CDAS_OTC_S1GRD.id]: S1GRDCDASLayer,
120137
[DATASET_S2L2A.id]: S2L2ALayer,
121138
[DATASET_S2L1C.id]: S2L1CLayer,
122139
[DATASET_CDAS_S2L2A.id]: S2L2ACDASLayer,
140+
[DATASET_CDAS_OTC_S2L2A.id]: S2L2ACDASLayer,
123141
[DATASET_CDAS_S2L1C.id]: S2L1CCDASLayer,
142+
[DATASET_CDAS_OTC_S2L1C.id]: S2L1CCDASLayer,
124143
[DATASET_S3SLSTR.id]: S3SLSTRLayer,
125144
[DATASET_CDAS_S3SLSTR.id]: S3SLSTRCDASLayer,
145+
[DATASET_CDAS_OTC_S3SLSTR.id]: S3SLSTRCDASLayer,
126146
[DATASET_S3OLCI.id]: S3OLCILayer,
127147
[DATASET_CDAS_S3OLCI.id]: S3OLCICDASLayer,
148+
[DATASET_CDAS_OTC_S3OLCI.id]: S3OLCICDASLayer,
128149
[DATASET_CDAS_S3OLCIL2.id]: S3OLCIL2CDASLayer,
150+
[DATASET_CDAS_OTC_S3OLCIL2.id]: S3OLCIL2CDASLayer,
129151
[DATASET_S5PL2.id]: S5PL2Layer,
130152
[DATASET_CDAS_S5PL2.id]: S5PL2CDASLayer,
153+
[DATASET_CDAS_OTC_S5PL2.id]: S5PL2CDASLayer,
131154
[DATASET_AWS_L8L1C.id]: Landsat8AWSLayer,
132155
[DATASET_AWS_LOTL1.id]: Landsat8AWSLOTL1Layer,
133156
[DATASET_AWS_LOTL2.id]: Landsat8AWSLOTL2Layer,
@@ -141,6 +164,7 @@ export class LayersFactory {
141164
[DATASET_AWS_DEM.id]: DEMLayer,
142165
[DATASET_AWSUS_DEM.id]: DEMAWSUSLayer,
143166
[DATASET_CDAS_DEM.id]: DEMCDASLayer,
167+
[DATASET_CDAS_OTC_DEM.id]: DEMCDASLayer,
144168
[DATASET_BYOC.id]: BYOCLayer,
145169
};
146170

‎src/layer/const.ts

+4
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ export const SH_SERVICE_HOSTNAMES_V3: string[] = [
152152
'https://services-uswest2.sentinel-hub.com/',
153153
'https://creodias.sentinel-hub.com/',
154154
'https://sh.dataspace.copernicus.eu/',
155+
'https://sh-otc.dataspace.copernicus.eu/',
155156
];
156157

157158
// See https://services.sentinel-hub.com/api/v1/metadata/location/ for an up-to-date
@@ -163,6 +164,7 @@ export enum LocationIdSHv3 {
163164
mundi = 'mundi',
164165
gcpUsCentral1 = 'gcp-us-central1',
165166
cdse = 'cdse',
167+
cdseOtc = 'cdse-otc',
166168
}
167169
export const SHV3_LOCATIONS_ROOT_URL: Record<LocationIdSHv3, string> = {
168170
[LocationIdSHv3.awsEuCentral1]: 'https://services.sentinel-hub.com/',
@@ -171,11 +173,13 @@ export const SHV3_LOCATIONS_ROOT_URL: Record<LocationIdSHv3, string> = {
171173
[LocationIdSHv3.mundi]: 'https://shservices.mundiwebservices.com/',
172174
[LocationIdSHv3.gcpUsCentral1]: 'https://services-gcp-us-central1.sentinel-hub.com/',
173175
[LocationIdSHv3.cdse]: 'https://sh.dataspace.copernicus.eu/',
176+
[LocationIdSHv3.cdseOtc]: 'https://sh-otc.dataspace.copernicus.eu/',
174177
};
175178

176179
export const SH_SERVICE_ROOT_URL = {
177180
default: SHV3_LOCATIONS_ROOT_URL[LocationIdSHv3.awsEuCentral1],
178181
cdse: SHV3_LOCATIONS_ROOT_URL[LocationIdSHv3.cdse],
182+
cdseOtc: SHV3_LOCATIONS_ROOT_URL[LocationIdSHv3.cdseOtc],
179183
};
180184

181185
export type GetStatsParams = {

‎src/layer/dataset.ts

+120
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,21 @@ export const DATASET_CDAS_S1GRD: Dataset = {
4343
catalogCollectionId: 'sentinel-1-grd',
4444
};
4545

46+
export const DATASET_CDAS_OTC_S1GRD: Dataset = {
47+
id: 'CDAS_S1GRD',
48+
shJsonGetCapabilitiesDataset: 'S1GRD',
49+
shWmsEvalsource: 'S1GRD',
50+
shProcessingApiDatasourceAbbreviation: 'S1GRD',
51+
datasetParametersType: 'S1GRD',
52+
shServiceHostname: 'https://sh-otc.dataspace.copernicus.eu/',
53+
searchIndexUrl: 'https://sh-otc.dataspace.copernicus.eu/index/v3/collections/S1GRD/searchIndex',
54+
findDatesUTCUrl: 'https://sh-otc.dataspace.copernicus.eu/index/v3/collections/S1GRD/findAvailableData',
55+
orbitTimeMinutes: 49.3,
56+
minDate: new Date(Date.UTC(2014, 10 - 1, 3, 0, 47, 14)), // 2014-10-03T00:47:14Z
57+
maxDate: null,
58+
catalogCollectionId: 'sentinel-1-grd',
59+
};
60+
4661
export const DATASET_S2L2A: Dataset = {
4762
id: 'AWS_S2L2A',
4863
shJsonGetCapabilitiesDataset: 'S2L2A',
@@ -88,6 +103,21 @@ export const DATASET_CDAS_S2L2A: Dataset = {
88103
catalogCollectionId: 'sentinel-2-l2a',
89104
};
90105

106+
export const DATASET_CDAS_OTC_S2L2A: Dataset = {
107+
id: 'CDAS_S2L2A',
108+
shJsonGetCapabilitiesDataset: 'S2L2A',
109+
shWmsEvalsource: 'S2L2A',
110+
shProcessingApiDatasourceAbbreviation: 'S2L2A',
111+
datasetParametersType: 'S2',
112+
shServiceHostname: 'https://sh-otc.dataspace.copernicus.eu/',
113+
searchIndexUrl: 'https://sh-otc.dataspace.copernicus.eu/index/v3/collections/S2L2A/searchIndex',
114+
findDatesUTCUrl: 'https://sh-otc.dataspace.copernicus.eu/index/v3/collections/S2L2A/findAvailableData',
115+
orbitTimeMinutes: 50.3,
116+
minDate: new Date(Date.UTC(2016, 10 - 1, 20, 8, 9, 58)), // 2016-10-20T08:09:58Z
117+
maxDate: null,
118+
catalogCollectionId: 'sentinel-2-l2a',
119+
};
120+
91121
export const DATASET_CDAS_S2L1C: Dataset = {
92122
id: 'CDAS_S2L1C',
93123
shJsonGetCapabilitiesDataset: 'S2L1C',
@@ -102,6 +132,22 @@ export const DATASET_CDAS_S2L1C: Dataset = {
102132
maxDate: null,
103133
catalogCollectionId: 'sentinel-2-l1c',
104134
};
135+
136+
export const DATASET_CDAS_OTC_S2L1C: Dataset = {
137+
id: 'CDAS_S2L1C',
138+
shJsonGetCapabilitiesDataset: 'S2L1C',
139+
shWmsEvalsource: 'S2',
140+
shProcessingApiDatasourceAbbreviation: 'S2L1C',
141+
datasetParametersType: 'S2',
142+
shServiceHostname: 'https://sh-otc.dataspace.copernicus.eu/',
143+
searchIndexUrl: 'https://sh-otc.dataspace.copernicus.eu/index/v3/collections/S2L1C/searchIndex',
144+
findDatesUTCUrl: 'https://sh-otc.dataspace.copernicus.eu/index/v3/collections/S2L1C/findAvailableData',
145+
orbitTimeMinutes: 50.3,
146+
minDate: new Date(Date.UTC(2015, 6 - 1, 27, 10, 25, 31)), // 2015-06-27T10:25:31
147+
maxDate: null,
148+
catalogCollectionId: 'sentinel-2-l1c',
149+
};
150+
105151
export const DATASET_S3SLSTR: Dataset = {
106152
id: 'CRE_S3SLSTR',
107153
shJsonGetCapabilitiesDataset: 'S3SLSTR',
@@ -132,6 +178,21 @@ export const DATASET_CDAS_S3SLSTR: Dataset = {
132178
catalogCollectionId: 'sentinel-3-slstr',
133179
};
134180

181+
export const DATASET_CDAS_OTC_S3SLSTR: Dataset = {
182+
id: 'CDAS_S3SLSTR',
183+
shJsonGetCapabilitiesDataset: 'S3SLSTR',
184+
shWmsEvalsource: 'S3SLSTR',
185+
shProcessingApiDatasourceAbbreviation: 'S3SLSTR',
186+
datasetParametersType: 'S3SLSTR',
187+
shServiceHostname: 'https://sh-otc.dataspace.copernicus.eu/',
188+
searchIndexUrl: 'https://sh-otc.dataspace.copernicus.eu/index/v3/collections/S3SLSTR/searchIndex',
189+
findDatesUTCUrl: 'https://sh-otc.dataspace.copernicus.eu/index/v3/collections/S3SLSTR/findAvailableData',
190+
orbitTimeMinutes: 50.495,
191+
minDate: new Date(Date.UTC(2016, 4 - 1, 19, 0, 46, 32)), // 2016-04-19T00:46:32.578
192+
maxDate: null,
193+
catalogCollectionId: 'sentinel-3-slstr',
194+
};
195+
135196
export const DATASET_S3OLCI: Dataset = {
136197
id: 'CRE_S3OLCI',
137198
shJsonGetCapabilitiesDataset: 'S3OLCI',
@@ -162,6 +223,21 @@ export const DATASET_CDAS_S3OLCI: Dataset = {
162223
catalogCollectionId: 'sentinel-3-olci',
163224
};
164225

226+
export const DATASET_CDAS_OTC_S3OLCI: Dataset = {
227+
id: 'CDAS_S3OLCI',
228+
shJsonGetCapabilitiesDataset: 'S3OLCI',
229+
shWmsEvalsource: 'S3OLCI',
230+
shProcessingApiDatasourceAbbreviation: 'S3OLCI',
231+
datasetParametersType: 'S3',
232+
shServiceHostname: 'https://sh-otc.dataspace.copernicus.eu/',
233+
searchIndexUrl: 'https://sh-otc.dataspace.copernicus.eu/index/v3/collections/S3OLCI/searchIndex',
234+
findDatesUTCUrl: 'https://sh-otc.dataspace.copernicus.eu/index/v3/collections/S3OLCI/findAvailableData',
235+
orbitTimeMinutes: 50.495,
236+
minDate: new Date(Date.UTC(2016, 4 - 1, 25, 11, 33, 14)), // 2016-04-25T11:33:14
237+
maxDate: null,
238+
catalogCollectionId: 'sentinel-3-olci',
239+
};
240+
165241
export const DATASET_CDAS_S3OLCIL2: Dataset = {
166242
id: 'CDAS_S3OLCIL2',
167243
shJsonGetCapabilitiesDataset: 'S3OLCIL2',
@@ -177,6 +253,21 @@ export const DATASET_CDAS_S3OLCIL2: Dataset = {
177253
catalogCollectionId: 'sentinel-3-olci-l2',
178254
};
179255

256+
export const DATASET_CDAS_OTC_S3OLCIL2: Dataset = {
257+
id: 'CDAS_S3OLCIL2',
258+
shJsonGetCapabilitiesDataset: 'S3OLCIL2',
259+
shWmsEvalsource: 'sentinel-3-olci-l2',
260+
shProcessingApiDatasourceAbbreviation: 'sentinel-3-olci-l2',
261+
datasetParametersType: 'S3',
262+
shServiceHostname: 'https://sh-otc.dataspace.copernicus.eu/',
263+
searchIndexUrl: 'https://sh-otc.dataspace.copernicus.eu/index/v3/collections/S3OLCIL2/searchIndex',
264+
findDatesUTCUrl: 'https://sh-otc.dataspace.copernicus.eu/index/v3/collections/S3OLCIL2/findAvailableData',
265+
orbitTimeMinutes: 50.495,
266+
minDate: new Date(Date.UTC(2016, 4 - 1, 25, 11, 33, 14)), // 2016-04-25T11:33:14
267+
maxDate: null,
268+
catalogCollectionId: 'sentinel-3-olci-l2',
269+
};
270+
180271
export const DATASET_S5PL2: Dataset = {
181272
id: 'CRE_S5PL2',
182273
shJsonGetCapabilitiesDataset: 'S5PL2',
@@ -207,6 +298,21 @@ export const DATASET_CDAS_S5PL2: Dataset = {
207298
catalogCollectionId: 'sentinel-5p-l2',
208299
};
209300

301+
export const DATASET_CDAS_OTC_S5PL2: Dataset = {
302+
id: 'CDAS_S5PL2',
303+
shJsonGetCapabilitiesDataset: 'S5PL2',
304+
shWmsEvalsource: 'S5P_L2',
305+
shProcessingApiDatasourceAbbreviation: 'S5PL2',
306+
datasetParametersType: 'S5PL2',
307+
shServiceHostname: 'https://sh-otc.dataspace.copernicus.eu/',
308+
searchIndexUrl: 'https://sh-otc.dataspace.copernicus.eu/index/v3/collections/S5PL2/searchIndex',
309+
findDatesUTCUrl: 'https://sh-otc.dataspace.copernicus.eu/index/v3/collections/S5PL2/findAvailableData',
310+
orbitTimeMinutes: 101,
311+
minDate: new Date(Date.UTC(2018, 4 - 1, 30, 0, 18, 51)), // 2018-04-30T00:18:51
312+
maxDate: null,
313+
catalogCollectionId: 'sentinel-5p-l2',
314+
};
315+
210316
export const DATASET_AWS_L8L1C: Dataset = {
211317
id: 'AWS_L8L1C',
212318
shJsonGetCapabilitiesDataset: 'L8L1C',
@@ -399,6 +505,20 @@ export const DATASET_CDAS_DEM: Dataset = {
399505
maxDate: null,
400506
};
401507

508+
export const DATASET_CDAS_OTC_DEM: Dataset = {
509+
id: 'CDAS_DEM',
510+
shJsonGetCapabilitiesDataset: 'DEM',
511+
shWmsEvalsource: 'DEM',
512+
shProcessingApiDatasourceAbbreviation: 'DEM',
513+
datasetParametersType: null,
514+
shServiceHostname: 'https://sh-otc.dataspace.copernicus.eu/',
515+
searchIndexUrl: null,
516+
findDatesUTCUrl: null,
517+
orbitTimeMinutes: null,
518+
minDate: null,
519+
maxDate: null,
520+
};
521+
402522
export const DATASET_BYOC: Dataset = {
403523
id: 'CUSTOM',
404524
shJsonGetCapabilitiesDataset: 'CUSTOM',

0 commit comments

Comments
 (0)