@basemaps/landing 7.15.1 → 7.17.0

package/dist/index.js

@@ -57095,35 +57095,16 @@ var WindowUrl = {
 };
 
 // src/tile.matrix.ts
-var TileGrid = class {
-  constructor(tileMatrix, extraZoomLevels = 0) {
-    __publicField(this, "tileMatrix");
-    __publicField(this, "extraZoomLevels");
-    this.tileMatrix = tileMatrix;
-    this.extraZoomLevels = extraZoomLevels;
-  }
-  getStyle(cfg) {
-    return WindowUrl.toTileUrl({
-      urlType: "style" /* Style */,
-      tileMatrix: this.tileMatrix,
-      layerId: cfg.layerId,
-      style: cfg.style,
-      config: cfg.config ?? Config.map.config,
-      terrain: cfg.terrain ?? Config.map.terrain,
-      labels: cfg.labels ?? Config.map.labels
-    });
-  }
-};
-var Nztm2000TileGrid = new TileGrid(Nztm2000Tms, 2);
-var Nztm2000QuadTileGrid = new TileGrid(Nztm2000QuadTms);
-var GoogleTileGrid = new TileGrid(GoogleTms);
-var Grids = [Nztm2000TileGrid, Nztm2000QuadTileGrid, GoogleTileGrid];
-function getTileGrid(id2) {
-  for (const g of Grids) {
-    if (id2 === g.tileMatrix.identifier)
-      return g;
-  }
-  return GoogleTileGrid;
+function getTileGridStyle(tileMatrixSet, cfg) {
+  return WindowUrl.toTileUrl({
+    urlType: "style" /* Style */,
+    tileMatrix: tileMatrixSet,
+    layerId: cfg.layerId,
+    style: cfg.style,
+    config: cfg.config ?? Config.map.config,
+    terrain: cfg.terrain ?? Config.map.terrain,
+    labels: cfg.labels ?? Config.map.labels
+  });
 }
 function isGoogle(tms) {
   return tms.identifier === GoogleTms.identifier;
@@ -57471,6 +57452,12 @@ function addDefaultLayers(output) {
       projections: /* @__PURE__ */ new Set([EpsgCode.Nztm2000, EpsgCode.Google]),
       category: "Basemaps"
     },
+    {
+      id: "topo-raster::topo-raster",
+      title: "NZ Topo Gridless Maps",
+      projections: /* @__PURE__ */ new Set([EpsgCode.Nztm2000, EpsgCode.Google]),
+      category: "Basemaps"
+    },
     {
       id: "topographic::topographic",
       title: "Topographic",
@@ -57484,16 +57471,30 @@ function addDefaultLayers(output) {
       category: "Basemaps"
     },
     {
-      id: "topo-raster::topo-raster",
-      title: "NZ Topo Gridless Maps",
+      id: "hillshade-igor",
+      title: "Hillshade Igor",
       projections: /* @__PURE__ */ new Set([EpsgCode.Nztm2000, EpsgCode.Google]),
-      category: "Basemaps"
+      category: "Basemaps - Hillshade"
+    },
+    {
+      id: "hillshade",
+      title: "Hillshade Standard",
+      projections: /* @__PURE__ */ new Set([EpsgCode.Nztm2000, EpsgCode.Google]),
+      category: "Basemaps - Hillshade"
     },
     {
       id: "elevation",
-      title: "Elevation",
+      title: "Elevation DEM",
       projections: /* @__PURE__ */ new Set([EpsgCode.Google]),
-      category: "Basemaps",
+      category: "Basemaps - Elevation",
+      pipeline: "terrain-rgb",
+      imageFormat: "png"
+    },
+    {
+      id: "elevation-dsm",
+      title: "Elevation DSM",
+      projections: /* @__PURE__ */ new Set([EpsgCode.Google]),
+      category: "Basemaps - Elevation",
       pipeline: "terrain-rgb",
       imageFormat: "png"
     },
@@ -57501,13 +57502,13 @@ function addDefaultLayers(output) {
       id: "scanned-aerial-imagery-pre-1990-01-01",
       title: "Scanned Aerial Imagery pre 1 January 1990",
       projections: /* @__PURE__ */ new Set([EpsgCode.Nztm2000, EpsgCode.Google]),
-      category: "Scanned Aerial Imagery Basemaps"
+      category: "Basemaps - Scanned Aerial Imagery"
     },
     {
       id: "scanned-aerial-imagery-post-1989-12-31",
       title: "Scanned Aerial Imagery post 31 December 1989",
       projections: /* @__PURE__ */ new Set([EpsgCode.Nztm2000, EpsgCode.Google]),
-      category: "Scanned Aerial Imagery Basemaps"
+      category: "Basemaps - Scanned Aerial Imagery"
     }
   ];
   for (const l of layers)
@@ -57535,11 +57536,11 @@ var Config = {
     return "";
   },
   get Version() {
-    return "v7.15.0-3-g500e138b";
+    return "v7.16.0-2-g8d563866";
   },
   /** Github buildId */
   get BuildId() {
-    return "14046256909-1";
+    return "14346900594-1";
   },
   map: new MapConfig()
 };
@@ -64173,7 +64174,8 @@ var DebugMap = class {
 var import_jsx_runtime4 = __toESM(require_jsx_runtime(), 1);
 var HillShadeLayerId = "debug-hillshade";
 var HillShadePrefix = "__hillshade-";
-var elevationProdId = "LINZ-Terrain-Prod";
+var elevationDemProdId = "LINZ-Elevation-DEM-Prod";
+var elevationDsmProdId = "LINZ-Elevation-DSM-Prod";
 function debugSourceDropdown(ctx) {
   return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "debug__info", children: [
     /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("label", { className: "debug__label", children: ctx.label }),
@@ -64367,8 +64369,8 @@ var Debug = class extends import_react12.Component {
       this.renderCaptureAreaToggle(),
       this.renderTileToggle(),
       this.renderRasterSourceDropdown(),
-      this.renderDemSourceDropdown(demSources),
-      this.renderDemHillShadeSourceDropdown(demSources)
+      this.renderElevationSourceDropdown(demSources),
+      this.renderHillShadeSourceDropdown(demSources)
     ] });
   }
   getWMTSLink() {
@@ -64453,11 +64455,11 @@ var Debug = class extends import_react12.Component {
     });
   }
   /**
-   * Add a terrain source that points to production elevation data for debug
+   * Add terrain sources that point to production elevation tilesets
    */
   ensureElevationProd() {
     const map = this.props.map;
-    if (map.getSource(elevationProdId) == null) {
+    if (map.getSource(elevationDemProdId) == null) {
       const url = WindowUrl.toTileUrl({
         urlType: "raster" /* TileRaster */,
         tileMatrix: Config.map.tileMatrix,
@@ -64465,7 +64467,21 @@ var Debug = class extends import_react12.Component {
         pipeline: "terrain-rgb",
         imageFormat: "png"
       });
-      map.addSource(elevationProdId, {
+      map.addSource(elevationDemProdId, {
+        type: "raster-dem",
+        tiles: [url],
+        tileSize: 256
+      });
+    }
+    if (map.getSource(elevationDsmProdId) == null) {
+      const url = WindowUrl.toTileUrl({
+        urlType: "raster" /* TileRaster */,
+        tileMatrix: Config.map.tileMatrix,
+        layerId: "elevation-dsm",
+        pipeline: "terrain-rgb",
+        imageFormat: "png"
+      });
+      map.addSource(elevationDsmProdId, {
         type: "raster-dem",
         tiles: [url],
         tileSize: 256
@@ -64571,7 +64587,7 @@ var Debug = class extends import_react12.Component {
       options: [...sourceIds, "off"]
     });
   }
-  renderDemSourceDropdown(sourceIds) {
+  renderElevationSourceDropdown(sourceIds) {
     if (sourceIds.length === 0)
       return;
     return debugSourceDropdown({
@@ -64581,7 +64597,7 @@ var Debug = class extends import_react12.Component {
       options: ["off", ...sourceIds]
     });
   }
-  renderDemHillShadeSourceDropdown(sourceIds) {
+  renderHillShadeSourceDropdown(sourceIds) {
     if (sourceIds.length === 0)
       return;
     return debugSourceDropdown({
@@ -64759,8 +64775,7 @@ var MapSwitcher = class extends import_react13.Component {
       const target = this.getStyleType();
       const styleId = `${target.layerId}::${target.style}`;
       if (this.currentStyle !== styleId) {
-        const tileGrid = getTileGrid(Config.map.tileMatrix.identifier);
-        const style = tileGrid.getStyle({ layerId: target.layerId, style: target.style });
+        const style = getTileGridStyle(Config.map.tileMatrix, { layerId: target.layerId, style: target.style });
         this.currentStyle = styleId;
         this.map.setStyle(style);
       }
@@ -64784,10 +64799,9 @@ var MapSwitcher = class extends import_react13.Component {
     if (this.el == null)
       return;
     const cfg = Config.map;
-    const tileGrid = getTileGrid(cfg.tileMatrix.identifier);
     const target = this.getStyleType();
     this.currentStyle = `${target.layerId}::${target.style}`;
-    const style = tileGrid.getStyle({ layerId: target.layerId, style: target.style });
+    const style = getTileGridStyle(cfg.tileMatrix, { layerId: target.layerId, style: target.style });
     const location2 = cfg.transformedLocation;
     this.map = new import_maplibre_gl.default.Map({
       container: this.el,
@@ -64887,8 +64901,7 @@ var Basemaps = class extends import_react14.Component {
       this.ensureGeoControl();
       this.ensureScaleControl();
       this.ensureElevationControl();
-      const tileGrid = getTileGrid(Config.map.tileMatrix.identifier);
-      const style = tileGrid.getStyle(Config.map);
+      const style = getTileGridStyle(Config.map.tileMatrix, Config.map);
       this.map.setStyle(style);
       if (Config.map.tileMatrix !== GoogleTms) {
         this.map.setMaxBounds([-179.9, -85, 179.9, 85]);
@@ -64973,8 +64986,7 @@ var Basemaps = class extends import_react14.Component {
     if (this.el == null)
       throw new Error("Unable to find #map element");
     const cfg = Config.map;
-    const tileGrid = getTileGrid(cfg.tileMatrix.identifier);
-    const style = tileGrid.getStyle(Config.map);
+    const style = getTileGridStyle(Config.map.tileMatrix, Config.map);
     const location2 = locationTransform(cfg.location, cfg.tileMatrix, GoogleTms);
     this.map = new import_maplibre_gl2.default.Map({
       container: this.el,
@@ -65200,7 +65212,9 @@ var MapAttribution = class {
 var import_jsx_runtime7 = __toESM(require_jsx_runtime(), 1);
 var Categories = [
   "Basemaps",
-  "Scanned Aerial Imagery Basemaps",
+  "Basemaps - Hillshade",
+  "Basemaps - Elevation",
+  "Basemaps - Scanned Aerial Imagery",
   "Satellite Imagery",
   "Urban Aerial Photos",
   "Rural Aerial Photos",
@@ -65318,7 +65332,8 @@ var LayerSwitcherDropdown = class extends import_react15.Component {
           onChange: this.onLayerChange,
           value: ret.current,
           classNamePrefix: "layer-selector",
-          id: "layer-selector"
+          id: "layer-selector",
+          maxMenuHeight: 520
         }
       ),
       /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(
@@ -65479,7 +65494,7 @@ Your Service/App URL:
           children: [
             /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(LayerSwitcherDropdown, {}),
             this.renderLinks(),
-            /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("h6", { children: "Developer API Keys" }),
+            /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("h6", { children: "Developer API keys" }),
             /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("p", { children: "Contact us for free API keys with better support for public web and mobile apps." }),
             /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("button", { className: "lui-button lui-button-primary contact-us", onClick: this.contactUs, children: "Contact us" }),
             this.renderAbout()
@@ -65530,9 +65545,9 @@ Your Service/App URL:
   }
   renderLinks() {
     return /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)(import_react16.Fragment, { children: [
-      /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("h6", { children: "90 day API keys" }),
-      /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("p", { children: "API keys expire after 90 days, if a longer duration is needed please request a developer API key" }),
-      /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(Copyable, { header: "Api Key", value: Config.ApiKey }),
+      /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("h6", { children: "Individual API keys" }),
+      /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("p", { children: "These API keys are for individual users. For use in shared or public maps, apps or tools, please request a free Developer API key." }),
+      /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(Copyable, { header: "API Key", value: Config.ApiKey }),
       this.renderLinksTiles()
     ] });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/landing",
-  "version": "7.15.1",
+  "version": "7.17.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/linz/basemaps.git",
@@ -28,11 +28,11 @@
     "last 2 Chrome versions"
   ],
   "devDependencies": {
-    "@basemaps/attribution": "^7.15.0",
-    "@basemaps/config": "^7.15.0",
-    "@basemaps/geo": "^7.15.0",
-    "@basemaps/infra": "^7.15.0",
-    "@basemaps/shared": "^7.15.0",
+    "@basemaps/attribution": "^7.16.0",
+    "@basemaps/config": "^7.16.0",
+    "@basemaps/geo": "^7.16.0",
+    "@basemaps/infra": "^7.16.0",
+    "@basemaps/shared": "^7.16.0",
     "@linzjs/lui": "^21.46.0",
     "@servie/events": "^3.0.0",
     "@types/proj4": "^2.5.2",
@@ -113,5 +113,5 @@
       }
     }
   ],
-  "gitHead": "500e138bf620cebd76dfdad24bde53c192da597b"
+  "gitHead": "8d56386678799c617d0a774e59411beacd31e609"
 }