@loaders.gl/kml 4.0.0-alpha.5 → 4.0.0-alpha.6

package/dist/gpx-loader.js

@@ -1,53 +1,61 @@
-import { geojsonToBinary } from '@loaders.gl/gis';
-import { gpx } from '@tmcw/togeojson';
-const VERSION = typeof "4.0.0-alpha.5" !== 'undefined' ? "4.0.0-alpha.5" : 'latest';
-const GPX_HEADER = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<gpx";
-export const GPXLoader = {
-  name: 'GPX (GPS exchange format)',
-  id: 'gpx',
-  module: 'kml',
-  version: VERSION,
-  extensions: ['gpx'],
-  mimeTypes: ['application/gpx+xml'],
-  text: true,
-  tests: [GPX_HEADER],
-  parse: async (arrayBuffer, options) => parseTextSync(new TextDecoder().decode(arrayBuffer), options),
-  parseTextSync,
-  options: {
-    gpx: {},
-    gis: {
-      format: 'geojson'
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports._typecheckGPXLoader = exports.GPXLoader = void 0;
+const gis_1 = require("@loaders.gl/gis");
+const togeojson_1 = require("@tmcw/togeojson");
+// __VERSION__ is injected by babel-plugin-version-inline
+// @ts-ignore TS2304: Cannot find name '__VERSION__'.
+const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
+const GPX_HEADER = `\
+<?xml version="1.0" encoding="UTF-8"?>
+<gpx`;
+/**
+ * Loader for GPX (GPS exchange format)
+ */
+exports.GPXLoader = {
+    name: 'GPX (GPS exchange format)',
+    id: 'gpx',
+    module: 'kml',
+    version: VERSION,
+    extensions: ['gpx'],
+    mimeTypes: ['application/gpx+xml'],
+    text: true,
+    tests: [GPX_HEADER],
+    parse: async (arrayBuffer, options) => parseTextSync(new TextDecoder().decode(arrayBuffer), options),
+    parseTextSync,
+    options: {
+        gpx: {},
+        gis: {}
     }
-  }
 };
-
 function parseTextSync(text, options) {
-  var _options$gpx, _options$gis;
-
-  const doc = new DOMParser().parseFromString(text, 'text/xml');
-  const geojson = gpx(doc);
-
-  switch (options === null || options === void 0 ? void 0 : (_options$gpx = options.gpx) === null || _options$gpx === void 0 ? void 0 : _options$gpx.type) {
-    case 'object-row-table':
-      return geojson.features;
-
-    default:
-  }
-
-  switch (options === null || options === void 0 ? void 0 : (_options$gis = options.gis) === null || _options$gis === void 0 ? void 0 : _options$gis.format) {
-    case 'geojson':
-      return geojson;
-
-    case 'binary':
-      return geojsonToBinary(geojson.features);
-
-    case 'raw':
-      return doc;
-
-    default:
-      throw new Error();
-  }
+    const doc = new DOMParser().parseFromString(text, 'text/xml');
+    const geojson = (0, togeojson_1.gpx)(doc);
+    const shape = options?.gis?.format || options?.gpx?.type || options?.gpx?.shape;
+    switch (shape) {
+        case 'object-row-table': {
+            const table = {
+                shape: 'object-row-table',
+                data: geojson.features
+            };
+            return table;
+        }
+        case 'geojson-row-table': {
+            const table = {
+                shape: 'geojson-row-table',
+                data: geojson.features
+            };
+            return table;
+        }
+        case 'geojson':
+            return geojson;
+        case 'binary':
+            return (0, gis_1.geojsonToBinary)(geojson.features);
+        case 'raw':
+            return doc;
+        default:
+            // Default to geojson for backwards compatibility
+            return geojson;
+    }
 }
-
-export const _typecheckGPXLoader = GPXLoader;
-//# sourceMappingURL=gpx-loader.js.map
+exports._typecheckGPXLoader = exports.GPXLoader;

package/dist/index.js

@@ -1,4 +1,9 @@
-export { GPXLoader } from './gpx-loader';
-export { KMLLoader } from './kml-loader';
-export { TCXLoader } from './tcx-loader';
-//# sourceMappingURL=index.js.map
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TCXLoader = exports.KMLLoader = exports.GPXLoader = void 0;
+var gpx_loader_1 = require("./gpx-loader");
+Object.defineProperty(exports, "GPXLoader", { enumerable: true, get: function () { return gpx_loader_1.GPXLoader; } });
+var kml_loader_1 = require("./kml-loader");
+Object.defineProperty(exports, "KMLLoader", { enumerable: true, get: function () { return kml_loader_1.KMLLoader; } });
+var tcx_loader_1 = require("./tcx-loader");
+Object.defineProperty(exports, "TCXLoader", { enumerable: true, get: function () { return tcx_loader_1.TCXLoader; } });

package/dist/kml-loader.d.ts

@@ -1,6 +1,15 @@
 import type { LoaderWithParser, LoaderOptions } from '@loaders.gl/loader-utils';
-export declare type KMLLoaderOptions = LoaderOptions & {
-    kml?: {};
+import { GeoJSONRowTable, FeatureCollection, ObjectRowTable } from '@loaders.gl/schema';
+export type KMLLoaderOptions = LoaderOptions & {
+    kml?: {
+        shape?: 'object-row-table' | 'geojson-row-table' | 'geojson' | 'binary' | 'raw';
+        /** @deprecated. Use options.kml.shape */
+        type?: 'object-row-table' | 'geojson-row-table' | 'geojson' | 'binary' | 'raw';
+    };
+    gis?: {
+        /** @deprecated. Use options.kml.shape */
+        format?: 'object-row-table' | 'geojson-row-table' | 'geojson' | 'binary' | 'raw';
+    };
 };
 /**
  * Loader for KML (Keyhole Markup Language)
@@ -14,16 +23,14 @@ export declare const KMLLoader: {
     mimeTypes: string[];
     text: boolean;
     tests: string[];
-    parse: (arrayBuffer: any, options: any) => Promise<any>;
+    parse: (arrayBuffer: any, options?: KMLLoaderOptions) => Promise<Document | FeatureCollection<import("geojson").Geometry, import("geojson").GeoJsonProperties> | ObjectRowTable | GeoJSONRowTable | import("@loaders.gl/schema").BinaryFeatures>;
     parseTextSync: typeof parseTextSync;
     options: {
         kml: {};
-        gis: {
-            format: string;
-        };
+        gis: {};
     };
 };
-declare function parseTextSync(text: string, options: any): any;
+declare function parseTextSync(text: string, options?: KMLLoaderOptions): Document | FeatureCollection<import("geojson").Geometry, import("geojson").GeoJsonProperties> | ObjectRowTable | GeoJSONRowTable | import("@loaders.gl/schema").BinaryFeatures;
 export declare const _typecheckKMLLoader: LoaderWithParser;
 export {};
 //# 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;AAQ9E,oBAAY,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE,EAAE,CAAC;CACV,CAAC;AAMF;;GAEG;AACH,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;CAgBrB,CAAC;AAEF,iBAAS,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAoBhD;AAED,eAAO,MAAM,mBAAmB,EAAE,gBAA4B,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,EAAC,eAAe,EAAE,iBAAiB,EAAE,cAAc,EAAC,MAAM,oBAAoB,CAAC;AAMtF,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE;QACJ,KAAK,CAAC,EAAE,kBAAkB,GAAG,mBAAmB,GAAG,SAAS,GAAG,QAAQ,GAAG,KAAK,CAAC;QAChF,yCAAyC;QACzC,IAAI,CAAC,EAAE,kBAAkB,GAAG,mBAAmB,GAAG,SAAS,GAAG,QAAQ,GAAG,KAAK,CAAC;KAChF,CAAC;IACF,GAAG,CAAC,EAAE;QACJ,yCAAyC;QACzC,MAAM,CAAC,EAAE,kBAAkB,GAAG,mBAAmB,GAAG,SAAS,GAAG,QAAQ,GAAG,KAAK,CAAC;KAClF,CAAC;CACH,CAAC;AAMF;;GAEG;AACH,eAAO,MAAM,SAAS;;;;;;;;;wCASiB,gBAAgB;;;;;;CAOtD,CAAC;AAEF,iBAAS,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,kLA+B9D;AAED,eAAO,MAAM,mBAAmB,EAAE,gBAA4B,CAAC"}

package/dist/kml-loader.js

@@ -1,53 +1,62 @@
-import { geojsonToBinary } from '@loaders.gl/gis';
-import { kml } from '@tmcw/togeojson';
-const VERSION = typeof "4.0.0-alpha.5" !== 'undefined' ? "4.0.0-alpha.5" : 'latest';
-const KML_HEADER = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<kml xmlns=\"http://www.opengis.net/kml/2.2\">";
-export const KMLLoader = {
-  name: 'KML (Keyhole Markup Language)',
-  id: 'kml',
-  module: 'kml',
-  version: VERSION,
-  extensions: ['kml'],
-  mimeTypes: ['application/vnd.google-earth.kml+xml'],
-  text: true,
-  tests: [KML_HEADER],
-  parse: async (arrayBuffer, options) => parseTextSync(new TextDecoder().decode(arrayBuffer), options),
-  parseTextSync,
-  options: {
-    kml: {},
-    gis: {
-      format: 'geojson'
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports._typecheckKMLLoader = exports.KMLLoader = void 0;
+const gis_1 = require("@loaders.gl/gis");
+const togeojson_1 = require("@tmcw/togeojson");
+// __VERSION__ is injected by babel-plugin-version-inline
+// @ts-ignore TS2304: Cannot find name '__VERSION__'.
+const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
+const KML_HEADER = `\
+<?xml version="1.0" encoding="UTF-8"?>
+<kml xmlns="http://www.opengis.net/kml/2.2">`;
+/**
+ * Loader for KML (Keyhole Markup Language)
+ */
+exports.KMLLoader = {
+    name: 'KML (Keyhole Markup Language)',
+    id: 'kml',
+    module: 'kml',
+    version: VERSION,
+    extensions: ['kml'],
+    mimeTypes: ['application/vnd.google-earth.kml+xml'],
+    text: true,
+    tests: [KML_HEADER],
+    parse: async (arrayBuffer, options) => parseTextSync(new TextDecoder().decode(arrayBuffer), options),
+    parseTextSync,
+    options: {
+        kml: {},
+        gis: {}
     }
-  }
 };
-
 function parseTextSync(text, options) {
-  var _options$kml, _options$gis;
-
-  const doc = new DOMParser().parseFromString(text, 'text/xml');
-  const geojson = kml(doc);
-
-  switch (options === null || options === void 0 ? void 0 : (_options$kml = options.kml) === null || _options$kml === void 0 ? void 0 : _options$kml.type) {
-    case 'object-row-table':
-      return geojson.features;
-
-    default:
-  }
-
-  switch (options === null || options === void 0 ? void 0 : (_options$gis = options.gis) === null || _options$gis === void 0 ? void 0 : _options$gis.format) {
-    case 'geojson':
-      return geojson;
-
-    case 'binary':
-      return geojsonToBinary(geojson.features);
-
-    case 'raw':
-      return doc;
-
-    default:
-      throw new Error();
-  }
+    const doc = new DOMParser().parseFromString(text, 'text/xml');
+    const geojson = (0, togeojson_1.kml)(doc);
+    // backwards compatibility
+    const shape = options?.gis?.format || options?.kml?.type || options?.kml?.shape;
+    switch (shape) {
+        case 'object-row-table': {
+            const table = {
+                shape: 'object-row-table',
+                data: geojson.features
+            };
+            return table;
+        }
+        case 'geojson-row-table': {
+            const table = {
+                shape: 'geojson-row-table',
+                data: geojson.features
+            };
+            return table;
+        }
+        case 'geojson':
+            return geojson;
+        case 'binary':
+            return (0, gis_1.geojsonToBinary)(geojson.features);
+        case 'raw':
+            return doc;
+        default:
+            // Default to geojson for backwards compatibility
+            return geojson;
+    }
 }
-
-export const _typecheckKMLLoader = KMLLoader;
-//# sourceMappingURL=kml-loader.js.map
+exports._typecheckKMLLoader = exports.KMLLoader;

package/dist/tcx-loader.d.ts

@@ -1,6 +1,15 @@
 import type { LoaderWithParser, LoaderOptions } from '@loaders.gl/loader-utils';
-export declare type TCXLoaderOptions = LoaderOptions & {
-    tcx?: {};
+import type { GeoJSONRowTable, FeatureCollection, ObjectRowTable } from '@loaders.gl/schema';
+export type TCXLoaderOptions = LoaderOptions & {
+    tcx?: {
+        shape?: 'object-row-table' | 'geojson-row-table' | 'geojson' | 'binary' | 'raw';
+        /** @deprecated. Use options.tcx.shape */
+        type?: 'object-row-table' | 'geojson-row-table' | 'geojson' | 'binary' | 'raw';
+    };
+    gis?: {
+        /** @deprecated. Use options.tcx.shape */
+        format?: 'object-row-table' | 'geojson-row-table' | 'geojson' | 'binary' | 'raw';
+    };
 };
 /**
  * Loader for TCX (Training Center XML) - Garmin GPS track format
@@ -14,16 +23,14 @@ export declare const TCXLoader: {
     mimeTypes: string[];
     text: boolean;
     tests: string[];
-    parse: (arrayBuffer: any, options: any) => Promise<any>;
+    parse: (arrayBuffer: any, options?: TCXLoaderOptions) => Promise<Document | FeatureCollection<import("geojson").Geometry, import("geojson").GeoJsonProperties> | ObjectRowTable | GeoJSONRowTable | import("@loaders.gl/schema").BinaryFeatures>;
     parseTextSync: typeof parseTextSync;
     options: {
         tcx: {};
-        gis: {
-            format: string;
-        };
+        gis: {};
     };
 };
-declare function parseTextSync(text: string, options?: any): any;
+declare function parseTextSync(text: string, options?: TCXLoaderOptions): Document | FeatureCollection<import("geojson").Geometry, import("geojson").GeoJsonProperties> | ObjectRowTable | GeoJSONRowTable | import("@loaders.gl/schema").BinaryFeatures;
 export declare const _typecheckTCXLoader: LoaderWithParser;
 export {};
 //# 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;AAQ9E,oBAAY,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE,EAAE,CAAC;CACV,CAAC;AAMF;;GAEG;AACH,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;CAgBrB,CAAC;AAEF,iBAAS,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,GAAQ,OAoBrD;AAED,eAAO,MAAM,mBAAmB,EAAE,gBAA4B,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;AAG9E,OAAO,KAAK,EAAC,eAAe,EAAE,iBAAiB,EAAE,cAAc,EAAC,MAAM,oBAAoB,CAAC;AAM3F,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE;QACJ,KAAK,CAAC,EAAE,kBAAkB,GAAG,mBAAmB,GAAG,SAAS,GAAG,QAAQ,GAAG,KAAK,CAAC;QAChF,yCAAyC;QACzC,IAAI,CAAC,EAAE,kBAAkB,GAAG,mBAAmB,GAAG,SAAS,GAAG,QAAQ,GAAG,KAAK,CAAC;KAChF,CAAC;IACF,GAAG,CAAC,EAAE;QACJ,yCAAyC;QACzC,MAAM,CAAC,EAAE,kBAAkB,GAAG,mBAAmB,GAAG,SAAS,GAAG,QAAQ,GAAG,KAAK,CAAC;KAClF,CAAC;CACH,CAAC;AAMF;;GAEG;AACH,eAAO,MAAM,SAAS;;;;;;;;;wCASiB,gBAAgB;;;;;;CAOtD,CAAC;AAEF,iBAAS,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,kLAgC9D;AAED,eAAO,MAAM,mBAAmB,EAAE,gBAA4B,CAAC"}

package/dist/tcx-loader.js

@@ -1,53 +1,62 @@
-import { geojsonToBinary } from '@loaders.gl/gis';
-import { tcx } from '@tmcw/togeojson';
-const VERSION = typeof "4.0.0-alpha.5" !== 'undefined' ? "4.0.0-alpha.5" : 'latest';
-const TCX_HEADER = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<TrainingCenterDatabase";
-export const TCXLoader = {
-  name: 'TCX (Training Center XML)',
-  id: 'tcx',
-  module: 'kml',
-  version: VERSION,
-  extensions: ['tcx'],
-  mimeTypes: ['application/vnd.garmin.tcx+xml'],
-  text: true,
-  tests: [TCX_HEADER],
-  parse: async (arrayBuffer, options) => parseTextSync(new TextDecoder().decode(arrayBuffer), options),
-  parseTextSync,
-  options: {
-    tcx: {},
-    gis: {
-      format: 'geojson'
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports._typecheckTCXLoader = exports.TCXLoader = void 0;
+const gis_1 = require("@loaders.gl/gis");
+const togeojson_1 = require("@tmcw/togeojson");
+// __VERSION__ is injected by babel-plugin-version-inline
+// @ts-ignore TS2304: Cannot find name '__VERSION__'.
+const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
+const TCX_HEADER = `\
+<?xml version="1.0" encoding="UTF-8"?>
+<TrainingCenterDatabase`;
+/**
+ * Loader for TCX (Training Center XML) - Garmin GPS track format
+ */
+exports.TCXLoader = {
+    name: 'TCX (Training Center XML)',
+    id: 'tcx',
+    module: 'kml',
+    version: VERSION,
+    extensions: ['tcx'],
+    mimeTypes: ['application/vnd.garmin.tcx+xml'],
+    text: true,
+    tests: [TCX_HEADER],
+    parse: async (arrayBuffer, options) => parseTextSync(new TextDecoder().decode(arrayBuffer), options),
+    parseTextSync,
+    options: {
+        tcx: {},
+        gis: {}
     }
-  }
 };
-
-function parseTextSync(text, options = {}) {
-  var _options$tcx, _options$gis;
-
-  const doc = new DOMParser().parseFromString(text, 'text/xml');
-  const geojson = tcx(doc);
-
-  switch (options === null || options === void 0 ? void 0 : (_options$tcx = options.tcx) === null || _options$tcx === void 0 ? void 0 : _options$tcx.type) {
-    case 'object-row-table':
-      return geojson.features;
-
-    default:
-  }
-
-  switch (options === null || options === void 0 ? void 0 : (_options$gis = options.gis) === null || _options$gis === void 0 ? void 0 : _options$gis.format) {
-    case 'geojson':
-      return geojson;
-
-    case 'binary':
-      return geojsonToBinary(geojson.features);
-
-    case 'raw':
-      return doc;
-
-    default:
-      throw new Error();
-  }
+function parseTextSync(text, options) {
+    const doc = new DOMParser().parseFromString(text, 'text/xml');
+    const geojson = (0, togeojson_1.tcx)(doc);
+    // backwards compatibility
+    const shape = options?.gis?.format || options?.tcx?.type || options?.tcx?.shape;
+    switch (shape) {
+        case 'object-row-table': {
+            const table = {
+                shape: 'object-row-table',
+                data: geojson.features
+            };
+            return table;
+        }
+        case 'geojson-row-table': {
+            const table = {
+                shape: 'geojson-row-table',
+                data: geojson.features
+            };
+            return table;
+        }
+        case 'geojson':
+            return geojson;
+        case 'binary':
+            return (0, gis_1.geojsonToBinary)(geojson.features);
+        case 'raw':
+            return doc;
+        default:
+            // Default to geojson for backwards compatibility
+            return geojson;
+    }
 }
-
-export const _typecheckTCXLoader = TCXLoader;
-//# sourceMappingURL=tcx-loader.js.map
+exports._typecheckTCXLoader = exports.TCXLoader;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/kml",
-  "version": "4.0.0-alpha.5",
+  "version": "4.0.0-alpha.6",
   "description": "Framework-independent loader for the KML format",
   "license": "MIT",
   "publishConfig": {
@@ -19,8 +19,8 @@
     "KML"
   ],
   "types": "dist/index.d.ts",
-  "main": "dist/index.js",
-  "module": "dist/index.js",
+  "main": "dist/es5/index.js",
+  "module": "dist/esm/index.js",
   "sideEffects": false,
   "files": [
     "src",
@@ -32,10 +32,10 @@
     "build-bundle": "esbuild src/bundle.ts --bundle --outfile=dist/dist.min.js"
   },
   "dependencies": {
-    "@loaders.gl/gis": "4.0.0-alpha.5",
-    "@loaders.gl/loader-utils": "4.0.0-alpha.5",
-    "@loaders.gl/schema": "4.0.0-alpha.5",
+    "@loaders.gl/gis": "4.0.0-alpha.6",
+    "@loaders.gl/loader-utils": "4.0.0-alpha.6",
+    "@loaders.gl/schema": "4.0.0-alpha.6",
     "@tmcw/togeojson": "^4.5.0"
   },
-  "gitHead": "7a71a54bdf1ddf985cc3af3db90b82e7fa97d025"
+  "gitHead": "acc1985050dfaa0f1f0c066f8da5bce7454a046c"
 }

package/src/gpx-loader.ts

@@ -1,13 +1,22 @@
-import type {LoaderOptions} from '@loaders.gl/loader-utils';
+import type {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';
 import {geojsonToBinary} from '@loaders.gl/gis';
 import {gpx} from '@tmcw/togeojson';
+import type {GeoJSONRowTable, FeatureCollection, ObjectRowTable} from '@loaders.gl/schema';
 
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
 const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
 
 export type GPXLoaderOptions = LoaderOptions & {
-  gpx?: {};
+  gpx?: {
+    shape?: 'object-row-table' | 'geojson-row-table' | 'geojson' | 'binary' | 'raw';
+    /** @deprecated. Use options.gpx.shape */
+    type?: 'object-row-table' | 'geojson-row-table' | 'geojson' | 'binary' | 'raw';
+  };
+  gis?: {
+    /** @deprecated. Use options.gpx.shape */
+    format?: 'object-row-table' | 'geojson-row-table' | 'geojson' | 'binary' | 'raw';
+  };
 };
 
 const GPX_HEADER = `\
@@ -26,26 +35,36 @@ export const GPXLoader = {
   mimeTypes: ['application/gpx+xml'],
   text: true,
   tests: [GPX_HEADER],
-  parse: async (arrayBuffer, options) =>
+  parse: async (arrayBuffer, options?: GPXLoaderOptions) =>
     parseTextSync(new TextDecoder().decode(arrayBuffer), options),
   parseTextSync,
   options: {
     gpx: {},
-    gis: {format: 'geojson'}
+    gis: {}
   }
 };
 
-function parseTextSync(text: string, options: any) {
+function parseTextSync(text: string, options?: GPXLoaderOptions) {
   const doc = new DOMParser().parseFromString(text, 'text/xml');
-  const geojson = gpx(doc);
+  const geojson: FeatureCollection = gpx(doc);
 
-  switch (options?.gpx?.type) {
-    case 'object-row-table':
-      return geojson.features;
-    default:
-  }
+  const shape = options?.gis?.format || options?.gpx?.type || options?.gpx?.shape;
 
-  switch (options?.gis?.format) {
+  switch (shape) {
+    case 'object-row-table': {
+      const table: ObjectRowTable = {
+        shape: 'object-row-table',
+        data: geojson.features
+      };
+      return table;
+    }
+    case 'geojson-row-table': {
+      const table: GeoJSONRowTable = {
+        shape: 'geojson-row-table',
+        data: geojson.features
+      };
+      return table;
+    }
     case 'geojson':
       return geojson;
     case 'binary':
@@ -53,8 +72,9 @@ function parseTextSync(text: string, options: any) {
     case 'raw':
       return doc;
     default:
-      throw new Error();
+      // Default to geojson for backwards compatibility
+      return geojson;
   }
 }
 
-export const _typecheckGPXLoader = GPXLoader;
+export const _typecheckGPXLoader: LoaderWithParser = GPXLoader;

package/src/kml-loader.ts

@@ -1,13 +1,22 @@
 import type {LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';
 import {geojsonToBinary} from '@loaders.gl/gis';
 import {kml} from '@tmcw/togeojson';
+import {GeoJSONRowTable, FeatureCollection, ObjectRowTable} from '@loaders.gl/schema';
 
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
 const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
 
 export type KMLLoaderOptions = LoaderOptions & {
-  kml?: {};
+  kml?: {
+    shape?: 'object-row-table' | 'geojson-row-table' | 'geojson' | 'binary' | 'raw';
+    /** @deprecated. Use options.kml.shape */
+    type?: 'object-row-table' | 'geojson-row-table' | 'geojson' | 'binary' | 'raw';
+  };
+  gis?: {
+    /** @deprecated. Use options.kml.shape */
+    format?: 'object-row-table' | 'geojson-row-table' | 'geojson' | 'binary' | 'raw';
+  };
 };
 
 const KML_HEADER = `\
@@ -26,26 +35,36 @@ export const KMLLoader = {
   mimeTypes: ['application/vnd.google-earth.kml+xml'],
   text: true,
   tests: [KML_HEADER],
-  parse: async (arrayBuffer, options) =>
+  parse: async (arrayBuffer, options?: KMLLoaderOptions) =>
     parseTextSync(new TextDecoder().decode(arrayBuffer), options),
   parseTextSync,
   options: {
     kml: {},
-    gis: {format: 'geojson'}
+    gis: {}
   }
 };
 
-function parseTextSync(text: string, options: any) {
+function parseTextSync(text: string, options?: KMLLoaderOptions) {
   const doc = new DOMParser().parseFromString(text, 'text/xml');
-  const geojson = kml(doc);
+  const geojson: FeatureCollection = kml(doc);
 
-  switch (options?.kml?.type) {
-    case 'object-row-table':
-      return geojson.features;
-    default:
-  }
-
-  switch (options?.gis?.format) {
+  // backwards compatibility
+  const shape = options?.gis?.format || options?.kml?.type || options?.kml?.shape;
+  switch (shape) {
+    case 'object-row-table': {
+      const table: ObjectRowTable = {
+        shape: 'object-row-table',
+        data: geojson.features
+      };
+      return table;
+    }
+    case 'geojson-row-table': {
+      const table: GeoJSONRowTable = {
+        shape: 'geojson-row-table',
+        data: geojson.features
+      };
+      return table;
+    }
     case 'geojson':
       return geojson;
     case 'binary':
@@ -53,7 +72,8 @@ function parseTextSync(text: string, options: any) {
     case 'raw':
       return doc;
     default:
-      throw new Error();
+      // Default to geojson for backwards compatibility
+      return geojson;
   }
 }