From dd232b11aa8e1aa790914f61c31230c26e2c9583 Mon Sep 17 00:00:00 2001 From: Jeremy Myers Date: Tue, 21 Apr 2026 14:31:24 -0400 Subject: [PATCH 1/3] Add new external baselayers and update neo4 to neo11 --- src/configs/mapSettings.ts | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/src/configs/mapSettings.ts b/src/configs/mapSettings.ts index 2e6036d..96f7530 100644 --- a/src/configs/mapSettings.ts +++ b/src/configs/mapSettings.ts @@ -8,7 +8,6 @@ export const SERVICE_URL: string = const MERCATOR_MAX_LAT = 85.0511287798066; -export const CAR_BBOX = [-180, -90, 180, 90]; export const MERCATOR_BBOX = [-180, -MERCATOR_MAX_LAT, 180, MERCATOR_MAX_LAT]; export const DEFAULT_INTERNAL_MAP_SETTINGS = { @@ -23,6 +22,32 @@ export const DEFAULT_INTERNAL_MAP_SETTINGS = { export const EXTERNAL_DETAILS_ID = 'external-comparison-maps'; export const EXTERNAL_BASELAYERS: ExternalBaselayer[] = [ + { + layer_id: 'external-legacy-dr9', + name: 'Legacy Survey | DR9', + projection: 'EPSG:3857', + url: 'https://{a-d}.legacysurvey.org/viewer/ls-dr9-mid/1/{z}/{x}/{y}.jpg', + extent: transformExtent( + [-180, -MERCATOR_MAX_LAT, 180, MERCATOR_MAX_LAT], + 'EPSG:4326', + 'EPSG:3857' + ), + maxZoom: 16, + disabledState: (isFlipped: boolean) => !isFlipped, + }, + { + layer_id: 'external-unwise-neo11', + name: 'Legacy Survey | unWISE neo11', + projection: 'EPSG:3857', + url: 'https://{a-d}.legacysurvey.org/viewer/unwise-neo11/1/{z}/{x}/{y}.jpg', + extent: transformExtent( + [-180, -MERCATOR_MAX_LAT, 180, MERCATOR_MAX_LAT], + 'EPSG:4326', + 'EPSG:3857' + ), + maxZoom: 16, + disabledState: (isFlipped: boolean) => !isFlipped, + }, { layer_id: 'external-unwise-neo6', name: 'Legacy Survey | unWISE neo6', @@ -33,20 +58,20 @@ export const EXTERNAL_BASELAYERS: ExternalBaselayer[] = [ 'EPSG:4326', 'EPSG:3857' ), - maxZoom: 10, + maxZoom: 16, disabledState: (isFlipped: boolean) => !isFlipped, }, { - layer_id: 'external-unwise-neo4', - name: 'Legacy Survey | unWISE neo4', + layer_id: 'external-legacy-vlass', + name: 'Legacy Survey | VLASS 1.2', projection: 'EPSG:3857', - url: 'https://imagine.legacysurvey.org/static/tiles/unwise-neo4/1/{z}/{x}/{y}.jpg', + url: 'https://{a-d}.legacysurvey.org/viewer/vlass1.2/1/{z}/{x}/{y}.jpg', extent: transformExtent( [-180, -MERCATOR_MAX_LAT, 180, MERCATOR_MAX_LAT], 'EPSG:4326', 'EPSG:3857' ), - maxZoom: 8, + maxZoom: 16, disabledState: (isFlipped: boolean) => !isFlipped, }, ]; From 8d54f6a689112b279dc74484c73038c9cf762297 Mon Sep 17 00:00:00 2001 From: Jeremy Myers Date: Tue, 21 Apr 2026 15:36:17 -0400 Subject: [PATCH 2/3] Fix blocking behavior of tile loading indicator --- src/components/styles/aperture-layer.css | 2 +- src/components/styles/loading-overlay.css | 8 ++++---- src/hooks/useTileLoading.ts | 8 ++++++++ src/index.css | 1 + 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/components/styles/aperture-layer.css b/src/components/styles/aperture-layer.css index 5104873..2ee24c0 100644 --- a/src/components/styles/aperture-layer.css +++ b/src/components/styles/aperture-layer.css @@ -2,5 +2,5 @@ position: absolute; top: 128px; left: 9px; - z-index: 400; + z-index: 1000; } diff --git a/src/components/styles/loading-overlay.css b/src/components/styles/loading-overlay.css index 78a6308..8082018 100644 --- a/src/components/styles/loading-overlay.css +++ b/src/components/styles/loading-overlay.css @@ -1,13 +1,13 @@ .loading-overlay { position: absolute; - height: 100%; - width: 100%; + top: 50%; + right: 50%; z-index: 500; display: flex; justify-content: center; align-items: center; - opacity: 0.4; - background-color: white; + pointer-events: all; + background-color: transparent; } .loaded { diff --git a/src/hooks/useTileLoading.ts b/src/hooks/useTileLoading.ts index bacae55..25baed8 100644 --- a/src/hooks/useTileLoading.ts +++ b/src/hooks/useTileLoading.ts @@ -12,6 +12,13 @@ export function useTileLoading(mapRef: React.RefObject) { let pendingTiles = 0; + function onMoveStart() { + pendingTiles = 0; + setIsLoadingTiles(false); + } + + map.on('movestart', onMoveStart); + function onLoadStart() { pendingTiles++; setIsLoadingTiles(true); @@ -58,6 +65,7 @@ export function useTileLoading(mapRef: React.RefObject) { }); return () => { + map.un('movestart', onMoveStart); map.getLayers().forEach((layer) => { if (layer instanceof TileLayer) unbindSource(layer as TileLayer); }); diff --git a/src/index.css b/src/index.css index c4f60c0..b7cbba4 100644 --- a/src/index.css +++ b/src/index.css @@ -43,6 +43,7 @@ body { .ol-zoom { font-size: 1.5em; + z-index: 1000; } .scale-control { From e1552760d2493fdcb9ed1815d16b8c19f481af90 Mon Sep 17 00:00:00 2001 From: Jeremy Myers Date: Tue, 21 Apr 2026 15:51:54 -0400 Subject: [PATCH 3/3] Remove neo6 external layer --- src/configs/mapSettings.ts | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/configs/mapSettings.ts b/src/configs/mapSettings.ts index 96f7530..92a7beb 100644 --- a/src/configs/mapSettings.ts +++ b/src/configs/mapSettings.ts @@ -48,19 +48,6 @@ export const EXTERNAL_BASELAYERS: ExternalBaselayer[] = [ maxZoom: 16, disabledState: (isFlipped: boolean) => !isFlipped, }, - { - layer_id: 'external-unwise-neo6', - name: 'Legacy Survey | unWISE neo6', - projection: 'EPSG:3857', - url: 'https://s3.us-west-2.amazonaws.com/unwise-neo6.legacysurvey.org/{z}/{x}/{y}.jpg', - extent: transformExtent( - [-180, -MERCATOR_MAX_LAT, 180, MERCATOR_MAX_LAT], - 'EPSG:4326', - 'EPSG:3857' - ), - maxZoom: 16, - disabledState: (isFlipped: boolean) => !isFlipped, - }, { layer_id: 'external-legacy-vlass', name: 'Legacy Survey | VLASS 1.2',