@loaders.gl/kml 4.0.0-beta.5 → 4.0.0-beta.7

package/dist/dist.dev.js

@@ -5296,6 +5296,7 @@ var __exports__ = (() => {
   }
   function makeAccessorObjects(points, lines, polygons, coordLength) {
     const binaryFeatures = {
+      shape: "binary-feature-collection",
       points: {
         ...points,
         positions: {
@@ -6334,7 +6335,7 @@ var __exports__ = (() => {
   function parseTextSync(text, options) {
     const doc = new import_xmldom.DOMParser().parseFromString(text, "text/xml");
     const geojson = gpx(doc);
-    const shape = options?.gis?.format || options?.gpx?.type || options?.gpx?.shape;
+    const shape = options?.gpx?.shape;
     switch (shape) {
       case "object-row-table": {
         const table = {
@@ -6351,14 +6352,10 @@ var __exports__ = (() => {
         };
         return table;
       }
-      case "geojson":
-        return geojson;
       case "binary":
         return geojsonToBinary(geojson.features);
-      case "raw":
-        return doc;
       default:
-        return geojson;
+        throw new Error(shape);
     }
   }
 
@@ -6379,22 +6376,33 @@ var __exports__ = (() => {
     parse: async (arrayBuffer, options) => parseTextSync2(new TextDecoder().decode(arrayBuffer), options),
     parseTextSync: parseTextSync2,
     options: {
-      kml: {},
+      kml: {
+        shape: "geojson-table"
+      },
       gis: {}
     }
   };
   function parseTextSync2(text, options) {
     const doc = new import_xmldom2.DOMParser().parseFromString(text, "text/xml");
     const geojson = kml(doc);
-    const shape = options?.gis?.format || options?.kml?.type || options?.kml?.shape;
+    const shape = options?.kml?.shape || KMLLoader.options.kml?.shape;
     switch (shape) {
+      case "geojson-table": {
+        const table2 = {
+          shape: "geojson-table",
+          type: "FeatureCollection",
+          features: geojson.features
+        };
+        return table2;
+      }
       case "object-row-table":
-      default:
         const table = {
           shape: "object-row-table",
           data: geojson.features
         };
         return table;
+      default:
+        throw new Error(shape);
     }
   }
 
@@ -6422,7 +6430,7 @@ var __exports__ = (() => {
   function parseTextSync3(text, options) {
     const doc = new import_xmldom3.DOMParser().parseFromString(text, "text/xml");
     const geojson = tcx(doc);
-    const shape = options?.gis?.format || options?.tcx?.type || options?.tcx?.shape;
+    const shape = options?.tcx?.shape;
     switch (shape) {
       case "object-row-table": {
         const table = {
@@ -6439,14 +6447,10 @@ var __exports__ = (() => {
         };
         return table;
       }
-      case "geojson":
-        return geojson;
       case "binary":
         return geojsonToBinary(geojson.features);
-      case "raw":
-        return doc;
       default:
-        return geojson;
+        throw new Error(shape);
     }
   }
   return __toCommonJS(src_exports);

package/dist/gpx-loader.d.ts

@@ -1,17 +1,12 @@
 import type { LoaderOptions, LoaderWithParser } from '@loaders.gl/loader-utils';
+import type { GeoJSONTable, ObjectRowTable, BinaryFeatureCollection } from '@loaders.gl/schema';
 export type GPXLoaderOptions = LoaderOptions & {
     gpx?: {
-        shape?: 'object-row-table' | 'geojson-table' | 'geojson' | 'binary' | 'raw';
-        /** @deprecated. Use options.gpx.shape */
-        type?: 'object-row-table' | 'geojson-table' | 'geojson' | 'binary' | 'raw';
-    };
-    gis?: {
-        /** @deprecated. Use options.gpx.shape */
-        format?: 'object-row-table' | 'geojson-table' | 'geojson' | 'binary' | 'raw';
+        shape?: 'object-row-table' | 'geojson-table' | 'binary' | 'raw';
     };
 };
 /**
  * Loader for GPX (GPS exchange format)
  */
-export declare const GPXLoader: LoaderWithParser<any, never, GPXLoaderOptions>;
+export declare const GPXLoader: LoaderWithParser<ObjectRowTable | GeoJSONTable | BinaryFeatureCollection, never, GPXLoaderOptions>;
 //# sourceMappingURL=gpx-loader.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"gpx-loader.d.ts","sourceRoot":"","sources":["../src/gpx-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAU9E,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE;QACJ,KAAK,CAAC,EAAE,kBAAkB,GAAG,eAAe,GAAG,SAAS,GAAG,QAAQ,GAAG,KAAK,CAAC;QAC5E,yCAAyC;QACzC,IAAI,CAAC,EAAE,kBAAkB,GAAG,eAAe,GAAG,SAAS,GAAG,QAAQ,GAAG,KAAK,CAAC;KAC5E,CAAC;IACF,GAAG,CAAC,EAAE;QACJ,yCAAyC;QACzC,MAAM,CAAC,EAAE,kBAAkB,GAAG,eAAe,GAAG,SAAS,GAAG,QAAQ,GAAG,KAAK,CAAC;KAC9E,CAAC;CACH,CAAC;AAMF;;GAEG;AACH,eAAO,MAAM,SAAS,EAAE,gBAAgB,CAAC,GAAG,EAAE,KAAK,EAAE,gBAAgB,CAgBpE,CAAC"}
+{"version":3,"file":"gpx-loader.d.ts","sourceRoot":"","sources":["../src/gpx-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAE9E,OAAO,KAAK,EACV,YAAY,EAEZ,cAAc,EACd,uBAAuB,EACxB,MAAM,oBAAoB,CAAC;AAQ5B,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE;QACJ,KAAK,CAAC,EAAE,kBAAkB,GAAG,eAAe,GAAG,QAAQ,GAAG,KAAK,CAAC;KACjE,CAAC;CACH,CAAC;AAMF;;GAEG;AACH,eAAO,MAAM,SAAS,EAAE,gBAAgB,CACtC,cAAc,GAAG,YAAY,GAAG,uBAAuB,EACvD,KAAK,EACL,gBAAgB,CAiBjB,CAAC"}

package/dist/gpx-loader.js

@@ -22,10 +22,10 @@ export const GPXLoader = {
   }
 };
 function parseTextSync(text, options) {
-  var _options$gis, _options$gpx, _options$gpx2;
+  var _options$gpx;
   const doc = new DOMParser().parseFromString(text, 'text/xml');
   const geojson = gpx(doc);
-  const shape = (options === null || options === void 0 ? void 0 : (_options$gis = options.gis) === null || _options$gis === void 0 ? void 0 : _options$gis.format) || (options === null || options === void 0 ? void 0 : (_options$gpx = options.gpx) === null || _options$gpx === void 0 ? void 0 : _options$gpx.type) || (options === null || options === void 0 ? void 0 : (_options$gpx2 = options.gpx) === null || _options$gpx2 === void 0 ? void 0 : _options$gpx2.shape);
+  const shape = options === null || options === void 0 ? void 0 : (_options$gpx = options.gpx) === null || _options$gpx === void 0 ? void 0 : _options$gpx.shape;
   switch (shape) {
     case 'object-row-table':
       {
@@ -44,14 +44,10 @@ function parseTextSync(text, options) {
         };
         return table;
       }
-    case 'geojson':
-      return geojson;
     case 'binary':
       return geojsonToBinary(geojson.features);
-    case 'raw':
-      return doc;
     default:
-      return geojson;
+      throw new Error(shape);
   }
 }
 //# sourceMappingURL=gpx-loader.js.map

package/dist/gpx-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"gpx-loader.js","names":["geojsonToBinary","gpx","DOMParser","VERSION","__VERSION__","GPX_HEADER","GPXLoader","name","id","module","version","extensions","mimeTypes","text","tests","parse","arrayBuffer","options","parseTextSync","TextDecoder","decode","gis","_options$gis","_options$gpx","_options$gpx2","doc","parseFromString","geojson","shape","format","type","table","data","features"],"sources":["../src/gpx-loader.ts"],"sourcesContent":["import type {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';\nimport {geojsonToBinary} from '@loaders.gl/gis';\nimport type {GeoJSONTable, FeatureCollection, ObjectRowTable} from '@loaders.gl/schema';\nimport {gpx} from '@tmcw/togeojson';\nimport {DOMParser} from '@xmldom/xmldom';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\nexport type GPXLoaderOptions = LoaderOptions & {\n  gpx?: {\n    shape?: 'object-row-table' | 'geojson-table' | 'geojson' | 'binary' | 'raw';\n    /** @deprecated. Use options.gpx.shape */\n    type?: 'object-row-table' | 'geojson-table' | 'geojson' | 'binary' | 'raw';\n  };\n  gis?: {\n    /** @deprecated. Use options.gpx.shape */\n    format?: 'object-row-table' | 'geojson-table' | 'geojson' | 'binary' | 'raw';\n  };\n};\n\nconst GPX_HEADER = `\\\n<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<gpx`;\n\n/**\n * Loader for GPX (GPS exchange format)\n */\nexport const GPXLoader: LoaderWithParser<any, never, GPXLoaderOptions> = {\n  name: 'GPX (GPS exchange format)',\n  id: 'gpx',\n  module: 'kml',\n  version: VERSION,\n  extensions: ['gpx'],\n  mimeTypes: ['application/gpx+xml'],\n  text: true,\n  tests: [GPX_HEADER],\n  parse: async (arrayBuffer, options?: GPXLoaderOptions) =>\n    parseTextSync(new TextDecoder().decode(arrayBuffer), options),\n  parseTextSync,\n  options: {\n    gpx: {},\n    gis: {}\n  }\n};\n\nfunction parseTextSync(text: string, options?: GPXLoaderOptions) {\n  const doc = new DOMParser().parseFromString(text, 'text/xml');\n  const geojson: FeatureCollection = gpx(doc);\n\n  const shape = options?.gis?.format || options?.gpx?.type || options?.gpx?.shape;\n\n  switch (shape) {\n    case 'object-row-table': {\n      const table: ObjectRowTable = {\n        shape: 'object-row-table',\n        data: geojson.features\n      };\n      return table;\n    }\n    case 'geojson-table': {\n      const table: GeoJSONTable = {\n        shape: 'geojson-table',\n        type: 'FeatureCollection',\n        features: geojson.features\n      };\n      return table;\n    }\n    case 'geojson':\n      return geojson;\n    case 'binary':\n      return geojsonToBinary(geojson.features);\n    case 'raw':\n      return doc;\n    default:\n      // Default to geojson for backwards compatibility\n      return geojson;\n  }\n}\n"],"mappings":"AACA,SAAQA,eAAe,QAAO,iBAAiB;AAE/C,SAAQC,GAAG,QAAO,iBAAiB;AACnC,SAAQC,SAAS,QAAO,gBAAgB;AAIxC,MAAMC,OAAO,GAAG,OAAOC,WAAW,KAAK,WAAW,GAAGA,WAAW,GAAG,QAAQ;AAc3E,MAAMC,UAAU,GAAI;AACpB;AACA,KAAK;AAKL,OAAO,MAAMC,SAAyD,GAAG;EACvEC,IAAI,EAAE,2BAA2B;EACjCC,EAAE,EAAE,KAAK;EACTC,MAAM,EAAE,KAAK;EACbC,OAAO,EAAEP,OAAO;EAChBQ,UAAU,EAAE,CAAC,KAAK,CAAC;EACnBC,SAAS,EAAE,CAAC,qBAAqB,CAAC;EAClCC,IAAI,EAAE,IAAI;EACVC,KAAK,EAAE,CAACT,UAAU,CAAC;EACnBU,KAAK,EAAE,MAAAA,CAAOC,WAAW,EAAEC,OAA0B,KACnDC,aAAa,CAAC,IAAIC,WAAW,CAAC,CAAC,CAACC,MAAM,CAACJ,WAAW,CAAC,EAAEC,OAAO,CAAC;EAC/DC,aAAa;EACbD,OAAO,EAAE;IACPhB,GAAG,EAAE,CAAC,CAAC;IACPoB,GAAG,EAAE,CAAC;EACR;AACF,CAAC;AAED,SAASH,aAAaA,CAACL,IAAY,EAAEI,OAA0B,EAAE;EAAA,IAAAK,YAAA,EAAAC,YAAA,EAAAC,aAAA;EAC/D,MAAMC,GAAG,GAAG,IAAIvB,SAAS,CAAC,CAAC,CAACwB,eAAe,CAACb,IAAI,EAAE,UAAU,CAAC;EAC7D,MAAMc,OAA0B,GAAG1B,GAAG,CAACwB,GAAG,CAAC;EAE3C,MAAMG,KAAK,GAAG,CAAAX,OAAO,aAAPA,OAAO,wBAAAK,YAAA,GAAPL,OAAO,CAAEI,GAAG,cAAAC,YAAA,uBAAZA,YAAA,CAAcO,MAAM,MAAIZ,OAAO,aAAPA,OAAO,wBAAAM,YAAA,GAAPN,OAAO,CAAEhB,GAAG,cAAAsB,YAAA,uBAAZA,YAAA,CAAcO,IAAI,MAAIb,OAAO,aAAPA,OAAO,wBAAAO,aAAA,GAAPP,OAAO,CAAEhB,GAAG,cAAAuB,aAAA,uBAAZA,aAAA,CAAcI,KAAK;EAE/E,QAAQA,KAAK;IACX,KAAK,kBAAkB;MAAE;QACvB,MAAMG,KAAqB,GAAG;UAC5BH,KAAK,EAAE,kBAAkB;UACzBI,IAAI,EAAEL,OAAO,CAACM;QAChB,CAAC;QACD,OAAOF,KAAK;MACd;IACA,KAAK,eAAe;MAAE;QACpB,MAAMA,KAAmB,GAAG;UAC1BH,KAAK,EAAE,eAAe;UACtBE,IAAI,EAAE,mBAAmB;UACzBG,QAAQ,EAAEN,OAAO,CAACM;QACpB,CAAC;QACD,OAAOF,KAAK;MACd;IACA,KAAK,SAAS;MACZ,OAAOJ,OAAO;IAChB,KAAK,QAAQ;MACX,OAAO3B,eAAe,CAAC2B,OAAO,CAACM,QAAQ,CAAC;IAC1C,KAAK,KAAK;MACR,OAAOR,GAAG;IACZ;MAEE,OAAOE,OAAO;EAClB;AACF"}
+{"version":3,"file":"gpx-loader.js","names":["geojsonToBinary","gpx","DOMParser","VERSION","__VERSION__","GPX_HEADER","GPXLoader","name","id","module","version","extensions","mimeTypes","text","tests","parse","arrayBuffer","options","parseTextSync","TextDecoder","decode","gis","_options$gpx","doc","parseFromString","geojson","shape","table","data","features","type","Error"],"sources":["../src/gpx-loader.ts"],"sourcesContent":["import type {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';\nimport {geojsonToBinary} from '@loaders.gl/gis';\nimport type {\n  GeoJSONTable,\n  FeatureCollection,\n  ObjectRowTable,\n  BinaryFeatureCollection\n} from '@loaders.gl/schema';\nimport {gpx} from '@tmcw/togeojson';\nimport {DOMParser} from '@xmldom/xmldom';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\nexport type GPXLoaderOptions = LoaderOptions & {\n  gpx?: {\n    shape?: 'object-row-table' | 'geojson-table' | 'binary' | 'raw';\n  };\n};\n\nconst GPX_HEADER = `\\\n<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<gpx`;\n\n/**\n * Loader for GPX (GPS exchange format)\n */\nexport const GPXLoader: LoaderWithParser<\n  ObjectRowTable | GeoJSONTable | BinaryFeatureCollection,\n  never,\n  GPXLoaderOptions\n> = {\n  name: 'GPX (GPS exchange format)',\n  id: 'gpx',\n  module: 'kml',\n  version: VERSION,\n  extensions: ['gpx'],\n  mimeTypes: ['application/gpx+xml'],\n  text: true,\n  tests: [GPX_HEADER],\n  parse: async (arrayBuffer, options?: GPXLoaderOptions) =>\n    parseTextSync(new TextDecoder().decode(arrayBuffer), options),\n  parseTextSync,\n  options: {\n    gpx: {},\n    gis: {}\n  }\n};\n\nfunction parseTextSync(\n  text: string,\n  options?: GPXLoaderOptions\n): ObjectRowTable | GeoJSONTable | BinaryFeatureCollection {\n  const doc = new DOMParser().parseFromString(text, 'text/xml');\n  const geojson: FeatureCollection = gpx(doc);\n\n  const shape = options?.gpx?.shape;\n\n  switch (shape) {\n    case 'object-row-table': {\n      const table: ObjectRowTable = {\n        shape: 'object-row-table',\n        data: geojson.features\n      };\n      return table;\n    }\n    case 'geojson-table': {\n      const table: GeoJSONTable = {\n        shape: 'geojson-table',\n        type: 'FeatureCollection',\n        features: geojson.features\n      };\n      return table;\n    }\n    case 'binary':\n      return geojsonToBinary(geojson.features);\n\n    default:\n      throw new Error(shape);\n  }\n}\n"],"mappings":"AACA,SAAQA,eAAe,QAAO,iBAAiB;AAO/C,SAAQC,GAAG,QAAO,iBAAiB;AACnC,SAAQC,SAAS,QAAO,gBAAgB;AAIxC,MAAMC,OAAO,GAAG,OAAOC,WAAW,KAAK,WAAW,GAAGA,WAAW,GAAG,QAAQ;AAQ3E,MAAMC,UAAU,GAAI;AACpB;AACA,KAAK;AAKL,OAAO,MAAMC,SAIZ,GAAG;EACFC,IAAI,EAAE,2BAA2B;EACjCC,EAAE,EAAE,KAAK;EACTC,MAAM,EAAE,KAAK;EACbC,OAAO,EAAEP,OAAO;EAChBQ,UAAU,EAAE,CAAC,KAAK,CAAC;EACnBC,SAAS,EAAE,CAAC,qBAAqB,CAAC;EAClCC,IAAI,EAAE,IAAI;EACVC,KAAK,EAAE,CAACT,UAAU,CAAC;EACnBU,KAAK,EAAE,MAAAA,CAAOC,WAAW,EAAEC,OAA0B,KACnDC,aAAa,CAAC,IAAIC,WAAW,CAAC,CAAC,CAACC,MAAM,CAACJ,WAAW,CAAC,EAAEC,OAAO,CAAC;EAC/DC,aAAa;EACbD,OAAO,EAAE;IACPhB,GAAG,EAAE,CAAC,CAAC;IACPoB,GAAG,EAAE,CAAC;EACR;AACF,CAAC;AAED,SAASH,aAAaA,CACpBL,IAAY,EACZI,OAA0B,EAC+B;EAAA,IAAAK,YAAA;EACzD,MAAMC,GAAG,GAAG,IAAIrB,SAAS,CAAC,CAAC,CAACsB,eAAe,CAACX,IAAI,EAAE,UAAU,CAAC;EAC7D,MAAMY,OAA0B,GAAGxB,GAAG,CAACsB,GAAG,CAAC;EAE3C,MAAMG,KAAK,GAAGT,OAAO,aAAPA,OAAO,wBAAAK,YAAA,GAAPL,OAAO,CAAEhB,GAAG,cAAAqB,YAAA,uBAAZA,YAAA,CAAcI,KAAK;EAEjC,QAAQA,KAAK;IACX,KAAK,kBAAkB;MAAE;QACvB,MAAMC,KAAqB,GAAG;UAC5BD,KAAK,EAAE,kBAAkB;UACzBE,IAAI,EAAEH,OAAO,CAACI;QAChB,CAAC;QACD,OAAOF,KAAK;MACd;IACA,KAAK,eAAe;MAAE;QACpB,MAAMA,KAAmB,GAAG;UAC1BD,KAAK,EAAE,eAAe;UACtBI,IAAI,EAAE,mBAAmB;UACzBD,QAAQ,EAAEJ,OAAO,CAACI;QACpB,CAAC;QACD,OAAOF,KAAK;MACd;IACA,KAAK,QAAQ;MACX,OAAO3B,eAAe,CAACyB,OAAO,CAACI,QAAQ,CAAC;IAE1C;MACE,MAAM,IAAIE,KAAK,CAACL,KAAK,CAAC;EAC1B;AACF"}

package/dist/index.cjs

@@ -50,10 +50,10 @@ var GPXLoader = {
   }
 };
 function parseTextSync(text, options) {
-  var _a, _b, _c;
+  var _a;
   const doc = new import_xmldom.DOMParser().parseFromString(text, "text/xml");
   const geojson = (0, import_togeojson.gpx)(doc);
-  const shape = ((_a = options == null ? void 0 : options.gis) == null ? void 0 : _a.format) || ((_b = options == null ? void 0 : options.gpx) == null ? void 0 : _b.type) || ((_c = options == null ? void 0 : options.gpx) == null ? void 0 : _c.shape);
+  const shape = (_a = options == null ? void 0 : options.gpx) == null ? void 0 : _a.shape;
   switch (shape) {
     case "object-row-table": {
       const table = {
@@ -70,14 +70,10 @@ function parseTextSync(text, options) {
       };
       return table;
     }
-    case "geojson":
-      return geojson;
     case "binary":
       return (0, import_gis.geojsonToBinary)(geojson.features);
-    case "raw":
-      return doc;
     default:
-      return geojson;
+      throw new Error(shape);
   }
 }
 
@@ -99,23 +95,32 @@ var KMLLoader = {
   parse: async (arrayBuffer, options) => parseTextSync2(new TextDecoder().decode(arrayBuffer), options),
   parseTextSync: parseTextSync2,
   options: {
-    kml: {},
+    kml: { shape: "geojson-table" },
     gis: {}
   }
 };
 function parseTextSync2(text, options) {
-  var _a, _b, _c;
+  var _a, _b;
   const doc = new import_xmldom2.DOMParser().parseFromString(text, "text/xml");
   const geojson = (0, import_togeojson2.kml)(doc);
-  const shape = ((_a = options == null ? void 0 : options.gis) == null ? void 0 : _a.format) || ((_b = options == null ? void 0 : options.kml) == null ? void 0 : _b.type) || ((_c = options == null ? void 0 : options.kml) == null ? void 0 : _c.shape);
+  const shape = ((_a = options == null ? void 0 : options.kml) == null ? void 0 : _a.shape) || ((_b = KMLLoader.options.kml) == null ? void 0 : _b.shape);
   switch (shape) {
+    case "geojson-table": {
+      const table2 = {
+        shape: "geojson-table",
+        type: "FeatureCollection",
+        features: geojson.features
+      };
+      return table2;
+    }
     case "object-row-table":
-    default:
       const table = {
         shape: "object-row-table",
         data: geojson.features
       };
       return table;
+    default:
+      throw new Error(shape);
   }
 }
 
@@ -143,10 +148,10 @@ var TCXLoader = {
   }
 };
 function parseTextSync3(text, options) {
-  var _a, _b, _c;
+  var _a;
   const doc = new import_xmldom3.DOMParser().parseFromString(text, "text/xml");
   const geojson = (0, import_togeojson3.tcx)(doc);
-  const shape = ((_a = options == null ? void 0 : options.gis) == null ? void 0 : _a.format) || ((_b = options == null ? void 0 : options.tcx) == null ? void 0 : _b.type) || ((_c = options == null ? void 0 : options.tcx) == null ? void 0 : _c.shape);
+  const shape = (_a = options == null ? void 0 : options.tcx) == null ? void 0 : _a.shape;
   switch (shape) {
     case "object-row-table": {
       const table = {
@@ -163,13 +168,9 @@ function parseTextSync3(text, options) {
       };
       return table;
     }
-    case "geojson":
-      return geojson;
     case "binary":
       return (0, import_gis2.geojsonToBinary)(geojson.features);
-    case "raw":
-      return doc;
     default:
-      return geojson;
+      throw new Error(shape);
   }
 }

package/dist/kml-loader.d.ts

@@ -1,18 +1,12 @@
 import type { LoaderWithParser, LoaderOptions } from '@loaders.gl/loader-utils';
-import { ObjectRowTable } from '@loaders.gl/schema';
+import { GeoJSONTable, ObjectRowTable } from '@loaders.gl/schema';
 export type KMLLoaderOptions = LoaderOptions & {
     kml?: {
-        shape?: 'object-row-table' | 'geojson-table';
-        /** @deprecated. Use options.kml.shape */
-        type?: 'object-row-table' | 'geojson-table';
-    };
-    gis?: {
-        /** @deprecated. Use options.kml.shape */
-        format?: 'object-row-table' | 'geojson-table' | 'geojson' | 'binary' | 'raw';
+        shape?: 'object-row-table' | 'geojson-table' | 'binary' | 'raw';
     };
 };
 /**
  * Loader for KML (Keyhole Markup Language)
  */
-export declare const KMLLoader: LoaderWithParser<ObjectRowTable, never, KMLLoaderOptions>;
+export declare const KMLLoader: LoaderWithParser<ObjectRowTable | GeoJSONTable, never, KMLLoaderOptions>;
 //# sourceMappingURL=kml-loader.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"kml-loader.d.ts","sourceRoot":"","sources":["../src/kml-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAG9E,OAAO,EAAoB,cAAc,EAAC,MAAM,oBAAoB,CAAC;AAQrE,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE;QACJ,KAAK,CAAC,EAAE,kBAAkB,GAAG,eAAe,CAAC;QAC7C,yCAAyC;QACzC,IAAI,CAAC,EAAE,kBAAkB,GAAG,eAAe,CAAC;KAC7C,CAAC;IACF,GAAG,CAAC,EAAE;QACJ,yCAAyC;QACzC,MAAM,CAAC,EAAE,kBAAkB,GAAG,eAAe,GAAG,SAAS,GAAG,QAAQ,GAAG,KAAK,CAAC;KAC9E,CAAC;CACH,CAAC;AAMF;;GAEG;AACH,eAAO,MAAM,SAAS,EAAE,gBAAgB,CAAC,cAAc,EAAE,KAAK,EAAE,gBAAgB,CAgB/E,CAAC"}
+{"version":3,"file":"kml-loader.d.ts","sourceRoot":"","sources":["../src/kml-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAG9E,OAAO,EAAoB,YAAY,EAAE,cAAc,EAAC,MAAM,oBAAoB,CAAC;AAQnF,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE;QACJ,KAAK,CAAC,EAAE,kBAAkB,GAAG,eAAe,GAAG,QAAQ,GAAG,KAAK,CAAC;KACjE,CAAC;CACH,CAAC;AAMF;;GAEG;AACH,eAAO,MAAM,SAAS,EAAE,gBAAgB,CAAC,cAAc,GAAG,YAAY,EAAE,KAAK,EAAE,gBAAgB,CAgB9F,CAAC"}

package/dist/kml-loader.js

@@ -16,23 +16,35 @@ export const KMLLoader = {
   parse: async (arrayBuffer, options) => parseTextSync(new TextDecoder().decode(arrayBuffer), options),
   parseTextSync,
   options: {
-    kml: {},
+    kml: {
+      shape: 'geojson-table'
+    },
     gis: {}
   }
 };
 function parseTextSync(text, options) {
-  var _options$gis, _options$kml, _options$kml2;
+  var _options$kml, _KMLLoader$options$km;
   const doc = new DOMParser().parseFromString(text, 'text/xml');
   const geojson = kml(doc);
-  const shape = (options === null || options === void 0 ? void 0 : (_options$gis = options.gis) === null || _options$gis === void 0 ? void 0 : _options$gis.format) || (options === null || options === void 0 ? void 0 : (_options$kml = options.kml) === null || _options$kml === void 0 ? void 0 : _options$kml.type) || (options === null || options === void 0 ? void 0 : (_options$kml2 = options.kml) === null || _options$kml2 === void 0 ? void 0 : _options$kml2.shape);
+  const shape = (options === null || options === void 0 ? void 0 : (_options$kml = options.kml) === null || _options$kml === void 0 ? void 0 : _options$kml.shape) || ((_KMLLoader$options$km = KMLLoader.options.kml) === null || _KMLLoader$options$km === void 0 ? void 0 : _KMLLoader$options$km.shape);
   switch (shape) {
+    case 'geojson-table':
+      {
+        const table = {
+          shape: 'geojson-table',
+          type: 'FeatureCollection',
+          features: geojson.features
+        };
+        return table;
+      }
     case 'object-row-table':
-    default:
       const table = {
         shape: 'object-row-table',
         data: geojson.features
       };
       return table;
+    default:
+      throw new Error(shape);
   }
 }
 //# sourceMappingURL=kml-loader.js.map

package/dist/kml-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"kml-loader.js","names":["kml","DOMParser","VERSION","__VERSION__","KML_HEADER","KMLLoader","name","id","module","version","extensions","mimeTypes","text","tests","parse","arrayBuffer","options","parseTextSync","TextDecoder","decode","gis","_options$gis","_options$kml","_options$kml2","doc","parseFromString","geojson","shape","format","type","table","data","features"],"sources":["../src/kml-loader.ts"],"sourcesContent":["import type {LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';\n// import {geojsonToBinary} from '@loaders.gl/gis';\n// import {GeoJSONTable} from '@loaders.gl/schema';\nimport {FeatureCollection, ObjectRowTable} from '@loaders.gl/schema';\nimport {kml} from '@tmcw/togeojson';\nimport {DOMParser} from '@xmldom/xmldom';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\nexport type KMLLoaderOptions = LoaderOptions & {\n  kml?: {\n    shape?: 'object-row-table' | 'geojson-table';\n    /** @deprecated. Use options.kml.shape */\n    type?: 'object-row-table' | 'geojson-table';\n  };\n  gis?: {\n    /** @deprecated. Use options.kml.shape */\n    format?: 'object-row-table' | 'geojson-table' | 'geojson' | 'binary' | 'raw';\n  };\n};\n\nconst KML_HEADER = `\\\n<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<kml xmlns=\"http://www.opengis.net/kml/2.2\">`;\n\n/**\n * Loader for KML (Keyhole Markup Language)\n */\nexport const KMLLoader: LoaderWithParser<ObjectRowTable, never, KMLLoaderOptions> = {\n  name: 'KML (Keyhole Markup Language)',\n  id: 'kml',\n  module: 'kml',\n  version: VERSION,\n  extensions: ['kml'],\n  mimeTypes: ['application/vnd.google-earth.kml+xml'],\n  text: true,\n  tests: [KML_HEADER],\n  parse: async (arrayBuffer, options?: KMLLoaderOptions) =>\n    parseTextSync(new TextDecoder().decode(arrayBuffer), options),\n  parseTextSync,\n  options: {\n    kml: {},\n    gis: {}\n  }\n};\n\nfunction parseTextSync(text: string, options?: KMLLoaderOptions): ObjectRowTable {\n  const doc = new DOMParser().parseFromString(text, 'text/xml');\n  const geojson: FeatureCollection = kml(doc);\n\n  // backwards compatibility\n  const shape = options?.gis?.format || options?.kml?.type || options?.kml?.shape;\n  switch (shape) {\n    // case 'geojson-table': {\n    //   const table: GeoJSONTable = {\n    //     shape: 'geojson-table',\n    //     data: geojson.features\n    //   };\n    //   return table;\n    // }\n    // case 'geojson':\n    //   return geojson;\n    // case 'binary':\n    //   return geojsonToBinary(geojson.features);\n    // case 'raw':\n    //   return doc;\n    case 'object-row-table':\n    default:\n      const table: ObjectRowTable = {\n        shape: 'object-row-table',\n        data: geojson.features\n      };\n      return table;\n  }\n}\n"],"mappings":"AAIA,SAAQA,GAAG,QAAO,iBAAiB;AACnC,SAAQC,SAAS,QAAO,gBAAgB;AAIxC,MAAMC,OAAO,GAAG,OAAOC,WAAW,KAAK,WAAW,GAAGA,WAAW,GAAG,QAAQ;AAc3E,MAAMC,UAAU,GAAI;AACpB;AACA,6CAA6C;AAK7C,OAAO,MAAMC,SAAoE,GAAG;EAClFC,IAAI,EAAE,+BAA+B;EACrCC,EAAE,EAAE,KAAK;EACTC,MAAM,EAAE,KAAK;EACbC,OAAO,EAAEP,OAAO;EAChBQ,UAAU,EAAE,CAAC,KAAK,CAAC;EACnBC,SAAS,EAAE,CAAC,sCAAsC,CAAC;EACnDC,IAAI,EAAE,IAAI;EACVC,KAAK,EAAE,CAACT,UAAU,CAAC;EACnBU,KAAK,EAAE,MAAAA,CAAOC,WAAW,EAAEC,OAA0B,KACnDC,aAAa,CAAC,IAAIC,WAAW,CAAC,CAAC,CAACC,MAAM,CAACJ,WAAW,CAAC,EAAEC,OAAO,CAAC;EAC/DC,aAAa;EACbD,OAAO,EAAE;IACPhB,GAAG,EAAE,CAAC,CAAC;IACPoB,GAAG,EAAE,CAAC;EACR;AACF,CAAC;AAED,SAASH,aAAaA,CAACL,IAAY,EAAEI,OAA0B,EAAkB;EAAA,IAAAK,YAAA,EAAAC,YAAA,EAAAC,aAAA;EAC/E,MAAMC,GAAG,GAAG,IAAIvB,SAAS,CAAC,CAAC,CAACwB,eAAe,CAACb,IAAI,EAAE,UAAU,CAAC;EAC7D,MAAMc,OAA0B,GAAG1B,GAAG,CAACwB,GAAG,CAAC;EAG3C,MAAMG,KAAK,GAAG,CAAAX,OAAO,aAAPA,OAAO,wBAAAK,YAAA,GAAPL,OAAO,CAAEI,GAAG,cAAAC,YAAA,uBAAZA,YAAA,CAAcO,MAAM,MAAIZ,OAAO,aAAPA,OAAO,wBAAAM,YAAA,GAAPN,OAAO,CAAEhB,GAAG,cAAAsB,YAAA,uBAAZA,YAAA,CAAcO,IAAI,MAAIb,OAAO,aAAPA,OAAO,wBAAAO,aAAA,GAAPP,OAAO,CAAEhB,GAAG,cAAAuB,aAAA,uBAAZA,aAAA,CAAcI,KAAK;EAC/E,QAAQA,KAAK;IAcX,KAAK,kBAAkB;IACvB;MACE,MAAMG,KAAqB,GAAG;QAC5BH,KAAK,EAAE,kBAAkB;QACzBI,IAAI,EAAEL,OAAO,CAACM;MAChB,CAAC;MACD,OAAOF,KAAK;EAChB;AACF"}
+{"version":3,"file":"kml-loader.js","names":["kml","DOMParser","VERSION","__VERSION__","KML_HEADER","KMLLoader","name","id","module","version","extensions","mimeTypes","text","tests","parse","arrayBuffer","options","parseTextSync","TextDecoder","decode","shape","gis","_options$kml","_KMLLoader$options$km","doc","parseFromString","geojson","table","type","features","data","Error"],"sources":["../src/kml-loader.ts"],"sourcesContent":["import type {LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';\n// import {geojsonToBinary} from '@loaders.gl/gis';\n// import {GeoJSONTable} from '@loaders.gl/schema';\nimport {FeatureCollection, GeoJSONTable, ObjectRowTable} from '@loaders.gl/schema';\nimport {kml} from '@tmcw/togeojson';\nimport {DOMParser} from '@xmldom/xmldom';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\nexport type KMLLoaderOptions = LoaderOptions & {\n  kml?: {\n    shape?: 'object-row-table' | 'geojson-table' | 'binary' | 'raw';\n  };\n};\n\nconst KML_HEADER = `\\\n<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<kml xmlns=\"http://www.opengis.net/kml/2.2\">`;\n\n/**\n * Loader for KML (Keyhole Markup Language)\n */\nexport const KMLLoader: LoaderWithParser<ObjectRowTable | GeoJSONTable, never, KMLLoaderOptions> = {\n  name: 'KML (Keyhole Markup Language)',\n  id: 'kml',\n  module: 'kml',\n  version: VERSION,\n  extensions: ['kml'],\n  mimeTypes: ['application/vnd.google-earth.kml+xml'],\n  text: true,\n  tests: [KML_HEADER],\n  parse: async (arrayBuffer, options?: KMLLoaderOptions) =>\n    parseTextSync(new TextDecoder().decode(arrayBuffer), options),\n  parseTextSync,\n  options: {\n    kml: {shape: 'geojson-table'},\n    gis: {}\n  }\n};\n\nfunction parseTextSync(text: string, options?: KMLLoaderOptions): ObjectRowTable | GeoJSONTable {\n  const doc = new DOMParser().parseFromString(text, 'text/xml');\n  const geojson: FeatureCollection = kml(doc);\n\n  // backwards compatibility\n  const shape = options?.kml?.shape || KMLLoader.options.kml?.shape;\n  switch (shape) {\n    case 'geojson-table': {\n      const table: GeoJSONTable = {\n        shape: 'geojson-table',\n        type: 'FeatureCollection',\n        features: geojson.features\n      };\n      return table;\n    }\n    // case 'geojson':\n    //   return geojson;\n    // case 'binary':\n    //   return geojsonToBinary(geojson.features);\n    // case 'raw':\n    //   return doc;\n    case 'object-row-table':\n      const table: ObjectRowTable = {\n        shape: 'object-row-table',\n        data: geojson.features\n      };\n      return table;\n    default:\n      throw new Error(shape);\n  }\n}\n"],"mappings":"AAIA,SAAQA,GAAG,QAAO,iBAAiB;AACnC,SAAQC,SAAS,QAAO,gBAAgB;AAIxC,MAAMC,OAAO,GAAG,OAAOC,WAAW,KAAK,WAAW,GAAGA,WAAW,GAAG,QAAQ;AAQ3E,MAAMC,UAAU,GAAI;AACpB;AACA,6CAA6C;AAK7C,OAAO,MAAMC,SAAmF,GAAG;EACjGC,IAAI,EAAE,+BAA+B;EACrCC,EAAE,EAAE,KAAK;EACTC,MAAM,EAAE,KAAK;EACbC,OAAO,EAAEP,OAAO;EAChBQ,UAAU,EAAE,CAAC,KAAK,CAAC;EACnBC,SAAS,EAAE,CAAC,sCAAsC,CAAC;EACnDC,IAAI,EAAE,IAAI;EACVC,KAAK,EAAE,CAACT,UAAU,CAAC;EACnBU,KAAK,EAAE,MAAAA,CAAOC,WAAW,EAAEC,OAA0B,KACnDC,aAAa,CAAC,IAAIC,WAAW,CAAC,CAAC,CAACC,MAAM,CAACJ,WAAW,CAAC,EAAEC,OAAO,CAAC;EAC/DC,aAAa;EACbD,OAAO,EAAE;IACPhB,GAAG,EAAE;MAACoB,KAAK,EAAE;IAAe,CAAC;IAC7BC,GAAG,EAAE,CAAC;EACR;AACF,CAAC;AAED,SAASJ,aAAaA,CAACL,IAAY,EAAEI,OAA0B,EAAiC;EAAA,IAAAM,YAAA,EAAAC,qBAAA;EAC9F,MAAMC,GAAG,GAAG,IAAIvB,SAAS,CAAC,CAAC,CAACwB,eAAe,CAACb,IAAI,EAAE,UAAU,CAAC;EAC7D,MAAMc,OAA0B,GAAG1B,GAAG,CAACwB,GAAG,CAAC;EAG3C,MAAMJ,KAAK,GAAG,CAAAJ,OAAO,aAAPA,OAAO,wBAAAM,YAAA,GAAPN,OAAO,CAAEhB,GAAG,cAAAsB,YAAA,uBAAZA,YAAA,CAAcF,KAAK,OAAAG,qBAAA,GAAIlB,SAAS,CAACW,OAAO,CAAChB,GAAG,cAAAuB,qBAAA,uBAArBA,qBAAA,CAAuBH,KAAK;EACjE,QAAQA,KAAK;IACX,KAAK,eAAe;MAAE;QACpB,MAAMO,KAAmB,GAAG;UAC1BP,KAAK,EAAE,eAAe;UACtBQ,IAAI,EAAE,mBAAmB;UACzBC,QAAQ,EAAEH,OAAO,CAACG;QACpB,CAAC;QACD,OAAOF,KAAK;MACd;IAOA,KAAK,kBAAkB;MACrB,MAAMA,KAAqB,GAAG;QAC5BP,KAAK,EAAE,kBAAkB;QACzBU,IAAI,EAAEJ,OAAO,CAACG;MAChB,CAAC;MACD,OAAOF,KAAK;IACd;MACE,MAAM,IAAII,KAAK,CAACX,KAAK,CAAC;EAC1B;AACF"}

package/dist/tcx-loader.d.ts

@@ -1,17 +1,12 @@
 import type { LoaderWithParser, LoaderOptions } from '@loaders.gl/loader-utils';
+import type { GeoJSONTable, ObjectRowTable, BinaryFeatureCollection } from '@loaders.gl/schema';
 export type TCXLoaderOptions = LoaderOptions & {
     tcx?: {
-        shape?: 'object-row-table' | 'geojson-table' | 'geojson' | 'binary' | 'raw';
-        /** @deprecated. Use options.tcx.shape */
-        type?: 'object-row-table' | 'geojson-table' | 'geojson' | 'binary' | 'raw';
-    };
-    gis?: {
-        /** @deprecated. Use options.tcx.shape */
-        format?: 'object-row-table' | 'geojson-table' | 'geojson' | 'binary' | 'raw';
+        shape?: 'object-row-table' | 'geojson-table' | 'binary' | 'raw';
     };
 };
 /**
  * Loader for TCX (Training Center XML) - Garmin GPS track format
  */
-export declare const TCXLoader: LoaderWithParser<any, never, TCXLoaderOptions>;
+export declare const TCXLoader: LoaderWithParser<ObjectRowTable | GeoJSONTable | BinaryFeatureCollection, never, TCXLoaderOptions>;
 //# sourceMappingURL=tcx-loader.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"tcx-loader.d.ts","sourceRoot":"","sources":["../src/tcx-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAU9E,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE;QACJ,KAAK,CAAC,EAAE,kBAAkB,GAAG,eAAe,GAAG,SAAS,GAAG,QAAQ,GAAG,KAAK,CAAC;QAC5E,yCAAyC;QACzC,IAAI,CAAC,EAAE,kBAAkB,GAAG,eAAe,GAAG,SAAS,GAAG,QAAQ,GAAG,KAAK,CAAC;KAC5E,CAAC;IACF,GAAG,CAAC,EAAE;QACJ,yCAAyC;QACzC,MAAM,CAAC,EAAE,kBAAkB,GAAG,eAAe,GAAG,SAAS,GAAG,QAAQ,GAAG,KAAK,CAAC;KAC9E,CAAC;CACH,CAAC;AAMF;;GAEG;AACH,eAAO,MAAM,SAAS,EAAE,gBAAgB,CAAC,GAAG,EAAE,KAAK,EAAE,gBAAgB,CAgBpE,CAAC"}
+{"version":3,"file":"tcx-loader.d.ts","sourceRoot":"","sources":["../src/tcx-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAE9E,OAAO,KAAK,EACV,YAAY,EAEZ,cAAc,EACd,uBAAuB,EACxB,MAAM,oBAAoB,CAAC;AAQ5B,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE;QACJ,KAAK,CAAC,EAAE,kBAAkB,GAAG,eAAe,GAAG,QAAQ,GAAG,KAAK,CAAC;KACjE,CAAC;CACH,CAAC;AAMF;;GAEG;AACH,eAAO,MAAM,SAAS,EAAE,gBAAgB,CACtC,cAAc,GAAG,YAAY,GAAG,uBAAuB,EACvD,KAAK,EACL,gBAAgB,CAiBjB,CAAC"}

package/dist/tcx-loader.js

@@ -22,10 +22,10 @@ export const TCXLoader = {
   }
 };
 function parseTextSync(text, options) {
-  var _options$gis, _options$tcx, _options$tcx2;
+  var _options$tcx;
   const doc = new DOMParser().parseFromString(text, 'text/xml');
   const geojson = tcx(doc);
-  const shape = (options === null || options === void 0 ? void 0 : (_options$gis = options.gis) === null || _options$gis === void 0 ? void 0 : _options$gis.format) || (options === null || options === void 0 ? void 0 : (_options$tcx = options.tcx) === null || _options$tcx === void 0 ? void 0 : _options$tcx.type) || (options === null || options === void 0 ? void 0 : (_options$tcx2 = options.tcx) === null || _options$tcx2 === void 0 ? void 0 : _options$tcx2.shape);
+  const shape = options === null || options === void 0 ? void 0 : (_options$tcx = options.tcx) === null || _options$tcx === void 0 ? void 0 : _options$tcx.shape;
   switch (shape) {
     case 'object-row-table':
       {
@@ -44,14 +44,10 @@ function parseTextSync(text, options) {
         };
         return table;
       }
-    case 'geojson':
-      return geojson;
     case 'binary':
       return geojsonToBinary(geojson.features);
-    case 'raw':
-      return doc;
     default:
-      return geojson;
+      throw new Error(shape);
   }
 }
 //# sourceMappingURL=tcx-loader.js.map

package/dist/tcx-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"tcx-loader.js","names":["geojsonToBinary","tcx","DOMParser","VERSION","__VERSION__","TCX_HEADER","TCXLoader","name","id","module","version","extensions","mimeTypes","text","tests","parse","arrayBuffer","options","parseTextSync","TextDecoder","decode","gis","_options$gis","_options$tcx","_options$tcx2","doc","parseFromString","geojson","shape","format","type","table","data","features"],"sources":["../src/tcx-loader.ts"],"sourcesContent":["import type {LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';\nimport {geojsonToBinary} from '@loaders.gl/gis';\nimport type {GeoJSONTable, FeatureCollection, ObjectRowTable} from '@loaders.gl/schema';\nimport {tcx} from '@tmcw/togeojson';\nimport {DOMParser} from '@xmldom/xmldom';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\nexport type TCXLoaderOptions = LoaderOptions & {\n  tcx?: {\n    shape?: 'object-row-table' | 'geojson-table' | 'geojson' | 'binary' | 'raw';\n    /** @deprecated. Use options.tcx.shape */\n    type?: 'object-row-table' | 'geojson-table' | 'geojson' | 'binary' | 'raw';\n  };\n  gis?: {\n    /** @deprecated. Use options.tcx.shape */\n    format?: 'object-row-table' | 'geojson-table' | 'geojson' | 'binary' | 'raw';\n  };\n};\n\nconst TCX_HEADER = `\\\n<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<TrainingCenterDatabase`;\n\n/**\n * Loader for TCX (Training Center XML) - Garmin GPS track format\n */\nexport const TCXLoader: LoaderWithParser<any, never, TCXLoaderOptions> = {\n  name: 'TCX (Training Center XML)',\n  id: 'tcx',\n  module: 'kml',\n  version: VERSION,\n  extensions: ['tcx'],\n  mimeTypes: ['application/vnd.garmin.tcx+xml'],\n  text: true,\n  tests: [TCX_HEADER],\n  parse: async (arrayBuffer, options?: TCXLoaderOptions) =>\n    parseTextSync(new TextDecoder().decode(arrayBuffer), options),\n  parseTextSync,\n  options: {\n    tcx: {},\n    gis: {}\n  }\n};\n\nfunction parseTextSync(text: string, options?: TCXLoaderOptions) {\n  const doc = new DOMParser().parseFromString(text, 'text/xml');\n  const geojson: FeatureCollection = tcx(doc);\n\n  // backwards compatibility\n  const shape = options?.gis?.format || options?.tcx?.type || options?.tcx?.shape;\n\n  switch (shape) {\n    case 'object-row-table': {\n      const table: ObjectRowTable = {\n        shape: 'object-row-table',\n        data: geojson.features\n      };\n      return table;\n    }\n    case 'geojson-table': {\n      const table: GeoJSONTable = {\n        shape: 'geojson-table',\n        type: 'FeatureCollection',\n        features: geojson.features\n      };\n      return table;\n    }\n    case 'geojson':\n      return geojson;\n    case 'binary':\n      return geojsonToBinary(geojson.features);\n    case 'raw':\n      return doc;\n    default:\n      // Default to geojson for backwards compatibility\n      return geojson;\n  }\n}\n"],"mappings":"AACA,SAAQA,eAAe,QAAO,iBAAiB;AAE/C,SAAQC,GAAG,QAAO,iBAAiB;AACnC,SAAQC,SAAS,QAAO,gBAAgB;AAIxC,MAAMC,OAAO,GAAG,OAAOC,WAAW,KAAK,WAAW,GAAGA,WAAW,GAAG,QAAQ;AAc3E,MAAMC,UAAU,GAAI;AACpB;AACA,wBAAwB;AAKxB,OAAO,MAAMC,SAAyD,GAAG;EACvEC,IAAI,EAAE,2BAA2B;EACjCC,EAAE,EAAE,KAAK;EACTC,MAAM,EAAE,KAAK;EACbC,OAAO,EAAEP,OAAO;EAChBQ,UAAU,EAAE,CAAC,KAAK,CAAC;EACnBC,SAAS,EAAE,CAAC,gCAAgC,CAAC;EAC7CC,IAAI,EAAE,IAAI;EACVC,KAAK,EAAE,CAACT,UAAU,CAAC;EACnBU,KAAK,EAAE,MAAAA,CAAOC,WAAW,EAAEC,OAA0B,KACnDC,aAAa,CAAC,IAAIC,WAAW,CAAC,CAAC,CAACC,MAAM,CAACJ,WAAW,CAAC,EAAEC,OAAO,CAAC;EAC/DC,aAAa;EACbD,OAAO,EAAE;IACPhB,GAAG,EAAE,CAAC,CAAC;IACPoB,GAAG,EAAE,CAAC;EACR;AACF,CAAC;AAED,SAASH,aAAaA,CAACL,IAAY,EAAEI,OAA0B,EAAE;EAAA,IAAAK,YAAA,EAAAC,YAAA,EAAAC,aAAA;EAC/D,MAAMC,GAAG,GAAG,IAAIvB,SAAS,CAAC,CAAC,CAACwB,eAAe,CAACb,IAAI,EAAE,UAAU,CAAC;EAC7D,MAAMc,OAA0B,GAAG1B,GAAG,CAACwB,GAAG,CAAC;EAG3C,MAAMG,KAAK,GAAG,CAAAX,OAAO,aAAPA,OAAO,wBAAAK,YAAA,GAAPL,OAAO,CAAEI,GAAG,cAAAC,YAAA,uBAAZA,YAAA,CAAcO,MAAM,MAAIZ,OAAO,aAAPA,OAAO,wBAAAM,YAAA,GAAPN,OAAO,CAAEhB,GAAG,cAAAsB,YAAA,uBAAZA,YAAA,CAAcO,IAAI,MAAIb,OAAO,aAAPA,OAAO,wBAAAO,aAAA,GAAPP,OAAO,CAAEhB,GAAG,cAAAuB,aAAA,uBAAZA,aAAA,CAAcI,KAAK;EAE/E,QAAQA,KAAK;IACX,KAAK,kBAAkB;MAAE;QACvB,MAAMG,KAAqB,GAAG;UAC5BH,KAAK,EAAE,kBAAkB;UACzBI,IAAI,EAAEL,OAAO,CAACM;QAChB,CAAC;QACD,OAAOF,KAAK;MACd;IACA,KAAK,eAAe;MAAE;QACpB,MAAMA,KAAmB,GAAG;UAC1BH,KAAK,EAAE,eAAe;UACtBE,IAAI,EAAE,mBAAmB;UACzBG,QAAQ,EAAEN,OAAO,CAACM;QACpB,CAAC;QACD,OAAOF,KAAK;MACd;IACA,KAAK,SAAS;MACZ,OAAOJ,OAAO;IAChB,KAAK,QAAQ;MACX,OAAO3B,eAAe,CAAC2B,OAAO,CAACM,QAAQ,CAAC;IAC1C,KAAK,KAAK;MACR,OAAOR,GAAG;IACZ;MAEE,OAAOE,OAAO;EAClB;AACF"}
+{"version":3,"file":"tcx-loader.js","names":["geojsonToBinary","tcx","DOMParser","VERSION","__VERSION__","TCX_HEADER","TCXLoader","name","id","module","version","extensions","mimeTypes","text","tests","parse","arrayBuffer","options","parseTextSync","TextDecoder","decode","gis","_options$tcx","doc","parseFromString","geojson","shape","table","data","features","type","Error"],"sources":["../src/tcx-loader.ts"],"sourcesContent":["import type {LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';\nimport {geojsonToBinary} from '@loaders.gl/gis';\nimport type {\n  GeoJSONTable,\n  FeatureCollection,\n  ObjectRowTable,\n  BinaryFeatureCollection\n} from '@loaders.gl/schema';\nimport {tcx} from '@tmcw/togeojson';\nimport {DOMParser} from '@xmldom/xmldom';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\nexport type TCXLoaderOptions = LoaderOptions & {\n  tcx?: {\n    shape?: 'object-row-table' | 'geojson-table' | 'binary' | 'raw';\n  };\n};\n\nconst TCX_HEADER = `\\\n<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<TrainingCenterDatabase`;\n\n/**\n * Loader for TCX (Training Center XML) - Garmin GPS track format\n */\nexport const TCXLoader: LoaderWithParser<\n  ObjectRowTable | GeoJSONTable | BinaryFeatureCollection,\n  never,\n  TCXLoaderOptions\n> = {\n  name: 'TCX (Training Center XML)',\n  id: 'tcx',\n  module: 'kml',\n  version: VERSION,\n  extensions: ['tcx'],\n  mimeTypes: ['application/vnd.garmin.tcx+xml'],\n  text: true,\n  tests: [TCX_HEADER],\n  parse: async (arrayBuffer, options?: TCXLoaderOptions) =>\n    parseTextSync(new TextDecoder().decode(arrayBuffer), options),\n  parseTextSync,\n  options: {\n    tcx: {},\n    gis: {}\n  }\n};\n\nfunction parseTextSync(\n  text: string,\n  options?: TCXLoaderOptions\n): ObjectRowTable | GeoJSONTable | BinaryFeatureCollection {\n  const doc = new DOMParser().parseFromString(text, 'text/xml');\n  const geojson: FeatureCollection = tcx(doc);\n\n  // backwards compatibility\n  const shape = options?.tcx?.shape;\n\n  switch (shape) {\n    case 'object-row-table': {\n      const table: ObjectRowTable = {\n        shape: 'object-row-table',\n        data: geojson.features\n      };\n      return table;\n    }\n    case 'geojson-table': {\n      const table: GeoJSONTable = {\n        shape: 'geojson-table',\n        type: 'FeatureCollection',\n        features: geojson.features\n      };\n      return table;\n    }\n    case 'binary':\n      return geojsonToBinary(geojson.features);\n\n    default:\n      throw new Error(shape);\n  }\n}\n"],"mappings":"AACA,SAAQA,eAAe,QAAO,iBAAiB;AAO/C,SAAQC,GAAG,QAAO,iBAAiB;AACnC,SAAQC,SAAS,QAAO,gBAAgB;AAIxC,MAAMC,OAAO,GAAG,OAAOC,WAAW,KAAK,WAAW,GAAGA,WAAW,GAAG,QAAQ;AAQ3E,MAAMC,UAAU,GAAI;AACpB;AACA,wBAAwB;AAKxB,OAAO,MAAMC,SAIZ,GAAG;EACFC,IAAI,EAAE,2BAA2B;EACjCC,EAAE,EAAE,KAAK;EACTC,MAAM,EAAE,KAAK;EACbC,OAAO,EAAEP,OAAO;EAChBQ,UAAU,EAAE,CAAC,KAAK,CAAC;EACnBC,SAAS,EAAE,CAAC,gCAAgC,CAAC;EAC7CC,IAAI,EAAE,IAAI;EACVC,KAAK,EAAE,CAACT,UAAU,CAAC;EACnBU,KAAK,EAAE,MAAAA,CAAOC,WAAW,EAAEC,OAA0B,KACnDC,aAAa,CAAC,IAAIC,WAAW,CAAC,CAAC,CAACC,MAAM,CAACJ,WAAW,CAAC,EAAEC,OAAO,CAAC;EAC/DC,aAAa;EACbD,OAAO,EAAE;IACPhB,GAAG,EAAE,CAAC,CAAC;IACPoB,GAAG,EAAE,CAAC;EACR;AACF,CAAC;AAED,SAASH,aAAaA,CACpBL,IAAY,EACZI,OAA0B,EAC+B;EAAA,IAAAK,YAAA;EACzD,MAAMC,GAAG,GAAG,IAAIrB,SAAS,CAAC,CAAC,CAACsB,eAAe,CAACX,IAAI,EAAE,UAAU,CAAC;EAC7D,MAAMY,OAA0B,GAAGxB,GAAG,CAACsB,GAAG,CAAC;EAG3C,MAAMG,KAAK,GAAGT,OAAO,aAAPA,OAAO,wBAAAK,YAAA,GAAPL,OAAO,CAAEhB,GAAG,cAAAqB,YAAA,uBAAZA,YAAA,CAAcI,KAAK;EAEjC,QAAQA,KAAK;IACX,KAAK,kBAAkB;MAAE;QACvB,MAAMC,KAAqB,GAAG;UAC5BD,KAAK,EAAE,kBAAkB;UACzBE,IAAI,EAAEH,OAAO,CAACI;QAChB,CAAC;QACD,OAAOF,KAAK;MACd;IACA,KAAK,eAAe;MAAE;QACpB,MAAMA,KAAmB,GAAG;UAC1BD,KAAK,EAAE,eAAe;UACtBI,IAAI,EAAE,mBAAmB;UACzBD,QAAQ,EAAEJ,OAAO,CAACI;QACpB,CAAC;QACD,OAAOF,KAAK;MACd;IACA,KAAK,QAAQ;MACX,OAAO3B,eAAe,CAACyB,OAAO,CAACI,QAAQ,CAAC;IAE1C;MACE,MAAM,IAAIE,KAAK,CAACL,KAAK,CAAC;EAC1B;AACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/kml",
-  "version": "4.0.0-beta.5",
+  "version": "4.0.0-beta.7",
   "description": "Framework-independent loader for the KML format",
   "license": "MIT",
   "type": "module",
@@ -40,11 +40,11 @@
     "build-bundle": "ocular-bundle ./src/index.ts"
   },
   "dependencies": {
-    "@loaders.gl/gis": "4.0.0-beta.5",
-    "@loaders.gl/loader-utils": "4.0.0-beta.5",
-    "@loaders.gl/schema": "4.0.0-beta.5",
+    "@loaders.gl/gis": "4.0.0-beta.7",
+    "@loaders.gl/loader-utils": "4.0.0-beta.7",
+    "@loaders.gl/schema": "4.0.0-beta.7",
     "@tmcw/togeojson": "^4.5.0",
     "@xmldom/xmldom": "^0.7.13"
   },
-  "gitHead": "a6f5a0d1a316cc22396e5a4d480c14329d1ef146"
+  "gitHead": "5b6cab0ab5d73212cfa37fa5da6e25ad7ef83fe5"
 }

package/src/gpx-loader.ts

@@ -1,6 +1,11 @@
 import type {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';
 import {geojsonToBinary} from '@loaders.gl/gis';
-import type {GeoJSONTable, FeatureCollection, ObjectRowTable} from '@loaders.gl/schema';
+import type {
+  GeoJSONTable,
+  FeatureCollection,
+  ObjectRowTable,
+  BinaryFeatureCollection
+} from '@loaders.gl/schema';
 import {gpx} from '@tmcw/togeojson';
 import {DOMParser} from '@xmldom/xmldom';
 
@@ -10,13 +15,7 @@ const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
 
 export type GPXLoaderOptions = LoaderOptions & {
   gpx?: {
-    shape?: 'object-row-table' | 'geojson-table' | 'geojson' | 'binary' | 'raw';
-    /** @deprecated. Use options.gpx.shape */
-    type?: 'object-row-table' | 'geojson-table' | 'geojson' | 'binary' | 'raw';
-  };
-  gis?: {
-    /** @deprecated. Use options.gpx.shape */
-    format?: 'object-row-table' | 'geojson-table' | 'geojson' | 'binary' | 'raw';
+    shape?: 'object-row-table' | 'geojson-table' | 'binary' | 'raw';
   };
 };
 
@@ -27,7 +26,11 @@ const GPX_HEADER = `\
 /**
  * Loader for GPX (GPS exchange format)
  */
-export const GPXLoader: LoaderWithParser<any, never, GPXLoaderOptions> = {
+export const GPXLoader: LoaderWithParser<
+  ObjectRowTable | GeoJSONTable | BinaryFeatureCollection,
+  never,
+  GPXLoaderOptions
+> = {
   name: 'GPX (GPS exchange format)',
   id: 'gpx',
   module: 'kml',
@@ -45,11 +48,14 @@ export const GPXLoader: LoaderWithParser<any, never, GPXLoaderOptions> = {
   }
 };
 
-function parseTextSync(text: string, options?: GPXLoaderOptions) {
+function parseTextSync(
+  text: string,
+  options?: GPXLoaderOptions
+): ObjectRowTable | GeoJSONTable | BinaryFeatureCollection {
   const doc = new DOMParser().parseFromString(text, 'text/xml');
   const geojson: FeatureCollection = gpx(doc);
 
-  const shape = options?.gis?.format || options?.gpx?.type || options?.gpx?.shape;
+  const shape = options?.gpx?.shape;
 
   switch (shape) {
     case 'object-row-table': {
@@ -67,14 +73,10 @@ function parseTextSync(text: string, options?: GPXLoaderOptions) {
       };
       return table;
     }
-    case 'geojson':
-      return geojson;
     case 'binary':
       return geojsonToBinary(geojson.features);
-    case 'raw':
-      return doc;
+
     default:
-      // Default to geojson for backwards compatibility
-      return geojson;
+      throw new Error(shape);
   }
 }

package/src/kml-loader.ts

@@ -1,7 +1,7 @@
 import type {LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';
 // import {geojsonToBinary} from '@loaders.gl/gis';
 // import {GeoJSONTable} from '@loaders.gl/schema';
-import {FeatureCollection, ObjectRowTable} from '@loaders.gl/schema';
+import {FeatureCollection, GeoJSONTable, ObjectRowTable} from '@loaders.gl/schema';
 import {kml} from '@tmcw/togeojson';
 import {DOMParser} from '@xmldom/xmldom';
 
@@ -11,13 +11,7 @@ const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
 
 export type KMLLoaderOptions = LoaderOptions & {
   kml?: {
-    shape?: 'object-row-table' | 'geojson-table';
-    /** @deprecated. Use options.kml.shape */
-    type?: 'object-row-table' | 'geojson-table';
-  };
-  gis?: {
-    /** @deprecated. Use options.kml.shape */
-    format?: 'object-row-table' | 'geojson-table' | 'geojson' | 'binary' | 'raw';
+    shape?: 'object-row-table' | 'geojson-table' | 'binary' | 'raw';
   };
 };
 
@@ -28,7 +22,7 @@ const KML_HEADER = `\
 /**
  * Loader for KML (Keyhole Markup Language)
  */
-export const KMLLoader: LoaderWithParser<ObjectRowTable, never, KMLLoaderOptions> = {
+export const KMLLoader: LoaderWithParser<ObjectRowTable | GeoJSONTable, never, KMLLoaderOptions> = {
   name: 'KML (Keyhole Markup Language)',
   id: 'kml',
   module: 'kml',
@@ -41,25 +35,26 @@ export const KMLLoader: LoaderWithParser<ObjectRowTable, never, KMLLoaderOptions
     parseTextSync(new TextDecoder().decode(arrayBuffer), options),
   parseTextSync,
   options: {
-    kml: {},
+    kml: {shape: 'geojson-table'},
     gis: {}
   }
 };
 
-function parseTextSync(text: string, options?: KMLLoaderOptions): ObjectRowTable {
+function parseTextSync(text: string, options?: KMLLoaderOptions): ObjectRowTable | GeoJSONTable {
   const doc = new DOMParser().parseFromString(text, 'text/xml');
   const geojson: FeatureCollection = kml(doc);
 
   // backwards compatibility
-  const shape = options?.gis?.format || options?.kml?.type || options?.kml?.shape;
+  const shape = options?.kml?.shape || KMLLoader.options.kml?.shape;
   switch (shape) {
-    // case 'geojson-table': {
-    //   const table: GeoJSONTable = {
-    //     shape: 'geojson-table',
-    //     data: geojson.features
-    //   };
-    //   return table;
-    // }
+    case 'geojson-table': {
+      const table: GeoJSONTable = {
+        shape: 'geojson-table',
+        type: 'FeatureCollection',
+        features: geojson.features
+      };
+      return table;
+    }
     // case 'geojson':
     //   return geojson;
     // case 'binary':
@@ -67,11 +62,12 @@ function parseTextSync(text: string, options?: KMLLoaderOptions): ObjectRowTable
     // case 'raw':
     //   return doc;
     case 'object-row-table':
-    default:
       const table: ObjectRowTable = {
         shape: 'object-row-table',
         data: geojson.features
       };
       return table;
+    default:
+      throw new Error(shape);
   }
 }

package/src/tcx-loader.ts

@@ -1,6 +1,11 @@
 import type {LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';
 import {geojsonToBinary} from '@loaders.gl/gis';
-import type {GeoJSONTable, FeatureCollection, ObjectRowTable} from '@loaders.gl/schema';
+import type {
+  GeoJSONTable,
+  FeatureCollection,
+  ObjectRowTable,
+  BinaryFeatureCollection
+} from '@loaders.gl/schema';
 import {tcx} from '@tmcw/togeojson';
 import {DOMParser} from '@xmldom/xmldom';
 
@@ -10,13 +15,7 @@ const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
 
 export type TCXLoaderOptions = LoaderOptions & {
   tcx?: {
-    shape?: 'object-row-table' | 'geojson-table' | 'geojson' | 'binary' | 'raw';
-    /** @deprecated. Use options.tcx.shape */
-    type?: 'object-row-table' | 'geojson-table' | 'geojson' | 'binary' | 'raw';
-  };
-  gis?: {
-    /** @deprecated. Use options.tcx.shape */
-    format?: 'object-row-table' | 'geojson-table' | 'geojson' | 'binary' | 'raw';
+    shape?: 'object-row-table' | 'geojson-table' | 'binary' | 'raw';
   };
 };
 
@@ -27,7 +26,11 @@ const TCX_HEADER = `\
 /**
  * Loader for TCX (Training Center XML) - Garmin GPS track format
  */
-export const TCXLoader: LoaderWithParser<any, never, TCXLoaderOptions> = {
+export const TCXLoader: LoaderWithParser<
+  ObjectRowTable | GeoJSONTable | BinaryFeatureCollection,
+  never,
+  TCXLoaderOptions
+> = {
   name: 'TCX (Training Center XML)',
   id: 'tcx',
   module: 'kml',
@@ -45,12 +48,15 @@ export const TCXLoader: LoaderWithParser<any, never, TCXLoaderOptions> = {
   }
 };
 
-function parseTextSync(text: string, options?: TCXLoaderOptions) {
+function parseTextSync(
+  text: string,
+  options?: TCXLoaderOptions
+): ObjectRowTable | GeoJSONTable | BinaryFeatureCollection {
   const doc = new DOMParser().parseFromString(text, 'text/xml');
   const geojson: FeatureCollection = tcx(doc);
 
   // backwards compatibility
-  const shape = options?.gis?.format || options?.tcx?.type || options?.tcx?.shape;
+  const shape = options?.tcx?.shape;
 
   switch (shape) {
     case 'object-row-table': {
@@ -68,14 +74,10 @@ function parseTextSync(text: string, options?: TCXLoaderOptions) {
       };
       return table;
     }
-    case 'geojson':
-      return geojson;
     case 'binary':
       return geojsonToBinary(geojson.features);
-    case 'raw':
-      return doc;
+
     default:
-      // Default to geojson for backwards compatibility
-      return geojson;
+      throw new Error(shape);
   }
 }