Merge branch 'maps' into 'main'

change maps

See merge request !244

libs/leaflet/map-baselayer.model.ts

@@ -4,18 +4,6 @@
  * These base layers map to concrete styles in lib/state/map/map.utils.
  */
 export enum MapBaseLayer {
-  /**
-   * Esri light grey base.
-   * @see https://doc.arcgis.com/en/data-appliance/2022/maps/world-light-gray-base.htm
-   */
-  GREYSCALE = 'Greyscale',
-
-  /**
-   * Esri dark grey base.
-   * @see https://doc.arcgis.com/en/data-appliance/2022/maps/world-dark-gray-base.htm
-   */
-  GREYSCALE_DARK = 'Greyscale Dark',
-
   /**
    * Esri hillshade.
    * @see https://doc.arcgis.com/en/data-appliance/2022/maps/world-hillshade.htm
@@ -28,12 +16,6 @@ export enum MapBaseLayer {
    */
   HILLSHADE_DARK = 'Hillshade Dark',
 
-  /**
-   * Esri National Geographic world map.
-   * @see https://doc.arcgis.com/en/data-appliance/2022/maps/national-geographic-world-map.htm
-   */
-  NAT_GEO = 'Natational Geographic',
-
   /**
    * Esri ocean map.
    * @see https://doc.arcgis.com/en/data-appliance/2022/maps/world-ocean-base.htm
@@ -53,14 +35,9 @@ export enum MapBaseLayer {
   SATELLITE = 'Satellite',
 
   /**
-   * Esir street map.
-   * @see https://doc.arcgis.com/en/data-appliance/2022/maps/world-street-map.htm
-   */
-  STREET = 'Street',
-
-  /**
-   * Esri topographic map.
-   * @see https://doc.arcgis.com/en/data-appliance/2022/maps/world-topographic-map.htm
+   * USGS topographic map.
+   *
+   * @see https://basemap.nationalmap.gov/arcgis/rest/services/USGSTopo/MapServer
    */
-  TOPO = 'Topographic',
+  USGS_TOPO = 'USGS Topographic',
 }

libs/leaflet/map.utils.ts

@@ -10,30 +10,10 @@ export type LocationTransform = (location: Location) => Location;
 /**
  * Esri raster base layers for Leaflet.
  *
- * https://doc.arcgis.com/en/data-appliance/2022/maps/directory-maps-data.htm
+ * https://doc.arcgis.com/en/data-appliance/latest/maps/directory-maps-data.htm
  */
 export function baseLayers(): Record<MapBaseLayer, L.TileLayer> {
   const baseLayers: Record<MapBaseLayer, L.TileLayer> = {
-    /* Esri light gray */
-    [MapBaseLayer.GREYSCALE]: L.tileLayer(
-      `${ARCGIS_URL_START}Canvas/World_Light_Gray_Base${ARCGIS_URL_END}`,
-      {
-        ...OPTIONS,
-        attribution:
-          'Esri, HERE, Garmin, © OpenStreetMap contributors, and the GIS user community',
-        id: MapBaseLayer.GREYSCALE,
-      }
-    ),
-    /* Esri dark gray */
-    [MapBaseLayer.GREYSCALE_DARK]: L.tileLayer(
-      `${ARCGIS_URL_START}Canvas/World_Dark_Gray_Base${ARCGIS_URL_END}`,
-      {
-        ...OPTIONS,
-        attribution:
-          'Esri, HERE, Garmin, © OpenStreetMap contributors, and the GIS user community',
-        id: MapBaseLayer.GREYSCALE_DARK,
-      }
-    ),
     /* Esri world hillshade */
     [MapBaseLayer.HILLSHADE]: L.tileLayer(
       `${ARCGIS_URL_START}Elevation/World_Hillshade${ARCGIS_URL_END}`,
@@ -58,17 +38,6 @@ export function baseLayers(): Record<MapBaseLayer, L.TileLayer> {
         id: MapBaseLayer.HILLSHADE_DARK,
       }
     ),
-    /* Esri National Geographics world map */
-    [MapBaseLayer.NAT_GEO]: L.tileLayer(
-      `${ARCGIS_URL_START}NatGeo_World_Map${ARCGIS_URL_END}`,
-      {
-        ...OPTIONS,
-        attribution:
-          'National Geographic, Esri, Garmin, HERE, UNEP-WCMC, USGS, ' +
-          'NASA, ESA, METI, NRCan, GEBCO, NOAA, INCREMENT P',
-        id: MapBaseLayer.NAT_GEO,
-      }
-    ),
     /* Esri world ocean */
     [MapBaseLayer.OCEAN]: L.tileLayer(
       `${ARCGIS_URL_START}Ocean/World_Ocean_Base${ARCGIS_URL_END}`,
@@ -98,27 +67,17 @@ export function baseLayers(): Record<MapBaseLayer, L.TileLayer> {
         id: MapBaseLayer.SATELLITE,
       }
     ),
-    [MapBaseLayer.STREET]: L.tileLayer(
-      `${ARCGIS_URL_START}World_Street_Map${ARCGIS_URL_END}`,
-      {
-        ...OPTIONS,
-        attribution:
-          'Esri, HERE, Garmin, USGS, Intermap, INCREMENT P, ' +
-          'NRCan, Esri Japan, METI, Esri China (Hong Kong), Esri Korea, ' +
-          'Esri (Thailand), NGCC, © OpenStreetMap contributors, and the ' +
-          'GIS User Community',
-        id: MapBaseLayer.STREET,
-      }
-    ),
-    [MapBaseLayer.TOPO]: L.tileLayer(
-      `${ARCGIS_URL_START}World_Topo_Map${ARCGIS_URL_END}`,
+    [MapBaseLayer.USGS_TOPO]: L.tileLayer(
+      'https://basemap.nationalmap.gov/arcgis/rest/services/USGSTopo/MapServer/tile/{z}/{y}/{x}',
       {
         ...OPTIONS,
-        attribution:
-          'Esri, HERE, Garmin, USGS, Intermap, INCREMENT P, NRCan, ' +
-          'Esri Japan, METI, Mapwithyou, NOSTRA, © OpenStreetMap ' +
-          'contributors, and the GIS User Community',
-        id: MapBaseLayer.TOPO,
+        attribution: `Esri, USGS | Esri, TomTom, FAO, NOAA, USGS | USGS The National Map: National Boundaries
+       Dataset, 3DEP Elevation Program, Geographic Names Information System, National Hydrography
+       Dataset, National Land Cover Database, National Structures Dataset, and National
+       Transportation Dataset; USGS Global Ecosystems; U.S. Census Bureau TIGER/Line data;
+       USFS Road data; Natural Earth Data; U.S. Department of State HIU; NOAA National
+       Centers for Environmental Information. Data refreshed February, 2025.`,
+        id: MapBaseLayer.USGS_TOPO,
       }
     ),
   };