@loaders.gl/json 4.0.0-alpha.16 → 4.0.0-alpha.17

package/dist/dist.min.js

@@ -2371,7 +2371,8 @@ Char: ${this.c}`;
       ...geometryInfo
     }, {
       numericPropKeys: options && options.numericPropKeys || numericPropKeys,
-      PositionDataType: options ? options.PositionDataType : Float32Array
+      PositionDataType: options ? options.PositionDataType : Float32Array,
+      triangulate: options ? options.triangulate : true
     });
   }
   function extractNumericPropTypes(features) {
@@ -2400,7 +2401,7 @@ Char: ${this.c}`;
       propArrayTypes,
       coordLength
     } = geometryInfo;
-    const { numericPropKeys = [], PositionDataType = Float32Array } = options;
+    const { numericPropKeys = [], PositionDataType = Float32Array, triangulate = true } = options;
     const hasGlobalId = features[0] && "id" in features[0];
     const GlobalFeatureIdsDataType = features.length > 65535 ? Uint32Array : Uint16Array;
     const points = {
@@ -2427,13 +2428,15 @@ Char: ${this.c}`;
       polygonIndices: polygonPositionsCount > 65535 ? new Uint32Array(polygonObjectsCount + 1) : new Uint16Array(polygonObjectsCount + 1),
       primitivePolygonIndices: polygonPositionsCount > 65535 ? new Uint32Array(polygonRingsCount + 1) : new Uint16Array(polygonRingsCount + 1),
       positions: new PositionDataType(polygonPositionsCount * coordLength),
-      triangles: [],
       globalFeatureIds: new GlobalFeatureIdsDataType(polygonPositionsCount),
       featureIds: polygonFeaturesCount > 65535 ? new Uint32Array(polygonPositionsCount) : new Uint16Array(polygonPositionsCount),
       numericProps: {},
       properties: [],
       fields: []
     };
+    if (triangulate) {
+      polygons.triangles = [];
+    }
     for (const object of [points, lines, polygons]) {
       for (const propName of numericPropKeys) {
         const T = propArrayTypes[propName];
@@ -2538,6 +2541,9 @@ Char: ${this.c}`;
     endPosition,
     coordLength
   }) {
+    if (!polygons.triangles) {
+      return;
+    }
     const start = startPosition * coordLength;
     const end = endPosition * coordLength;
     const polygonPositions = polygons.positions.subarray(start, end);
@@ -2556,7 +2562,7 @@ Char: ${this.c}`;
     return returnObj;
   }
   function makeAccessorObjects(points, lines, polygons, coordLength) {
-    return {
+    const binaryFeatures = {
       points: {
         ...points,
         positions: { value: points.positions, size: coordLength },
@@ -2577,12 +2583,15 @@ Char: ${this.c}`;
         positions: { value: polygons.positions, size: coordLength },
         polygonIndices: { value: polygons.polygonIndices, size: 1 },
         primitivePolygonIndices: { value: polygons.primitivePolygonIndices, size: 1 },
-        triangles: { value: new Uint32Array(polygons.triangles), size: 1 },
         globalFeatureIds: { value: polygons.globalFeatureIds, size: 1 },
         featureIds: { value: polygons.featureIds, size: 1 },
         numericProps: wrapProps(polygons.numericProps, 1)
       }
     };
