Merge pull request #66 from nsidc/change-default-basemap

Use USGS topographic imagery basemap by default

CHANGELOG.md

@@ -1,12 +1,10 @@
-# v1.0.0 (Unreleased)
+# v0.17.0 (2024-03-06)
 
-* Update expected JSON structures to match new snow-today-webapp-server specifications.
+* Display sensor/platform/algorithm in variable selectors.
+* Default basemap is now _USGS Topographic + Imagery_
+* Update expected JSON structures to match
+  [new snow-today-webapp-server specifications](https://snow-today-webapp-server.readthedocs.io/interfaces/).
     * Support arbitrary nesting of sub-regions specified in server-side data.
-* Update appearance
-    * New Super Region splash selector on first launch of application.
-    * Legends are now displayed at the bottom of the map instead of as a draggable and
-      resizable element within the map viewport.
-    * Display sensor/platform/algorithm in variable selectors.
 
 
 ## Under the hood

src/components/ControlPanel/BasemapSelector.tsx

@@ -4,7 +4,7 @@ import {useAtom} from 'jotai';
 import Dropdown from 'react-bootstrap/Dropdown';
 import DropdownButton from 'react-bootstrap/DropdownButton';
 
-import {basemapNames} from '@src/util/layer/basemaps';
+import {basemapTitles, BasemapTitle} from '@src/util/layer/basemaps';
 import {selectedBasemapNameAtom} from '@src/state/client/selectedBasemapName';
 
 const BasemapSelector: React.FC = () => {
@@ -14,11 +14,12 @@ const BasemapSelector: React.FC = () => {
     if (!eventKey) {
       return;
     }
-    setSelectedBasemap(eventKey);
+    // TODO: How to avoid cast?
+    setSelectedBasemap(eventKey as BasemapTitle);
   };
   return (
     <DropdownButton title={'Select a Basemap'} onSelect={handleSelect}>
-      {basemapNames.map(basemapName => (
+      {basemapTitles.map(basemapName => (
         <Dropdown.Item
           key={basemapName}
           eventKey={basemapName}

src/state/client/selectedBasemapName.ts

@@ -1,6 +1,7 @@
 import {atom} from 'jotai';
 
+import {BasemapTitle} from '@src/util/layer/basemaps';
 
 // TODO: Something about this magic string
-export const selectedBasemapNameAtom = atom<string>('USGS Topographic');
+export const selectedBasemapNameAtom = atom<BasemapTitle>('USGS Topographic + Imagery');
 selectedBasemapNameAtom.debugLabel = 'selectedBasemapNameAtom';

src/util/layer/basemaps.ts

@@ -12,14 +12,30 @@ import {
 } from './source';
 
 
+// TODO: Don't use titles as IDs anymore (NOTE: We're not using the source ID
+// because those aren't necessarily unique)
+export type BasemapTitle =
+  | "USGS Topographic"
+  | "USGS Topographic + Imagery"
+  | "USGS Imagery"
+  | "USGS Shaded Relief"
+  | "USGS Hydro Cached"
+  | "ArcGIS Dark Gray"
+  | "ArcGIS Dark Gray Reference"  // TODO: Remove?
+  | "ArcGIS Dark Gray Base"  // TODO: Remove?
+  | "ArcGIS Dark Gray - Base only"
+  | "ArcGIS National Geographic"
+  | "ArcGIS World Topographic"
+
 interface ISourceAttrs {
   id: string;
   fn: (id: any) => XYZ;
 }
 interface IBasemapAttrs {
-  title: string;
+  title: BasemapTitle;
   visible: boolean;
   sourceInfo?: ISourceAttrs;
+  // For when multiple sources must be combined
   children?: IBasemapAttrs[];
 }
 
@@ -146,7 +162,10 @@ const basemapsInfo: IBasemapAttrs[] = [
     visible: false,
   },
 ];
-export const basemapNames = basemapsInfo.map(
+
+// NOTE: Children are not included here. Could probably use clearer
+// nomenclature.
+export const basemapTitles: Array<BasemapTitle> = basemapsInfo.map(
   (basemapInfoEntry) => basemapInfoEntry['title']
 );