@loaders.gl/wkt 4.3.2 → 4.4.0-alpha.2

package/dist/wkb-writer.js

@@ -1,8 +1,8 @@
 // loaders.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { VERSION } from "./lib/utils/version.js";
-import { encodeWKB } from "./lib/encode-wkb.js";
+import { convertGeometryToWKB } from '@loaders.gl/gis';
+import { VERSION } from "./lib/version.js";
 /**
  * WKB exporter
  */
@@ -12,6 +12,7 @@ export const WKBWriter = {
     module: 'wkt',
     version: VERSION,
     extensions: ['wkb'],
+    mimeTypes: ['application/wkb', 'application/octet-stream'],
     options: {
         wkb: {
             hasZ: false,
@@ -19,9 +20,9 @@ export const WKBWriter = {
         }
     },
     async encode(data, options) {
-        return encodeWKB(data, options?.wkb);
+        return convertGeometryToWKB(data); // , options?.wkb);
     },
     encodeSync(data, options) {
-        return encodeWKB(data, options?.wkb);
+        return convertGeometryToWKB(data); // , options?.wkb);
     }
 };

package/dist/wkt-crs-loader.d.ts

@@ -1,5 +1,5 @@
 import type { LoaderOptions } from '@loaders.gl/loader-utils';
-import type { ParseWKTCRSOptions, WKTCRS } from "./lib/parse-wkt-crs.js";
+import type { ParseWKTCRSOptions, WKTCRS } from '@loaders.gl/gis';
 export type WKTCRSLoaderOptions = LoaderOptions & {
     'wkt-crs'?: ParseWKTCRSOptions;
 };

package/dist/wkt-crs-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wkt-crs-loader.d.ts","sourceRoot":"","sources":["../src/wkt-crs-loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAmB,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAE9E,OAAO,KAAK,EAAC,kBAAkB,EAAE,MAAM,EAAC,+BAA4B;AAGpE,MAAM,MAAM,mBAAmB,GAAG,aAAa,GAAG;IAChD,SAAS,CAAC,EAAE,kBAAkB,CAAC;CAChC,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,YAAY;uBACM,MAAM;wBAChB,KAAK;;;;;;;;;;;;;;;CAgB+C,CAAC"}
+{"version":3,"file":"wkt-crs-loader.d.ts","sourceRoot":"","sources":["../src/wkt-crs-loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAmB,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAC9E,OAAO,KAAK,EAAC,kBAAkB,EAAE,MAAM,EAAC,MAAM,iBAAiB,CAAC;AAIhE,MAAM,MAAM,mBAAmB,GAAG,aAAa,GAAG;IAChD,SAAS,CAAC,EAAE,kBAAkB,CAAC;CAChC,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,YAAY;uBACM,MAAM;wBAChB,KAAK;;;;;;;;;;;;;;;CAgB+C,CAAC"}

package/dist/wkt-crs-loader.js

@@ -1,8 +1,8 @@
 // loaders.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { VERSION } from "./lib/utils/version.js";
-import { parseWKTCRS } from "./lib/parse-wkt-crs.js";
+import { parseWKTCRS } from '@loaders.gl/gis';
+import { VERSION } from "./lib/version.js";
 /**
  * Well-Known text CRS loader
  * @see OGC Standard: https://www.ogc.org/standards/wkt-crs

package/dist/wkt-crs-writer.d.ts

@@ -1,5 +1,5 @@
 import type { WriterOptions } from '@loaders.gl/loader-utils';
-import type { EncodeWKTCRSOptions } from "./lib/encode-wkt-crs.js";
+import type { EncodeWKTCRSOptions } from '@loaders.gl/gis';
 export type WKTCRSWriterOptions = WriterOptions & {
     'wkt-crs'?: EncodeWKTCRSOptions;
 };

package/dist/wkt-crs-writer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wkt-crs-writer.d.ts","sourceRoot":"","sources":["../src/wkt-crs-writer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAoB,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAI/E,OAAO,KAAK,EAAC,mBAAmB,EAAC,gCAA6B;AAG9D,MAAM,MAAM,mBAAmB,GAAG,aAAa,GAAG;IAChD,SAAS,CAAC,EAAE,mBAAmB,CAAC;CACjC,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;CAkBiD,CAAC"}
+{"version":3,"file":"wkt-crs-writer.d.ts","sourceRoot":"","sources":["../src/wkt-crs-writer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAoB,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAC/E,OAAO,KAAK,EAAS,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AAIjE,MAAM,MAAM,mBAAmB,GAAG,aAAa,GAAG;IAChD,SAAS,CAAC,EAAE,mBAAmB,CAAC;CACjC,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;CAkBiD,CAAC"}

package/dist/wkt-crs-writer.js

@@ -1,8 +1,8 @@
 // loaders.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { VERSION } from "./lib/utils/version.js";
-import { encodeWKTCRS } from "./lib/encode-wkt-crs.js";
+import { encodeWKTCRS } from '@loaders.gl/gis';
+import { VERSION } from "./lib/version.js";
 /**
  * Well-Known text CRS loader
  * @see OGC Standard: https://www.ogc.org/standards/wkt-crs

package/dist/wkt-loader.d.ts

@@ -1,6 +1,6 @@
 import type { LoaderOptions } from '@loaders.gl/loader-utils';
-import { isWKT } from "./lib/parse-wkt.js";
-import { Geometry } from '@loaders.gl/schema';
+import type { Geometry } from '@loaders.gl/schema';
+import { isWKT } from '@loaders.gl/gis';
 export type WKTLoaderOptions = LoaderOptions & {
     /** Options for the WKTLoader */
     wkt?: {

package/dist/wkt-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wkt-loader.d.ts","sourceRoot":"","sources":["../src/wkt-loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAA2B,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAEtF,OAAO,EAAW,KAAK,EAAoB,2BAAwB;AACnE,OAAO,EAAC,QAAQ,EAAC,MAAM,oBAAoB,CAAC;AAE5C,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,gCAAgC;IAChC,GAAG,CAAC,EAAE;QACJ,iCAAiC;QACjC,KAAK,CAAC,EAAE,kBAAkB,CAAC;QAC3B,8FAA8F;QAC9F,GAAG,CAAC,EAAE,OAAO,CAAC;QACd,8EAA8E;QAC9E,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,eAAe;uBACG,QAAQ;wBAClB,KAAK;;;;;;;;;;;;;;;;;;CAmBoC,CAAC;AAE/D;;GAEG;AACH,eAAO,MAAM,SAAS;;qCAGI,MAAM;uBA5BD,QAAQ;wBAClB,KAAK;;;;;;;;;;;;;;;;;;CA4B8C,CAAC"}
+{"version":3,"file":"wkt-loader.d.ts","sourceRoot":"","sources":["../src/wkt-loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAA2B,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACtF,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAC,KAAK,EAA0C,MAAM,iBAAiB,CAAC;AAG/E,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,gCAAgC;IAChC,GAAG,CAAC,EAAE;QACJ,iCAAiC;QACjC,KAAK,CAAC,EAAE,kBAAkB,CAAC;QAC3B,8FAA8F;QAC9F,GAAG,CAAC,EAAE,OAAO,CAAC;QACd,8EAA8E;QAC9E,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,eAAe;uBACG,QAAQ;wBAClB,KAAK;;;;;;;;;;;;;;;;;;CAmBoC,CAAC;AAE/D;;GAEG;AACH,eAAO,MAAM,SAAS;;qCAII,MAAM;uBA7BD,QAAQ;wBAClB,KAAK;;;;;;;;;;;;;;;;;;CA6B8C,CAAC"}

package/dist/wkt-loader.js

@@ -1,8 +1,8 @@
 // loaders.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { VERSION } from "./lib/utils/version.js";
-import { parseWKT, isWKT, WKT_MAGIC_STRINGS } from "./lib/parse-wkt.js";
+import { isWKT, WKT_MAGIC_STRINGS, convertWKTToGeometry } from '@loaders.gl/gis';
+import { VERSION } from "./lib/version.js";
 /**
  * Well-Known text worker loader
  */
@@ -32,6 +32,6 @@ export const WKTWorkerLoader = {
  */
 export const WKTLoader = {
     ...WKTWorkerLoader,
-    parse: async (arrayBuffer, options) => parseWKT(new TextDecoder().decode(arrayBuffer), options),
-    parseTextSync: (string, options) => parseWKT(string, options)
+    parse: async (arrayBuffer, options) => convertWKTToGeometry(new TextDecoder().decode(arrayBuffer), options),
+    parseTextSync: (string, options) => convertWKTToGeometry(string, options)
 };

package/dist/wkt-worker.js

@@ -199,12 +199,7 @@
     return await parser(data, { ...options }, context, loader);
   }
 
-  // src/lib/utils/version.ts
-  var VERSION = true ? "4.3.1" : "latest";
-
-  // src/lib/parse-wkt.ts
-  var numberRegexp = /[-+]?([0-9]*\.[0-9]+|[0-9]+)([eE][-+]?[0-9]+)?/;
-  var tuples = new RegExp("^" + numberRegexp.source + "(\\s" + numberRegexp.source + "){1,}");
+  // ../gis/src/lib/geometry-converters/wkb/helpers/wkb-types.ts
   var WKT_MAGIC_STRINGS = [
     "POINT(",
     "LINESTRING(",
@@ -213,15 +208,30 @@
     "MULTILINESTRING(",
     "MULTIPOLYGON(",
     "GEOMETRYCOLLECTION("
-    // We only support this "geojson" subset of the OGC simple features standard
   ];
+  var textEncoder = new TextEncoder();
+  var WKT_MAGIC_BYTES = WKT_MAGIC_STRINGS.map((string) => textEncoder.encode(string));
+
+  // ../gis/src/lib/geometry-converters/wkb/helpers/parse-wkb-header.ts
   function isWKT(input) {
-    return WKT_MAGIC_STRINGS.some((magicString) => input.startsWith(magicString));
+    return getWKTGeometryType(input) !== null;
   }
-  function parseWKT(input, options) {
-    return parseWKTToGeometry(input, options);
+  function getWKTGeometryType(input) {
+    if (typeof input === "string") {
+      const index2 = WKT_MAGIC_STRINGS.findIndex((magicString) => input.startsWith(magicString));
+      return index2 >= 0 ? index2 + 1 : null;
+    }
+    const inputArray = new Uint8Array(input);
+    const index = WKT_MAGIC_BYTES.findIndex(
+      (magicBytes) => magicBytes.every((value, index2) => value === inputArray[index2])
+    );
+    return index >= 0 ? index + 1 : null;
   }
-  function parseWKTToGeometry(input, options) {
+
+  // ../gis/src/lib/geometry-converters/wkb/convert-wkt-to-geometry.ts
+  var numberRegexp = /[-+]?([0-9]*\.[0-9]+|[0-9]+)([eE][-+]?[0-9]+)?/;
+  var tuples = new RegExp("^" + numberRegexp.source + "(\\s" + numberRegexp.source + "){1,}");
+  function convertWKTToGeometry(input, options) {
     const parts = input.split(";");
     let _ = parts.pop();
     const srid = (parts.shift() || "").split("=").pop();
@@ -443,6 +453,9 @@
     $(/^\s*/, state);
   }
 
+  // src/lib/version.ts
+  var VERSION = true ? "4.4.0-alpha.1" : "latest";
+
   // src/wkt-loader.ts
   var WKTWorkerLoader = {
     dataType: null,
@@ -467,8 +480,8 @@
   };
   var WKTLoader = {
     ...WKTWorkerLoader,
-    parse: async (arrayBuffer, options) => parseWKT(new TextDecoder().decode(arrayBuffer), options),
-    parseTextSync: (string, options) => parseWKT(string, options)
+    parse: async (arrayBuffer, options) => convertWKTToGeometry(new TextDecoder().decode(arrayBuffer), options),
+    parseTextSync: (string, options) => convertWKTToGeometry(string, options)
   };
 
   // src/workers/wkt-worker.ts

package/dist/wkt-writer.d.ts

@@ -1,6 +1,6 @@
 import type { WriterOptions } from '@loaders.gl/loader-utils';
-import { encodeWKT } from "./lib/encode-wkt.js";
-import { Geometry } from '@loaders.gl/schema';
+import type { Geometry } from '@loaders.gl/schema';
+import { convertGeometryToWKT } from '@loaders.gl/gis';
 export type WKTWriterOptions = WriterOptions & {
     wkt?: {};
 };
@@ -13,14 +13,15 @@ export declare const WKTWriter: {
     readonly module: "wkt";
     readonly version: any;
     readonly extensions: ["wkt"];
+    readonly mimeTypes: ["application/wkt", "text/plain"];
     readonly text: true;
     readonly encode: (geometry: Geometry) => Promise<ArrayBuffer>;
-    readonly encodeSync: typeof encodeWKTSync;
-    readonly encodeTextSync: typeof encodeWKT;
+    readonly encodeSync: typeof convertGeometryToWKTSync;
+    readonly encodeTextSync: typeof convertGeometryToWKT;
     readonly options: {
         readonly wkt: {};
     };
 };
-declare function encodeWKTSync(geometry: Geometry): ArrayBuffer;
+declare function convertGeometryToWKTSync(geometry: Geometry): ArrayBuffer;
 export {};
 //# sourceMappingURL=wkt-writer.d.ts.map

package/dist/wkt-writer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wkt-writer.d.ts","sourceRoot":"","sources":["../src/wkt-writer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAoB,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAE/E,OAAO,EAAC,SAAS,EAAC,4BAAyB;AAC3C,OAAO,EAAC,QAAQ,EAAC,MAAM,oBAAoB,CAAC;AAE5C,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE,EAAE,CAAC;CACV,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS;;;;;;;gCAOK,QAAQ;;;;;;CAMsC,CAAC;AAE1E,iBAAS,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,WAAW,CAEtD"}
+{"version":3,"file":"wkt-writer.d.ts","sourceRoot":"","sources":["../src/wkt-writer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAoB,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAC/E,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAC,oBAAoB,EAAC,MAAM,iBAAiB,CAAC;AAGrD,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE,EAAE,CAAC;CACV,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS;;;;;;;;gCAQK,QAAQ;;;;;;CAMsC,CAAC;AAE1E,iBAAS,wBAAwB,CAAC,QAAQ,EAAE,QAAQ,GAAG,WAAW,CAIjE"}

package/dist/wkt-writer.js

@@ -1,8 +1,8 @@
 // loaders.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { VERSION } from "./lib/utils/version.js";
-import { encodeWKT } from "./lib/encode-wkt.js";
+import { convertGeometryToWKT } from '@loaders.gl/gis';
+import { VERSION } from "./lib/version.js";
 /**
  * WKT exporter
  */
@@ -12,14 +12,17 @@ export const WKTWriter = {
     module: 'wkt',
     version: VERSION,
     extensions: ['wkt'],
+    mimeTypes: ['application/wkt', 'text/plain'],
     text: true,
-    encode: async (geometry) => encodeWKTSync(geometry),
-    encodeSync: encodeWKTSync,
-    encodeTextSync: encodeWKT,
+    encode: async (geometry) => convertGeometryToWKTSync(geometry),
+    encodeSync: convertGeometryToWKTSync,
+    encodeTextSync: convertGeometryToWKT,
     options: {
         wkt: {}
     }
 };
-function encodeWKTSync(geometry) {
-    return new TextEncoder().encode(encodeWKT(geometry)).buffer;
+function convertGeometryToWKTSync(geometry) {
+    const wktString = convertGeometryToWKT(geometry);
+    const wktTypedArray = new TextEncoder().encode(wktString);
+    return wktTypedArray.buffer;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@loaders.gl/wkt",
   "description": "Loader and Writer for the WKT (Well Known Text) Format",
-  "version": "4.3.2",
+  "version": "4.4.0-alpha.2",
   "license": "MIT",
   "type": "module",
   "publishConfig": {
@@ -44,12 +44,12 @@
     "fuzzer": "^0.2.1"
   },
   "dependencies": {
-    "@loaders.gl/gis": "4.3.2",
-    "@loaders.gl/loader-utils": "4.3.2",
-    "@loaders.gl/schema": "4.3.2"
+    "@loaders.gl/gis": "4.4.0-alpha.2",
+    "@loaders.gl/loader-utils": "4.4.0-alpha.2",
+    "@loaders.gl/schema": "4.4.0-alpha.2"
   },
   "peerDependencies": {
-    "@loaders.gl/core": "^4.3.0"
+    "@loaders.gl/core": "4.4.0-alpha.1"
   },
-  "gitHead": "b4203b8703f64a38d6f79a3113bc7bb51d45c93a"
+  "gitHead": "3d9fed050eabdc0812ddf2f4d5fb9914a34ee0c2"
 }

package/src/hex-wkb-loader.ts

@@ -3,12 +3,12 @@
 // Copyright (c) vis.gl contributors
 
 import type {LoaderWithParser} from '@loaders.gl/loader-utils';
-import {BinaryGeometry} from '@loaders.gl/schema';
+import type {Geometry} from '@loaders.gl/schema';
+import {convertWKBToGeometry, decodeHex} from '@loaders.gl/gis';
 
 import type {WKBLoaderOptions} from './wkb-loader';
 import {WKBLoader} from './wkb-loader';
-import {VERSION} from './lib/utils/version';
-import {decodeHex} from './lib/utils/hex-transcoder';
+import {VERSION} from './lib/version';
 
 export type HexWKBLoaderOptions = WKBLoaderOptions;
 
@@ -16,7 +16,7 @@ export type HexWKBLoaderOptions = WKBLoaderOptions;
  * Worker loader for Hex-encoded WKB (Well-Known Binary)
  */
 export const HexWKBLoader = {
-  dataType: null as unknown as BinaryGeometry,
+  dataType: null as unknown as Geometry,
   batchType: null as never,
   name: 'Hexadecimal WKB',
   id: 'wkb',
@@ -32,12 +32,11 @@ export const HexWKBLoader = {
   // TODO - encoding here seems wasteful - extend hex transcoder?
   parse: async (arrayBuffer: ArrayBuffer) => parseHexWKB(new TextDecoder().decode(arrayBuffer)),
   parseTextSync: parseHexWKB
-} as const satisfies LoaderWithParser<BinaryGeometry, never, HexWKBLoaderOptions>;
+} as const satisfies LoaderWithParser<Geometry, never, HexWKBLoaderOptions>;
 
-function parseHexWKB(text: string, options?: HexWKBLoaderOptions): BinaryGeometry {
+function parseHexWKB(text: string, options?: HexWKBLoaderOptions): Geometry {
   const uint8Array = decodeHex(text);
-  const binaryGeometry = WKBLoader.parseSync?.(uint8Array.buffer, options);
-  // @ts-expect-error
+  const binaryGeometry = convertWKBToGeometry(uint8Array.buffer); // , options?.wkb);
   return binaryGeometry;
 }
 
@@ -47,6 +46,7 @@ function parseHexWKB(text: string, options?: HexWKBLoaderOptions): BinaryGeometr
  *
  * @param str input string
  * @returns true if string is a valid WKB in HEX format
+ * @todo Avoid costly regex check
  */
 export function isHexWKB(string: string | null): boolean {
   if (!string) {

package/src/index.ts

@@ -15,13 +15,3 @@ export {HexWKBLoader} from './hex-wkb-loader';
 
 export {TWKBLoader} from './twkb-loader';
 export {TWKBWriter} from './twkb-writer';
-
-// EXPERIMENTAL APIs
-export {isWKT} from './lib/parse-wkt';
-
-export {isWKB, parseWKBHeader} from './lib/parse-wkb-header';
-export type {WKBHeader} from './lib/parse-wkb-header';
-
-export {isTWKB} from './lib/parse-twkb';
-
-export {encodeHex, decodeHex} from './lib/utils/hex-transcoder';

package/src/twkb-loader.ts

@@ -3,9 +3,9 @@
 // Copyright (c) vis.gl contributors
 
 import type {Loader, LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';
-import {BinaryGeometry, Geometry} from '@loaders.gl/schema';
-import {VERSION} from './lib/utils/version';
-import {parseTWKBGeometry, isTWKB} from './lib/parse-twkb';
+import type {BinaryGeometry, Geometry} from '@loaders.gl/schema';
+import {convertTWKBToGeometry, isTWKB} from '@loaders.gl/gis';
+import {VERSION} from './lib/version';
 
 export type WKBLoaderOptions = LoaderOptions & {
   wkb?: {
@@ -42,6 +42,6 @@ export const TWKBWorkerLoader = {
  */
 export const TWKBLoader = {
   ...TWKBWorkerLoader,
-  parse: async (arrayBuffer: ArrayBuffer) => parseTWKBGeometry(arrayBuffer),
-  parseSync: parseTWKBGeometry
+  parse: async (arrayBuffer: ArrayBuffer) => convertTWKBToGeometry(arrayBuffer),
+  parseSync: convertTWKBToGeometry
 } as const satisfies LoaderWithParser<BinaryGeometry | Geometry, never, WKBLoaderOptions>;

package/src/twkb-writer.ts

@@ -3,9 +3,9 @@
 // Copyright (c) vis.gl contributors
 
 import type {WriterWithEncoder, WriterOptions} from '@loaders.gl/loader-utils';
-import {VERSION} from './lib/utils/version';
-import {encodeTWKB} from './lib/encode-twkb';
-import {Geometry} from '@loaders.gl/schema';
+import type {Geometry} from '@loaders.gl/schema';
+import {convertGeometryToTWKB} from '@loaders.gl/gis';
+import {VERSION} from './lib/version';
 
 export type TWKBWriterOptions = WriterOptions & {
   twkb?: {
@@ -23,10 +23,11 @@ export const TWKBWriter = {
   module: 'wkt',
   version: VERSION,
   extensions: ['twkb'],
+  mimeTypes: ['application/text'],
   encode: async (geometry: Geometry, options?: TWKBWriterOptions) =>
-    encodeTWKB(geometry, options?.twkb),
+    convertGeometryToTWKB(geometry, options?.twkb),
   encodeSync: (geometry: Geometry, options?: TWKBWriterOptions) =>
-    encodeTWKB(geometry, options?.twkb),
+    convertGeometryToTWKB(geometry, options?.twkb),
   options: {
     twkb: {
       hasZ: false,

package/src/wkb-loader.ts

@@ -3,15 +3,14 @@
 // Copyright (c) vis.gl contributors
 
 import type {Loader, LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';
-import {BinaryGeometry, Geometry} from '@loaders.gl/schema';
-import {VERSION} from './lib/utils/version';
-import {parseWKB} from './lib/parse-wkb';
-import {isWKB} from './lib/parse-wkb-header';
+import type {Geometry} from '@loaders.gl/schema';
+import {convertWKBToGeometry, isWKB} from '@loaders.gl/gis';
+import {VERSION} from './lib/version';
 
 export type WKBLoaderOptions = LoaderOptions & {
   wkb?: {
-    /** 'geometry' is deprecated use 'geojson-geometry' */
-    shape: 'geojson-geometry' | 'binary-geometry' | 'geometry';
+    /** Shape is deprecated, only geojson is supported */
+    shape: 'geojson-geometry';
   };
 };
 
@@ -19,7 +18,7 @@ export type WKBLoaderOptions = LoaderOptions & {
  * Worker loader for WKB (Well-Known Binary)
  */
 export const WKBWorkerLoader = {
-  dataType: null as unknown as Geometry | BinaryGeometry,
+  dataType: null as unknown as Geometry,
   batchType: null as never,
   name: 'WKB',
   id: 'wkb',
@@ -33,16 +32,29 @@ export const WKBWorkerLoader = {
   tests: [isWKB],
   options: {
     wkb: {
-      shape: 'binary-geometry' // 'geojson-geometry'
+      shape: 'geojson-geometry'
     }
   }
-} as const satisfies Loader<Geometry | BinaryGeometry, never, WKBLoaderOptions>;
+} as const satisfies Loader<Geometry, never, WKBLoaderOptions>;
 
 /**
  * Loader for WKB (Well-Known Binary)
  */
 export const WKBLoader = {
   ...WKBWorkerLoader,
-  parse: async (arrayBuffer: ArrayBuffer) => parseWKB(arrayBuffer),
-  parseSync: parseWKB
-} as const satisfies LoaderWithParser<BinaryGeometry | Geometry, never, WKBLoaderOptions>;
+  parse: async (arrayBuffer: ArrayBuffer, options?) => parseWKB(arrayBuffer, options?.wkb),
+  parseSync: (arrayBuffer: ArrayBuffer, options?) => parseWKB(arrayBuffer, options?.wkb)
+} as const satisfies LoaderWithParser<Geometry, never, WKBLoaderOptions>;
+
+export function parseWKB(
+  arrayBuffer: ArrayBuffer,
+  options?: {shape?: 'geojson-geometry'}
+): Geometry {
+  const shape = options?.shape || 'geojson-geometry';
+  switch (shape) {
+    case 'geojson-geometry':
+      return convertWKBToGeometry(arrayBuffer);
+    default:
+      throw new Error(shape);
+  }
+}

package/src/wkb-writer.ts

@@ -3,9 +3,9 @@
 // Copyright (c) vis.gl contributors
 
 import type {WriterWithEncoder, WriterOptions} from '@loaders.gl/loader-utils';
-import {VERSION} from './lib/utils/version';
-import {encodeWKB} from './lib/encode-wkb';
 import type {Geometry, Feature} from '@loaders.gl/schema';
+import {convertGeometryToWKB} from '@loaders.gl/gis';
+import {VERSION} from './lib/version';
 
 export type WKBWriterOptions = WriterOptions & {
   wkb?: {
@@ -29,16 +29,17 @@ export const WKBWriter = {
   module: 'wkt',
   version: VERSION,
   extensions: ['wkb'],
+  mimeTypes: ['application/wkb', 'application/octet-stream'],
   options: {
     wkb: {
       hasZ: false,
       hasM: false
     }
   },
-  async encode(data: Geometry | Feature, options?: WriterOptions): Promise<ArrayBuffer> {
-    return encodeWKB(data, options?.wkb);
+  async encode(data: Geometry | Feature, options?: WKBWriterOptions): Promise<ArrayBuffer> {
+    return convertGeometryToWKB(data); // , options?.wkb);
   },
-  encodeSync(data: Geometry | Feature, options?: WriterOptions): ArrayBuffer {
-    return encodeWKB(data, options?.wkb);
+  encodeSync(data: Geometry | Feature, options?: WKBWriterOptions): ArrayBuffer {
+    return convertGeometryToWKB(data); // , options?.wkb);
   }
-} as const satisfies WriterWithEncoder<Geometry | Feature, never, WriterOptions>;
+} as const satisfies WriterWithEncoder<Geometry | Feature, never, WKBWriterOptions>;

package/src/wkt-crs-loader.ts

@@ -3,9 +3,9 @@
 // Copyright (c) vis.gl contributors
 
 import type {LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';
-import {VERSION} from './lib/utils/version';
-import type {ParseWKTCRSOptions, WKTCRS} from './lib/parse-wkt-crs';
-import {parseWKTCRS} from './lib/parse-wkt-crs';
+import type {ParseWKTCRSOptions, WKTCRS} from '@loaders.gl/gis';
+import {parseWKTCRS} from '@loaders.gl/gis';
+import {VERSION} from './lib/version';
 
 export type WKTCRSLoaderOptions = LoaderOptions & {
   'wkt-crs'?: ParseWKTCRSOptions;

package/src/wkt-crs-writer.ts

@@ -3,11 +3,9 @@
 // Copyright (c) vis.gl contributors
 
 import type {WriterWithEncoder, WriterOptions} from '@loaders.gl/loader-utils';
-import {VERSION} from './lib/utils/version';
-
-import type {WKTCRS} from './lib/parse-wkt-crs';
-import type {EncodeWKTCRSOptions} from './lib/encode-wkt-crs';
-import {encodeWKTCRS} from './lib/encode-wkt-crs';
+import type {WKTCRS, EncodeWKTCRSOptions} from '@loaders.gl/gis';
+import {encodeWKTCRS} from '@loaders.gl/gis';
+import {VERSION} from './lib/version';
 
 export type WKTCRSWriterOptions = WriterOptions & {
   'wkt-crs'?: EncodeWKTCRSOptions;

package/src/wkt-loader.ts

@@ -3,9 +3,9 @@
 // Copyright (c) vis.gl contributors
 
 import type {Loader, LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';
-import {VERSION} from './lib/utils/version';
-import {parseWKT, isWKT, WKT_MAGIC_STRINGS} from './lib/parse-wkt';
-import {Geometry} from '@loaders.gl/schema';
+import type {Geometry} from '@loaders.gl/schema';
+import {isWKT, WKT_MAGIC_STRINGS, convertWKTToGeometry} from '@loaders.gl/gis';
+import {VERSION} from './lib/version';
 
 export type WKTLoaderOptions = LoaderOptions & {
   /** Options for the WKTLoader */
@@ -50,6 +50,7 @@ export const WKTWorkerLoader = {
  */
 export const WKTLoader = {
   ...WKTWorkerLoader,
-  parse: async (arrayBuffer, options?) => parseWKT(new TextDecoder().decode(arrayBuffer), options),
-  parseTextSync: (string: string, options?) => parseWKT(string, options)
+  parse: async (arrayBuffer, options?) =>
+    convertWKTToGeometry(new TextDecoder().decode(arrayBuffer), options)!,
+  parseTextSync: (string: string, options?) => convertWKTToGeometry(string, options)!
 } as const satisfies LoaderWithParser<Geometry, never, WKTLoaderOptions>;

package/src/wkt-writer.ts

@@ -3,9 +3,9 @@
 // Copyright (c) vis.gl contributors
 
 import type {WriterWithEncoder, WriterOptions} from '@loaders.gl/loader-utils';
-import {VERSION} from './lib/utils/version';
-import {encodeWKT} from './lib/encode-wkt';
-import {Geometry} from '@loaders.gl/schema';
+import type {Geometry} from '@loaders.gl/schema';
+import {convertGeometryToWKT} from '@loaders.gl/gis';
+import {VERSION} from './lib/version';
 
 export type WKTWriterOptions = WriterOptions & {
   wkt?: {};
@@ -20,15 +20,18 @@ export const WKTWriter = {
   module: 'wkt',
   version: VERSION,
   extensions: ['wkt'],
+  mimeTypes: ['application/wkt', 'text/plain'],
   text: true,
-  encode: async (geometry: Geometry) => encodeWKTSync(geometry),
-  encodeSync: encodeWKTSync,
-  encodeTextSync: encodeWKT,
+  encode: async (geometry: Geometry) => convertGeometryToWKTSync(geometry),
+  encodeSync: convertGeometryToWKTSync,
+  encodeTextSync: convertGeometryToWKT,
   options: {
     wkt: {}
   }
 } as const satisfies WriterWithEncoder<Geometry, never, WKTWriterOptions>;
 
-function encodeWKTSync(geometry: Geometry): ArrayBuffer {
-  return new TextEncoder().encode(encodeWKT(geometry)).buffer;
+function convertGeometryToWKTSync(geometry: Geometry): ArrayBuffer {
+  const wktString = convertGeometryToWKT(geometry);
+  const wktTypedArray = new TextEncoder().encode(wktString);
+  return wktTypedArray.buffer;
 }

package/dist/lib/encode-twkb.d.ts

@@ -1,6 +0,0 @@
-import type { Geometry } from '@loaders.gl/schema';
-export declare function encodeTWKB(geometry: Geometry, options?: {
-    hasZ?: boolean;
-    hasM?: boolean;
-}): ArrayBuffer;
-//# sourceMappingURL=encode-twkb.d.ts.map

package/dist/lib/encode-twkb.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"encode-twkb.d.ts","sourceRoot":"","sources":["../../src/lib/encode-twkb.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAQV,QAAQ,EACT,MAAM,oBAAoB,CAAC;AAmB5B,wBAAgB,UAAU,CACxB,QAAQ,EAAE,QAAQ,EAClB,OAAO,CAAC,EAAE;IAAC,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAA;CAAC,GACzC,WAAW,CAab"}