+    if (polygons.triangles) {
+      binaryFeatures.polygons.triangles = { value: new Uint32Array(polygons.triangles), size: 1 };
+    }
+    return binaryFeatures;
   }
   function fillNumericProperties(object, properties, index, length) {
     for (const numericPropName in object.numericProps) {
@@ -2791,14 +2800,15 @@ Char: ${this.c}`;
   });
 
   // ../gis/src/lib/geojson-to-binary.ts
-  function geojsonToBinary(features, options = { fixRingWinding: true }) {
+  function geojsonToBinary(features, options = { fixRingWinding: true, triangulate: true }) {
     const geometryInfo = extractGeometryInfo(features);
     const coordLength = geometryInfo.coordLength;
     const { fixRingWinding } = options;
     const flatFeatures = geojsonToFlatGeojson(features, { coordLength, fixRingWinding });
     return flatGeojsonToBinary(flatFeatures, geometryInfo, {
       numericPropKeys: options.numericPropKeys,
-      PositionDataType: options.PositionDataType || Float32Array
+      PositionDataType: options.PositionDataType || Float32Array,
+      triangulate: options.triangulate
     });
   }
   var init_geojson_to_binary = __esm({

package/dist/es5/geojson-loader.js

@@ -17,7 +17,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _asyncIterator(iterable) { var method, async, sync, retry = 2; for ("undefined" != typeof Symbol && (async = Symbol.asyncIterator, sync = Symbol.iterator); retry--;) { if (async && null != (method = iterable[async])) return method.call(iterable); if (sync && null != (method = iterable[sync])) return new AsyncFromSyncIterator(method.call(iterable)); async = "@@asyncIterator", sync = "@@iterator"; } throw new TypeError("Object is not async iterable"); }
 function AsyncFromSyncIterator(s) { function AsyncFromSyncIteratorContinuation(r) { if (Object(r) !== r) return Promise.reject(new TypeError(r + " is not an object.")); var done = r.done; return Promise.resolve(r.value).then(function (value) { return { value: value, done: done }; }); } return AsyncFromSyncIterator = function AsyncFromSyncIterator(s) { this.s = s, this.n = s.next; }, AsyncFromSyncIterator.prototype = { s: null, n: null, next: function next() { return AsyncFromSyncIteratorContinuation(this.n.apply(this.s, arguments)); }, return: function _return(value) { var ret = this.s.return; return void 0 === ret ? Promise.resolve({ value: value, done: !0 }) : AsyncFromSyncIteratorContinuation(ret.apply(this.s, arguments)); }, throw: function _throw(value) { var thr = this.s.return; return void 0 === thr ? Promise.reject(value) : AsyncFromSyncIteratorContinuation(thr.apply(this.s, arguments)); } }, new AsyncFromSyncIterator(s); }
-var VERSION = typeof "4.0.0-alpha.16" !== 'undefined' ? "4.0.0-alpha.16" : 'latest';
+var VERSION = typeof "4.0.0-alpha.17" !== 'undefined' ? "4.0.0-alpha.17" : 'latest';
 var DEFAULT_GEOJSON_LOADER_OPTIONS = {
   geojson: {
     shape: 'object-row-table'

package/dist/es5/json-loader.js

@@ -12,7 +12,7 @@ var _parseJson = require("./lib/parsers/parse-json");
 var _parseJsonInBatches = require("./lib/parsers/parse-json-in-batches");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-var VERSION = typeof "4.0.0-alpha.16" !== 'undefined' ? "4.0.0-alpha.16" : 'latest';
+var VERSION = typeof "4.0.0-alpha.17" !== 'undefined' ? "4.0.0-alpha.17" : 'latest';
 var DEFAULT_JSON_LOADER_OPTIONS = {
   json: {
     shape: 'row-table',

package/dist/es5/ndgeoson-loader.js

@@ -9,7 +9,7 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _parseNdjson = require("./lib/parsers/parse-ndjson");
 var _parseNdjsonInBatches = require("./lib/parsers/parse-ndjson-in-batches");
-var VERSION = typeof "4.0.0-alpha.16" !== 'undefined' ? "4.0.0-alpha.16" : 'latest';
+var VERSION = typeof "4.0.0-alpha.17" !== 'undefined' ? "4.0.0-alpha.17" : 'latest';
 var DEFAULT_NDGEOJSON_LOADER_OPTIONS = {
   geojson: {
     shape: 'object-row-table'

package/dist/es5/ndjson-loader.js

@@ -9,7 +9,7 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _parseNdjson = require("./lib/parsers/parse-ndjson");
 var _parseNdjsonInBatches = require("./lib/parsers/parse-ndjson-in-batches");
-var VERSION = typeof "4.0.0-alpha.16" !== 'undefined' ? "4.0.0-alpha.16" : 'latest';
+var VERSION = typeof "4.0.0-alpha.17" !== 'undefined' ? "4.0.0-alpha.17" : 'latest';
 var NDJSONLoader = {
   name: 'NDJSON',
   id: 'ndjson',

package/dist/esm/geojson-loader.js

@@ -1,7 +1,7 @@
 import { geojsonToBinary } from '@loaders.gl/gis';
 import { parseJSONSync } from './lib/parsers/parse-json';
 import { parseJSONInBatches } from './lib/parsers/parse-json-in-batches';
-const VERSION = typeof "4.0.0-alpha.16" !== 'undefined' ? "4.0.0-alpha.16" : 'latest';
+const VERSION = typeof "4.0.0-alpha.17" !== 'undefined' ? "4.0.0-alpha.17" : 'latest';
 const DEFAULT_GEOJSON_LOADER_OPTIONS = {
   geojson: {
     shape: 'object-row-table'

package/dist/esm/json-loader.js

@@ -1,6 +1,6 @@
 import { parseJSONSync } from './lib/parsers/parse-json';
 import { parseJSONInBatches } from './lib/parsers/parse-json-in-batches';
-const VERSION = typeof "4.0.0-alpha.16" !== 'undefined' ? "4.0.0-alpha.16" : 'latest';
+const VERSION = typeof "4.0.0-alpha.17" !== 'undefined' ? "4.0.0-alpha.17" : 'latest';
 const DEFAULT_JSON_LOADER_OPTIONS = {
   json: {
     shape: 'row-table',

package/dist/esm/ndgeoson-loader.js

@@ -1,6 +1,6 @@
 import { parseNDJSONSync } from './lib/parsers/parse-ndjson';
 import { parseNDJSONInBatches } from './lib/parsers/parse-ndjson-in-batches';
-const VERSION = typeof "4.0.0-alpha.16" !== 'undefined' ? "4.0.0-alpha.16" : 'latest';
+const VERSION = typeof "4.0.0-alpha.17" !== 'undefined' ? "4.0.0-alpha.17" : 'latest';
 const DEFAULT_NDGEOJSON_LOADER_OPTIONS = {
   geojson: {
     shape: 'object-row-table'

package/dist/esm/ndjson-loader.js

@@ -1,6 +1,6 @@
 import { parseNDJSONSync } from './lib/parsers/parse-ndjson';
 import { parseNDJSONInBatches } from './lib/parsers/parse-ndjson-in-batches';
-const VERSION = typeof "4.0.0-alpha.16" !== 'undefined' ? "4.0.0-alpha.16" : 'latest';
+const VERSION = typeof "4.0.0-alpha.17" !== 'undefined' ? "4.0.0-alpha.17" : 'latest';
 export const NDJSONLoader = {
   name: 'NDJSON',
   id: 'ndjson',

package/dist/geojson-worker.js

@@ -687,7 +687,8 @@
       ...geometryInfo
     }, {
       numericPropKeys: options && options.numericPropKeys || numericPropKeys,
-      PositionDataType: options ? options.PositionDataType : Float32Array
+      PositionDataType: options ? options.PositionDataType : Float32Array,
+      triangulate: options ? options.triangulate : true
     });
   }
   function extractNumericPropTypes(features) {
@@ -716,7 +717,7 @@
       propArrayTypes,
       coordLength
     } = geometryInfo;
-    const { numericPropKeys = [], PositionDataType = Float32Array } = options;
+    const { numericPropKeys = [], PositionDataType = Float32Array, triangulate = true } = options;
     const hasGlobalId = features[0] && "id" in features[0];
     const GlobalFeatureIdsDataType = features.length > 65535 ? Uint32Array : Uint16Array;
     const points = {
@@ -743,13 +744,15 @@
       polygonIndices: polygonPositionsCount > 65535 ? new Uint32Array(polygonObjectsCount + 1) : new Uint16Array(polygonObjectsCount + 1),
       primitivePolygonIndices: polygonPositionsCount > 65535 ? new Uint32Array(polygonRingsCount + 1) : new Uint16Array(polygonRingsCount + 1),
       positions: new PositionDataType(polygonPositionsCount * coordLength),
-      triangles: [],
       globalFeatureIds: new GlobalFeatureIdsDataType(polygonPositionsCount),
       featureIds: polygonFeaturesCount > 65535 ? new Uint32Array(polygonPositionsCount) : new Uint16Array(polygonPositionsCount),
       numericProps: {},
       properties: [],
       fields: []
     };
+    if (triangulate) {
+      polygons.triangles = [];
+    }
     for (const object of [points, lines, polygons]) {
       for (const propName of numericPropKeys) {
         const T = propArrayTypes[propName];
@@ -854,6 +857,9 @@
     endPosition,
     coordLength
   }) {
+    if (!polygons.triangles) {
+      return;
+    }
     const start = startPosition * coordLength;
     const end = endPosition * coordLength;
     const polygonPositions = polygons.positions.subarray(start, end);
@@ -872,7 +878,7 @@
     return returnObj;
   }
   function makeAccessorObjects(points, lines, polygons, coordLength) {
-    return {
+    const binaryFeatures = {
       points: {
         ...points,
         positions: { value: points.positions, size: coordLength },
@@ -893,12 +899,15 @@
         positions: { value: polygons.positions, size: coordLength },
         polygonIndices: { value: polygons.polygonIndices, size: 1 },
         primitivePolygonIndices: { value: polygons.primitivePolygonIndices, size: 1 },
-        triangles: { value: new Uint32Array(polygons.triangles), size: 1 },
         globalFeatureIds: { value: polygons.globalFeatureIds, size: 1 },
         featureIds: { value: polygons.featureIds, size: 1 },
         numericProps: wrapProps(polygons.numericProps, 1)
       }
     };
+    if (polygons.triangles) {
+      binaryFeatures.polygons.triangles = { value: new Uint32Array(polygons.triangles), size: 1 };
+    }
+    return binaryFeatures;
   }
   function fillNumericProperties(object, properties, index, length) {
     for (const numericPropName in object.numericProps) {
@@ -1093,14 +1102,15 @@
   }
 
   // ../gis/src/lib/geojson-to-binary.ts
-  function geojsonToBinary(features, options = { fixRingWinding: true }) {
+  function geojsonToBinary(features, options = { fixRingWinding: true, triangulate: true }) {
     const geometryInfo = extractGeometryInfo(features);
     const coordLength = geometryInfo.coordLength;
     const { fixRingWinding } = options;
     const flatFeatures = geojsonToFlatGeojson(features, { coordLength, fixRingWinding });
     return flatGeojsonToBinary(flatFeatures, geometryInfo, {
       numericPropKeys: options.numericPropKeys,
-      PositionDataType: options.PositionDataType || Float32Array
+      PositionDataType: options.PositionDataType || Float32Array,
+      triangulate: options.triangulate
     });
   }
 
@@ -2417,7 +2427,7 @@ Char: ${this.c}`;
   }
 
   // src/geojson-loader.ts
-  var VERSION = true ? "4.0.0-alpha.16" : "latest";
+  var VERSION = true ? "4.0.0-alpha.17" : "latest";
   var DEFAULT_GEOJSON_LOADER_OPTIONS = {
     geojson: {
       shape: "object-row-table"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/json",
-  "version": "4.0.0-alpha.16",
+  "version": "4.0.0-alpha.17",
   "description": "Framework-independent loader for JSON and streaming JSON formats",
   "license": "MIT",
   "publishConfig": {
@@ -35,9 +35,9 @@
     "build-worker": "esbuild src/workers/geojson-worker.ts --bundle --outfile=dist/geojson-worker.js --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/gis": "4.0.0-alpha.16",
-    "@loaders.gl/loader-utils": "4.0.0-alpha.16",
-    "@loaders.gl/schema": "4.0.0-alpha.16"
+    "@loaders.gl/gis": "4.0.0-alpha.17",
+    "@loaders.gl/loader-utils": "4.0.0-alpha.17",
+    "@loaders.gl/schema": "4.0.0-alpha.17"
   },
-  "gitHead": "87e9714165c3ce143a04ac45bbd9d922006f1b63"
+  "gitHead": "68a743e2460cc89bf89edabfd08b395380d7d10c"
 }