From 3dd193ad73717629ae4ed7b1c62bc25955696c04 Mon Sep 17 00:00:00 2001 From: Moritz Riede Date: Wed, 8 Jan 2025 16:05:19 +0100 Subject: [PATCH 1/4] fix: parse mime type a bit more loosely --- src/actions/scenes/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/actions/scenes/index.js b/src/actions/scenes/index.js index 2e26722..e008545 100644 --- a/src/actions/scenes/index.js +++ b/src/actions/scenes/index.js @@ -93,7 +93,7 @@ export function addSceneFromIndex(url, attribution, pipeline) { const contentType = headerResponse.headers.get('content-type'); - if (contentType === 'text/html') { + if (contentType.includes('text/html')) { const relUrl = url.endsWith('/') ? url : url.substring(0, url.lastIndexOf('/')); const response = await fetch(url, {}); const content = await response.text(); @@ -132,7 +132,7 @@ export function addSceneFromIndex(url, attribution, pipeline) { dispatch( addScene(url, bands, red, green, blue, false, hasOvr, false, attribution, usedPipeline) ); - } else if (contentType === 'image/tiff') { + } else if (contentType.includes('image/tiff')) { const tiff = await fromUrl(url); const image = await tiff.getImage(); From d0a1fe6a2129a82d6aa1bbad017e9bc05594746a Mon Sep 17 00:00:00 2001 From: Moritz Riede Date: Wed, 8 Jan 2025 16:06:09 +0100 Subject: [PATCH 2/4] fix: force HTTPS when accessing epsg.io --- src/components/mapview.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/mapview.jsx b/src/components/mapview.jsx index 1fe76b7..c357504 100644 --- a/src/components/mapview.jsx +++ b/src/components/mapview.jsx @@ -200,7 +200,7 @@ class MapView extends Component { const epsg = `EPSG:${code}`; if (!proj4.defs(epsg)) { - const response = await fetch(`//epsg.io/${code}.proj4`); + const response = await fetch(`https://epsg.io/${code}.proj4`); proj4.defs(epsg, await response.text()); } From f769f2b70b7fbb0170146a65da085f9dbbb542d8 Mon Sep 17 00:00:00 2001 From: Moritz Riede Date: Wed, 8 Jan 2025 16:51:54 +0100 Subject: [PATCH 3/4] fix: remove broken cogs, add sentinel rgb example --- src/components/scenes/add.jsx | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/src/components/scenes/add.jsx b/src/components/scenes/add.jsx index af875a5..209a47c 100644 --- a/src/components/scenes/add.jsx +++ b/src/components/scenes/add.jsx @@ -49,12 +49,9 @@ class ConnectedAddSceneForm extends Component { render() { const { url } = this.state; - const example1Url = 'https://landsat-pds.s3.amazonaws.com/c1/L8/189/027/LC08_L1TP_189027_20170403_20170414_01_T1/index.html'; - const example2Url = 'https://landsat-pds.s3.amazonaws.com/c1/L8/139/045/LC08_L1TP_139045_20170304_20170316_01_T1/index.html'; - const example3Url = 'https://s3-us-west-2.amazonaws.com/planet-disaster-data/hurricane-harvey/SkySat_Freeport_s03_20170831T162740Z3.tif'; - const example3Attribution = 'cc-by-sa, downloaded from https://www.planet.com/disaster/hurricane-harvey-2017-08-28/'; - const example4Url = 'https://oin-hotosm.s3.amazonaws.com/56f9b5a963ebf4bc00074e70/0/56f9c2d42b67227a79b4faec.tif'; - const example5Url = 'https://oin-hotosm.s3.amazonaws.com/59c66c5223c8440011d7b1e4/0/7ad397c0-bba2-4f98-a08a-931ec3a6e943.tif'; + const example1Url = 'https://sentinel-cogs.s3.us-west-2.amazonaws.com/sentinel-s2-l2a-cogs/36/Q/WD/2020/7/S2A_36QWD_20200701_0_L2A/TCI.tif'; + const example2Url = 'https://oin-hotosm.s3.amazonaws.com/56f9b5a963ebf4bc00074e70/0/56f9c2d42b67227a79b4faec.tif'; + const example3Url = 'https://oin-hotosm.s3.amazonaws.com/59c66c5223c8440011d7b1e4/0/7ad397c0-bba2-4f98-a08a-931ec3a6e943.tif'; return (
@@ -87,33 +84,19 @@ class ConnectedAddSceneForm extends Component { onClick={() => this.props.addSceneFromIndex(example1Url)} disabled={!this.checkUrl(example1Url) || this.isLoading()} > - Landsat 8 sample 1 + Sentinel RGB sample - - From ae3a8f90199129bd1f38f45d28fa4bf3b4283626 Mon Sep 17 00:00:00 2001 From: Moritz Riede Date: Wed, 8 Jan 2025 17:20:45 +0100 Subject: [PATCH 4/4] chore: update name to sentinel-2 rgb sample --- src/components/scenes/add.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/scenes/add.jsx b/src/components/scenes/add.jsx index 209a47c..aef3e69 100644 --- a/src/components/scenes/add.jsx +++ b/src/components/scenes/add.jsx @@ -84,7 +84,7 @@ class ConnectedAddSceneForm extends Component { onClick={() => this.props.addSceneFromIndex(example1Url)} disabled={!this.checkUrl(example1Url) || this.isLoading()} > - Sentinel RGB sample + Sentinel-2 RGB sample