@basemaps/cli-vector 8.9.0 → 8.10.2

package/build/modify/layers/__test__/contours.test.js

@@ -23,19 +23,19 @@ describe('HandleLayerContours', () => {
         },
     };
     describe('handleKindContours', () => {
-        it('should assign a feature a type of index', () => {
+        it('should not assign the feature a type or override its minzoom', () => {
             const feature = structuredClone(FakeFeature);
-            feature.properties['elevation'] = 100;
+            feature.properties['elevation'] = 105;
             const modifiedFeature = handleKindContours(feature, Logger);
-            strictEqual(modifiedFeature.properties['type'], 'index');
-            strictEqual(modifiedFeature.tippecanoe.minzoom, FakeFeature.tippecanoe.minzoom);
+            strictEqual(modifiedFeature.properties['type'], undefined);
+            strictEqual(modifiedFeature.tippecanoe.minzoom, 13);
         });
-        it("should override a feature's minzoom, but not assign it a type", () => {
+        it('should assign the feature a type of index and override its minzoom', () => {
             const feature = structuredClone(FakeFeature);
-            feature.properties['elevation'] = 105;
+            feature.properties['elevation'] = 100;
             const modifiedFeature = handleKindContours(feature, Logger);
-            strictEqual(modifiedFeature.properties['type'], undefined);
-            strictEqual(modifiedFeature.tippecanoe.minzoom, 14);
+            strictEqual(modifiedFeature.properties['type'], 'index');
+            strictEqual(modifiedFeature.tippecanoe.minzoom, FakeFeature.tippecanoe.minzoom);
         });
     });
     describe('handleKindPeak', () => {

package/build/modify/layers/__test__/contours.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"contours.test.js","sourceRoot":"","sources":["../../../../src/modify/layers/__test__/contours.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"contours.test.js","sourceRoot":"","sources":["../../../../src/modify/layers/__test__/contours.test.ts"],"names":[],"mappings":"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"}

package/build/modify/layers/contours.js

@@ -43,7 +43,7 @@ export function handleKindContours(feature, logger) {
     }
     else {
         // override 'minzoom'
-        const minzoom = 14;
+        const minzoom = 13;
         feature.tippecanoe.minzoom = minzoom;
         logger?.trace({ minzoom }, 'overidden styles');
     }

package/dist/index.cjs

@@ -82885,9 +82885,9 @@ var ulid2 = __toESM(require_index_umd(), 1);
 var CliInfo = {
   // Detect unlinked packages looks for this string since its a package name, slightly work around it
   package: "@basemaps/cli",
-  version: "v8.9.0",
-  hash: "55cd25b9f2c402fde88fcef9c43cec3f8eca9e60",
-  buildId: "17570995768-1"
+  version: "v8.14.0",
+  hash: "eb807c6d0f091b41e4d6d972b77c24f584cec230",
+  buildId: "18453645562-1"
 };
 var CliDate = (/* @__PURE__ */ new Date()).toISOString();
 var CliId = ulid2.ulid();
@@ -87130,15 +87130,39 @@ var ConfigImageFormatParser = z.union([
   z.literal("avif")
 ]);
 var ConfigResizeKernelParser = z.union([z.literal("nearest"), z.literal("lanczos3"), z.literal("lanczos2")]);
-var ConfigTileSetPipelineParser = z.object({
-  /**
-   * type of pipeline function
-   *
-   * @example "terrain-rgb"
-   */
-  type: z.string()
-  // TODO allow custom arguments
+var ColorParser = z.object({
+  r: z.number(),
+  g: z.number(),
+  b: z.number(),
+  alpha: z.number()
+});
+var PipelineTerrainRgbParser = z.object({ type: z.literal("terrain-rgb") });
+var PipelineColorRampParser = z.object({ type: z.literal("color-ramp"), ramp: z.string().optional() });
+var PipelineNdviParser = z.object({
+  type: z.literal("ndvi"),
+  nir: z.number(),
+  r: z.number(),
+  alpha: z.number(),
+  scale: z.object({
+    nir: z.number(),
+    r: z.number(),
+    alpha: z.number()
+  }).optional()
 });
+var PipelineExtractParser = z.object({
+  type: z.literal("extract"),
+  r: z.number(),
+  g: z.number(),
+  b: z.number(),
+  alpha: z.number(),
+  scale: ColorParser.optional()
+});
+var ConfigTileSetPipelineParser = z.discriminatedUnion("type", [
+  PipelineExtractParser,
+  PipelineTerrainRgbParser,
+  PipelineColorRampParser,
+  PipelineNdviParser
+]);
 var ConfigRgbaParser = z.object({ r: z.number(), g: z.number(), b: z.number(), alpha: z.number() });
 var ConfigTileSetOutputParser = z.object({
   /**
@@ -88601,6 +88625,13 @@ var Env = {
     /** Index to use for storing analytic data */
     ElasticIndexName: "ELASTIC_INDEX_NAME"
   },
+  /** Load a environment variable throw a exception if the value is empty */
+  getRequired(envName) {
+    const value = Env.get(envName);
+    if (value == null || value === "")
+      throw new Error(`Missing env $${envName}`);
+    return value;
+  },
   /** Load a environment var defaulting to defaultOutput if it does not exist  */
   get(envName) {
     return process.env[envName];
@@ -92405,7 +92436,7 @@ function getTiffTagSize(fieldType) {
     case TiffTagValueType.Ifd8:
       return 8;
     default:
-      throw new Error(`Invalid fieldType ${fieldType}`);
+      throw new Error(`Invalid fieldType ${String(fieldType)}`);
   }
 }
 
@@ -92579,10 +92610,14 @@ async function getValueAt(tiff, tag2, index) {
     const bytes = await tiff.source.fetch(tag2.dataOffset + index * dataTypeSize, dataTypeSize);
     const view = new DataView(bytes);
     const value2 = readValue(tiff, void 0, view, 0, tag2.dataType, 1);
+    if (typeof value2 !== "number")
+      throw new Error("Value is not a number");
     tag2.value[index] = value2;
     return value2;
   }
   const value = readValue(tiff, void 0, tag2.view, index * dataTypeSize, tag2.dataType, 1);
+  if (typeof value !== "number")
+    throw new Error("Value is not a number");
   tag2.value[index] = value;
   return value;
 }
@@ -93350,8 +93385,6 @@ var Tiff = class _Tiff {
     const endian = bytes.getUint16(offset, this.isLittleEndian);
     offset += 2;
     this.isLittleEndian = endian === TiffEndian.Little;
-    if (!this.isLittleEndian)
-      throw new Error("Only little endian is supported");
     this.version = bytes.getUint16(offset, this.isLittleEndian);
     offset += 2;
     let nextOffsetIfd;
@@ -93371,7 +93404,7 @@ var Tiff = class _Tiff {
       nextOffsetIfd = getUint(bytes, offset, this.ifdConfig.pointer, this.isLittleEndian);
       offset += this.ifdConfig.pointer;
     } else {
-      throw new Error(`Only tiff supported version:${this.version}`);
+      throw new Error(`Only tiff supported version:${String(this.version)}`);
     }
     const ghostSize = nextOffsetIfd - offset;
     if (ghostSize > 0 && ghostSize < 16 * 1024) {
@@ -93385,7 +93418,7 @@ var Tiff = class _Tiff {
         lastView = new DataView(bytes2);
         lastView.sourceOffset = nextOffsetIfd;
       }
-      nextOffsetIfd = await this.readIfd(nextOffsetIfd, lastView);
+      nextOffsetIfd = this.readIfd(nextOffsetIfd, lastView);
     }
     await Promise.all(this.images.map((i) => i.init()));
     this.isInitialized = true;
@@ -93397,7 +93430,7 @@ var Tiff = class _Tiff {
    * @param offset file offset to read the header from
    * @param view offset that contains the bytes for the header
    */
-  async readIfd(offset, view) {
+  readIfd(offset, view) {
     const viewOffset = offset - view.sourceOffset;
     const tagCount = getUint(view, viewOffset, this.ifdConfig.offset, this.isLittleEndian);
     const tags = /* @__PURE__ */ new Map();
@@ -94257,7 +94290,7 @@ function handleKindContours(feature, logger) {
     feature.properties["type"] = type;
     logger?.trace({ type }, "new/overidden tags");
   } else {
-    const minzoom = 14;
+    const minzoom = 13;
     feature.tippecanoe.minzoom = minzoom;
     logger?.trace({ minzoom }, "overidden styles");
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/cli-vector",
-  "version": "8.9.0",
+  "version": "8.10.2",
   "private": false,
   "repository": {
     "type": "git",
@@ -22,7 +22,7 @@
     "build": "tsc",
     "bundle": "../../scripts/bundle.mjs package.json",
     "prepack": "../../scripts/bundle.mjs package.json",
-    "test": "node --test"
+    "test": "node --test \"build/**/*.test.js\""
   },
   "bundle": [
     {
@@ -49,9 +49,9 @@
     "dist/"
   ],
   "dependencies": {
-    "@basemaps/config": "^8.9.0",
+    "@basemaps/config": "^8.11.0",
     "@basemaps/geo": "^8.9.0",
-    "@basemaps/shared": "^8.9.0",
+    "@basemaps/shared": "^8.9.3",
     "@cotar/builder": "^6.0.1",
     "@cotar/core": "^6.0.1",
     "@linzjs/docker-command": "^7.5.0",
@@ -65,5 +65,5 @@
     "tar-stream": "^2.2.0",
     "zod": "^3.24.4"
   },
-  "gitHead": "55cd25b9f2c402fde88fcef9c43cec3f8eca9e60"
+  "gitHead": "eb807c6d0f091b41e4d6d972b77c24f584cec230"
 }