@loaders.gl/kml 4.0.0-alpha.9 → 4.0.0-beta.2

package/src/gpx-loader.ts

@@ -1,6 +1,6 @@
 import type {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';
 import {geojsonToBinary} from '@loaders.gl/gis';
-import type {GeoJSONRowTable, FeatureCollection, ObjectRowTable} from '@loaders.gl/schema';
+import type {GeoJSONTable, FeatureCollection, ObjectRowTable} from '@loaders.gl/schema';
 import {gpx} from '@tmcw/togeojson';
 import {DOMParser} from '@xmldom/xmldom';
 
@@ -10,13 +10,13 @@ const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
 
 export type GPXLoaderOptions = LoaderOptions & {
   gpx?: {
-    shape?: 'object-row-table' | 'geojson-row-table' | 'geojson' | 'binary' | 'raw';
+    shape?: 'object-row-table' | 'geojson-table' | 'geojson' | 'binary' | 'raw';
     /** @deprecated. Use options.gpx.shape */
-    type?: 'object-row-table' | 'geojson-row-table' | 'geojson' | 'binary' | 'raw';
+    type?: 'object-row-table' | 'geojson-table' | 'geojson' | 'binary' | 'raw';
   };
   gis?: {
     /** @deprecated. Use options.gpx.shape */
-    format?: 'object-row-table' | 'geojson-row-table' | 'geojson' | 'binary' | 'raw';
+    format?: 'object-row-table' | 'geojson-table' | 'geojson' | 'binary' | 'raw';
   };
 };
 
@@ -27,7 +27,7 @@ const GPX_HEADER = `\
 /**
  * Loader for GPX (GPS exchange format)
  */
-export const GPXLoader = {
+export const GPXLoader: LoaderWithParser<any, never, GPXLoaderOptions> = {
   name: 'GPX (GPS exchange format)',
   id: 'gpx',
   module: 'kml',
@@ -59,10 +59,11 @@ function parseTextSync(text: string, options?: GPXLoaderOptions) {
       };
       return table;
     }
-    case 'geojson-row-table': {
-      const table: GeoJSONRowTable = {
-        shape: 'geojson-row-table',
-        data: geojson.features
+    case 'geojson-table': {
+      const table: GeoJSONTable = {
+        shape: 'geojson-table',
+        type: 'FeatureCollection',
+        features: geojson.features
       };
       return table;
     }
@@ -77,5 +78,3 @@ function parseTextSync(text: string, options?: GPXLoaderOptions) {
       return geojson;
   }
 }
-
-export const _typecheckGPXLoader: LoaderWithParser = GPXLoader;

package/src/kml-loader.ts

@@ -1,6 +1,7 @@
 import type {LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';
-import {geojsonToBinary} from '@loaders.gl/gis';
-import {GeoJSONRowTable, FeatureCollection, ObjectRowTable} from '@loaders.gl/schema';
+// import {geojsonToBinary} from '@loaders.gl/gis';
+// import {GeoJSONTable} from '@loaders.gl/schema';
+import {FeatureCollection, ObjectRowTable} from '@loaders.gl/schema';
 import {kml} from '@tmcw/togeojson';
 import {DOMParser} from '@xmldom/xmldom';
 
@@ -10,13 +11,13 @@ const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
 
 export type KMLLoaderOptions = LoaderOptions & {
   kml?: {
-    shape?: 'object-row-table' | 'geojson-row-table' | 'geojson' | 'binary' | 'raw';
+    shape?: 'object-row-table' | 'geojson-table';
     /** @deprecated. Use options.kml.shape */
-    type?: 'object-row-table' | 'geojson-row-table' | 'geojson' | 'binary' | 'raw';
+    type?: 'object-row-table' | 'geojson-table';
   };
   gis?: {
     /** @deprecated. Use options.kml.shape */
-    format?: 'object-row-table' | 'geojson-row-table' | 'geojson' | 'binary' | 'raw';
+    format?: 'object-row-table' | 'geojson-table' | 'geojson' | 'binary' | 'raw';
   };
 };
 
@@ -27,7 +28,7 @@ const KML_HEADER = `\
 /**
  * Loader for KML (Keyhole Markup Language)
  */
-export const KMLLoader = {
+export const KMLLoader: LoaderWithParser<ObjectRowTable, never, KMLLoaderOptions> = {
   name: 'KML (Keyhole Markup Language)',
   id: 'kml',
   module: 'kml',
@@ -45,37 +46,32 @@ export const KMLLoader = {
   }
 };
 
-function parseTextSync(text: string, options?: KMLLoaderOptions) {
+function parseTextSync(text: string, options?: KMLLoaderOptions): ObjectRowTable {
   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;
   switch (shape) {
-    case 'object-row-table': {
+    // case 'geojson-table': {
+    //   const table: GeoJSONTable = {
+    //     shape: 'geojson-table',
+    //     data: geojson.features
+    //   };
+    //   return table;
+    // }
+    // case 'geojson':
+    //   return geojson;
+    // case 'binary':
+    //   return geojsonToBinary(geojson.features);
+    // case 'raw':
+    //   return doc;
+    case 'object-row-table':
+    default:
       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':
-      return geojsonToBinary(geojson.features);
-    case 'raw':
-      return doc;
-    default:
-      // Default to geojson for backwards compatibility
-      return geojson;
   }
 }
-
-export const _typecheckKMLLoader: LoaderWithParser = KMLLoader;

package/src/tcx-loader.ts

@@ -1,6 +1,6 @@
 import type {LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';
 import {geojsonToBinary} from '@loaders.gl/gis';
-import type {GeoJSONRowTable, FeatureCollection, ObjectRowTable} from '@loaders.gl/schema';
+import type {GeoJSONTable, FeatureCollection, ObjectRowTable} from '@loaders.gl/schema';
 import {tcx} from '@tmcw/togeojson';
 import {DOMParser} from '@xmldom/xmldom';
 
@@ -10,13 +10,13 @@ const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
 
 export type TCXLoaderOptions = LoaderOptions & {
   tcx?: {
-    shape?: 'object-row-table' | 'geojson-row-table' | 'geojson' | 'binary' | 'raw';
+    shape?: 'object-row-table' | 'geojson-table' | 'geojson' | 'binary' | 'raw';
     /** @deprecated. Use options.tcx.shape */
-    type?: 'object-row-table' | 'geojson-row-table' | 'geojson' | 'binary' | 'raw';
+    type?: 'object-row-table' | 'geojson-table' | 'geojson' | 'binary' | 'raw';
   };
   gis?: {
     /** @deprecated. Use options.tcx.shape */
-    format?: 'object-row-table' | 'geojson-row-table' | 'geojson' | 'binary' | 'raw';
+    format?: 'object-row-table' | 'geojson-table' | 'geojson' | 'binary' | 'raw';
   };
 };
 
@@ -27,7 +27,7 @@ const TCX_HEADER = `\
 /**
  * Loader for TCX (Training Center XML) - Garmin GPS track format
  */
-export const TCXLoader = {
+export const TCXLoader: LoaderWithParser<any, never, TCXLoaderOptions> = {
   name: 'TCX (Training Center XML)',
   id: 'tcx',
   module: 'kml',
@@ -60,10 +60,11 @@ function parseTextSync(text: string, options?: TCXLoaderOptions) {
       };
       return table;
     }
-    case 'geojson-row-table': {
-      const table: GeoJSONRowTable = {
-        shape: 'geojson-row-table',
-        data: geojson.features
+    case 'geojson-table': {
+      const table: GeoJSONTable = {
+        shape: 'geojson-table',
+        type: 'FeatureCollection',
+        features: geojson.features
       };
       return table;
     }
@@ -78,5 +79,3 @@ function parseTextSync(text: string, options?: TCXLoaderOptions) {
       return geojson;
   }
 }
-
-export const _typecheckTCXLoader: LoaderWithParser = TCXLoader;

package/dist/bundle.js

@@ -1,5 +0,0 @@
-"use strict";
-// @ts-nocheck
-const moduleExports = require('./index');
-globalThis.loaders = globalThis.loaders || {};
-module.exports = Object.assign(globalThis.loaders, moduleExports);

package/dist/gpx-loader.js

@@ -1,62 +0,0 @@
-"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");
-const xmldom_1 = require("@xmldom/xmldom");
-// __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) {
-    const doc = new xmldom_1.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;
-    }
-}
-exports._typecheckGPXLoader = exports.GPXLoader;

package/dist/index.js

@@ -1,12 +0,0 @@
-"use strict";
-// POLYFILL: DOMParser
-// - Node: Yes
-// - Browser: No
-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.js

@@ -1,63 +0,0 @@
-"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");
-const xmldom_1 = require("@xmldom/xmldom");
-// __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) {
-    const doc = new xmldom_1.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;
-    }
-}
-exports._typecheckKMLLoader = exports.KMLLoader;

package/dist/tcx-loader.js

@@ -1,63 +0,0 @@
-"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");
-const xmldom_1 = require("@xmldom/xmldom");
-// __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) {
-    const doc = new xmldom_1.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;
-    }
-}
-exports._typecheckTCXLoader = exports.TCXLoader;