@loaders.gl/geospatial 5.0.0-beta.1 → 5.0.0-beta.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +6 -2
- package/WKT-README.md +1 -1
- package/dist/dbf-loader-types.cjs +68 -0
- package/dist/dbf-loader-types.cjs.map +7 -0
- package/dist/dbf-loader-types.d.ts +2 -0
- package/dist/dbf-loader-types.d.ts.map +1 -0
- package/dist/dbf-loader-types.js +2 -0
- package/dist/dbf-loader-types.js.map +1 -0
- package/dist/dbf-loader.cjs +83 -0
- package/dist/dbf-loader.cjs.map +7 -0
- package/dist/dbf-loader.d.ts +2 -0
- package/dist/dbf-loader.d.ts.map +1 -0
- package/dist/dbf-loader.js +2 -0
- package/dist/dbf-loader.js.map +1 -0
- package/dist/dbf-worker.js +1603 -678
- package/dist/flatgeobuf/flatgeobuf-loader-types.cjs +12 -8
- package/dist/flatgeobuf/flatgeobuf-loader-types.cjs.map +2 -2
- package/dist/flatgeobuf/flatgeobuf-loader-types.d.ts +25 -34
- package/dist/flatgeobuf/flatgeobuf-loader-types.d.ts.map +1 -1
- package/dist/flatgeobuf/flatgeobuf-loader-types.js +10 -5
- package/dist/flatgeobuf/flatgeobuf-loader-types.js.map +1 -1
- package/dist/flatgeobuf/flatgeobuf-loader.cjs +4 -2
- package/dist/flatgeobuf/flatgeobuf-loader.cjs.map +2 -2
- package/dist/flatgeobuf/flatgeobuf-loader.d.ts +22 -6
- package/dist/flatgeobuf/flatgeobuf-loader.d.ts.map +1 -1
- package/dist/flatgeobuf/flatgeobuf-loader.js +4 -2
- package/dist/flatgeobuf/flatgeobuf-loader.js.map +1 -1
- package/dist/flatgeobuf/flatgeobuf-source-loader.cjs +15 -23
- package/dist/flatgeobuf/flatgeobuf-source-loader.cjs.map +2 -2
- package/dist/flatgeobuf/flatgeobuf-source-loader.d.ts +8 -32
- package/dist/flatgeobuf/flatgeobuf-source-loader.d.ts.map +1 -1
- package/dist/flatgeobuf/flatgeobuf-source-loader.js +16 -22
- package/dist/flatgeobuf/flatgeobuf-source-loader.js.map +1 -1
- package/dist/flatgeobuf/index.cjs +2 -9
- package/dist/flatgeobuf/index.cjs.map +3 -3
- package/dist/flatgeobuf/index.d.ts +1 -3
- package/dist/flatgeobuf/index.d.ts.map +1 -1
- package/dist/flatgeobuf/index.js +1 -4
- package/dist/flatgeobuf/index.js.map +1 -1
- package/dist/flatgeobuf/lib/flatgeobuf-worker-transport.cjs +5 -36
- package/dist/flatgeobuf/lib/flatgeobuf-worker-transport.cjs.map +2 -2
- package/dist/flatgeobuf/lib/flatgeobuf-worker-transport.d.ts +5 -4
- package/dist/flatgeobuf/lib/flatgeobuf-worker-transport.d.ts.map +1 -1
- package/dist/flatgeobuf/lib/flatgeobuf-worker-transport.js +7 -34
- package/dist/flatgeobuf/lib/flatgeobuf-worker-transport.js.map +1 -1
- package/dist/flatgeobuf/lib/parse-flatgeobuf.cjs +3 -3
- package/dist/flatgeobuf/lib/parse-flatgeobuf.cjs.map +2 -2
- package/dist/flatgeobuf/lib/parse-flatgeobuf.d.ts +3 -2
- package/dist/flatgeobuf/lib/parse-flatgeobuf.d.ts.map +1 -1
- package/dist/flatgeobuf/lib/parse-flatgeobuf.js +3 -3
- package/dist/flatgeobuf/lib/parse-flatgeobuf.js.map +1 -1
- package/dist/flatgeobuf/unbundled.cjs +2 -4
- package/dist/flatgeobuf/unbundled.cjs.map +2 -2
- package/dist/flatgeobuf/unbundled.d.ts +1 -1
- package/dist/flatgeobuf/unbundled.d.ts.map +1 -1
- package/dist/flatgeobuf/unbundled.js +1 -1
- package/dist/flatgeobuf/unbundled.js.map +1 -1
- package/dist/flatgeobuf-loader-types.cjs +74 -0
- package/dist/flatgeobuf-loader-types.cjs.map +7 -0
- package/dist/flatgeobuf-loader-types.d.ts +2 -0
- package/dist/flatgeobuf-loader-types.d.ts.map +1 -0
- package/dist/flatgeobuf-loader-types.js +2 -0
- package/dist/flatgeobuf-loader-types.js.map +1 -0
- package/dist/flatgeobuf-loader.cjs +68 -0
- package/dist/flatgeobuf-loader.cjs.map +7 -0
- package/dist/flatgeobuf-loader.d.ts +2 -0
- package/dist/flatgeobuf-loader.d.ts.map +1 -0
- package/dist/flatgeobuf-loader.js +2 -0
- package/dist/flatgeobuf-loader.js.map +1 -0
- package/dist/flatgeobuf-source-loader.cjs +244 -0
- package/dist/flatgeobuf-source-loader.cjs.map +7 -0
- package/dist/flatgeobuf-source-loader.d.ts +2 -0
- package/dist/flatgeobuf-source-loader.d.ts.map +1 -0
- package/dist/flatgeobuf-source-loader.js +2 -0
- package/dist/flatgeobuf-source-loader.js.map +1 -0
- package/dist/flatgeobuf-worker.js +4862 -1773
- package/dist/geopackage/geopackage-loader-types.cjs +8 -2
- package/dist/geopackage/geopackage-loader-types.cjs.map +2 -2
- package/dist/geopackage/geopackage-loader-types.d.ts +19 -6
- package/dist/geopackage/geopackage-loader-types.d.ts.map +1 -1
- package/dist/geopackage/geopackage-loader-types.js +8 -2
- package/dist/geopackage/geopackage-loader-types.js.map +1 -1
- package/dist/geopackage/geopackage-loader.cjs +2 -0
- package/dist/geopackage/geopackage-loader.cjs.map +2 -2
- package/dist/geopackage/geopackage-loader.d.ts +11 -3
- package/dist/geopackage/geopackage-loader.d.ts.map +1 -1
- package/dist/geopackage/geopackage-loader.js +2 -0
- package/dist/geopackage/geopackage-loader.js.map +1 -1
- package/dist/geopackage/geopackage-source-loader.cjs +38 -38
- package/dist/geopackage/geopackage-source-loader.cjs.map +3 -3
- package/dist/geopackage/geopackage-source-loader.d.ts +17 -43
- package/dist/geopackage/geopackage-source-loader.d.ts.map +1 -1
- package/dist/geopackage/geopackage-source-loader.js +42 -42
- package/dist/geopackage/geopackage-source-loader.js.map +1 -1
- package/dist/geopackage/index.cjs +2 -4
- package/dist/geopackage/index.cjs.map +2 -2
- package/dist/geopackage/index.d.ts +1 -1
- package/dist/geopackage/index.d.ts.map +1 -1
- package/dist/geopackage/index.js +1 -1
- package/dist/geopackage/index.js.map +1 -1
- package/dist/geopackage/lib/parse-geopackage.cjs +8 -4
- package/dist/geopackage/lib/parse-geopackage.cjs.map +2 -2
- package/dist/geopackage/lib/parse-geopackage.d.ts +2 -1
- package/dist/geopackage/lib/parse-geopackage.d.ts.map +1 -1
- package/dist/geopackage/lib/parse-geopackage.js +8 -5
- package/dist/geopackage/lib/parse-geopackage.js.map +1 -1
- package/dist/geopackage-loader-types.cjs +69 -0
- package/dist/geopackage-loader-types.cjs.map +7 -0
- package/dist/geopackage-loader-types.d.ts +2 -0
- package/dist/geopackage-loader-types.d.ts.map +1 -0
- package/dist/geopackage-loader-types.js +2 -0
- package/dist/geopackage-loader-types.js.map +1 -0
- package/dist/geopackage-loader.cjs +41 -0
- package/dist/geopackage-loader.cjs.map +7 -0
- package/dist/geopackage-loader.d.ts +2 -0
- package/dist/geopackage-loader.d.ts.map +1 -0
- package/dist/geopackage-loader.js +2 -0
- package/dist/geopackage-loader.js.map +1 -0
- package/dist/geopackage-source-loader.cjs +265 -0
- package/dist/geopackage-source-loader.cjs.map +7 -0
- package/dist/geopackage-source-loader.d.ts +2 -0
- package/dist/geopackage-source-loader.d.ts.map +1 -0
- package/dist/geopackage-source-loader.js +2 -0
- package/dist/geopackage-source-loader.js.map +1 -0
- package/dist/gpx-loader-types.cjs +61 -0
- package/dist/gpx-loader-types.cjs.map +7 -0
- package/dist/gpx-loader-types.d.ts +2 -0
- package/dist/gpx-loader-types.d.ts.map +1 -0
- package/dist/gpx-loader-types.js +2 -0
- package/dist/gpx-loader-types.js.map +1 -0
- package/dist/gpx-loader.cjs +79 -0
- package/dist/gpx-loader.cjs.map +7 -0
- package/dist/gpx-loader.d.ts +2 -0
- package/dist/gpx-loader.d.ts.map +1 -0
- package/dist/gpx-loader.js +2 -0
- package/dist/gpx-loader.js.map +1 -0
- package/dist/hex-wkb-loader-types.cjs +74 -0
- package/dist/hex-wkb-loader-types.cjs.map +7 -0
- package/dist/hex-wkb-loader-types.d.ts +2 -0
- package/dist/hex-wkb-loader-types.d.ts.map +1 -0
- package/dist/hex-wkb-loader-types.js +2 -0
- package/dist/hex-wkb-loader-types.js.map +1 -0
- package/dist/hex-wkb-loader.cjs +69 -0
- package/dist/hex-wkb-loader.cjs.map +7 -0
- package/dist/hex-wkb-loader.d.ts +2 -0
- package/dist/hex-wkb-loader.d.ts.map +1 -0
- package/dist/hex-wkb-loader.js +2 -0
- package/dist/hex-wkb-loader.js.map +1 -0
- package/dist/index.cjs +0 -7
- package/dist/index.cjs.map +3 -3
- package/dist/index.d.ts +2 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -3
- package/dist/index.js.map +1 -1
- package/dist/kml/bundled.cjs +0 -2
- package/dist/kml/bundled.cjs.map +2 -2
- package/dist/kml/bundled.d.ts +1 -1
- package/dist/kml/bundled.d.ts.map +1 -1
- package/dist/kml/bundled.js +1 -1
- package/dist/kml/bundled.js.map +1 -1
- package/dist/kml/gpx-loader-types.cjs +4 -2
- package/dist/kml/gpx-loader-types.cjs.map +2 -2
- package/dist/kml/gpx-loader-types.d.ts +11 -6
- package/dist/kml/gpx-loader-types.d.ts.map +1 -1
- package/dist/kml/gpx-loader-types.js +4 -2
- package/dist/kml/gpx-loader-types.js.map +1 -1
- package/dist/kml/gpx-loader.cjs +1 -1
- package/dist/kml/gpx-loader.cjs.map +2 -2
- package/dist/kml/gpx-loader.d.ts +9 -18
- package/dist/kml/gpx-loader.d.ts.map +1 -1
- package/dist/kml/gpx-loader.js +2 -2
- package/dist/kml/gpx-loader.js.map +1 -1
- package/dist/kml/index.cjs +0 -2
- package/dist/kml/index.cjs.map +2 -2
- package/dist/kml/index.d.ts +1 -1
- package/dist/kml/index.d.ts.map +1 -1
- package/dist/kml/index.js +1 -1
- package/dist/kml/index.js.map +1 -1
- package/dist/kml/kml-loader-types.cjs +5 -3
- package/dist/kml/kml-loader-types.cjs.map +2 -2
- package/dist/kml/kml-loader-types.d.ts +11 -6
- package/dist/kml/kml-loader-types.d.ts.map +1 -1
- package/dist/kml/kml-loader-types.js +5 -3
- package/dist/kml/kml-loader-types.js.map +1 -1
- package/dist/kml/kml-loader.cjs +1 -1
- package/dist/kml/kml-loader.cjs.map +2 -2
- package/dist/kml/kml-loader.d.ts +9 -18
- package/dist/kml/kml-loader.d.ts.map +1 -1
- package/dist/kml/kml-loader.js +2 -2
- package/dist/kml/kml-loader.js.map +1 -1
- package/dist/kml/kml-parser.cjs +4 -3
- package/dist/kml/kml-parser.cjs.map +2 -2
- package/dist/kml/kml-parser.d.ts.map +1 -1
- package/dist/kml/kml-parser.js +3 -2
- package/dist/kml/kml-parser.js.map +1 -1
- package/dist/kml/kml-writer.cjs +1 -1
- package/dist/kml/kml-writer.cjs.map +1 -1
- package/dist/kml/kml-writer.js +1 -1
- package/dist/kml/kml-writer.js.map +1 -1
- package/dist/kml/kmz-loader-types.cjs +12 -2
- package/dist/kml/kmz-loader-types.cjs.map +2 -2
- package/dist/kml/kmz-loader-types.d.ts +24 -6
- package/dist/kml/kmz-loader-types.d.ts.map +1 -1
- package/dist/kml/kmz-loader-types.js +10 -2
- package/dist/kml/kmz-loader-types.js.map +1 -1
- package/dist/kml/kmz-loader.cjs +5 -2
- package/dist/kml/kmz-loader.cjs.map +2 -2
- package/dist/kml/kmz-loader.d.ts +13 -3
- package/dist/kml/kmz-loader.d.ts.map +1 -1
- package/dist/kml/kmz-loader.js +5 -2
- package/dist/kml/kmz-loader.js.map +1 -1
- package/dist/kml/kmz-source.cjs +9 -23
- package/dist/kml/kmz-source.cjs.map +2 -2
- package/dist/kml/kmz-source.d.ts +2 -32
- package/dist/kml/kmz-source.d.ts.map +1 -1
- package/dist/kml/kmz-source.js +7 -19
- package/dist/kml/kmz-source.js.map +1 -1
- package/dist/kml/lib/feature-collection-to-arrow.cjs +1 -1
- package/dist/kml/lib/feature-collection-to-arrow.cjs.map +2 -2
- package/dist/kml/lib/feature-collection-to-arrow.d.ts +3 -2
- package/dist/kml/lib/feature-collection-to-arrow.d.ts.map +1 -1
- package/dist/kml/lib/feature-collection-to-arrow.js +1 -1
- package/dist/kml/lib/feature-collection-to-arrow.js.map +1 -1
- package/dist/kml/sports-track-parser.cjs +4 -3
- package/dist/kml/sports-track-parser.cjs.map +2 -2
- package/dist/kml/sports-track-parser.js +3 -2
- package/dist/kml/sports-track-parser.js.map +1 -1
- package/dist/kml/tcx-loader-types.cjs +4 -2
- package/dist/kml/tcx-loader-types.cjs.map +2 -2
- package/dist/kml/tcx-loader-types.d.ts +11 -6
- package/dist/kml/tcx-loader-types.d.ts.map +1 -1
- package/dist/kml/tcx-loader-types.js +4 -2
- package/dist/kml/tcx-loader-types.js.map +1 -1
- package/dist/kml/tcx-loader.cjs +1 -1
- package/dist/kml/tcx-loader.cjs.map +2 -2
- package/dist/kml/tcx-loader.d.ts +9 -18
- package/dist/kml/tcx-loader.d.ts.map +1 -1
- package/dist/kml/tcx-loader.js +2 -2
- package/dist/kml/tcx-loader.js.map +1 -1
- package/dist/kml/unbundled.cjs +0 -2
- package/dist/kml/unbundled.cjs.map +2 -2
- package/dist/kml/unbundled.d.ts +1 -1
- package/dist/kml/unbundled.d.ts.map +1 -1
- package/dist/kml/unbundled.js +1 -1
- package/dist/kml/unbundled.js.map +1 -1
- package/dist/kml-loader-types.cjs +61 -0
- package/dist/kml-loader-types.cjs.map +7 -0
- package/dist/kml-loader-types.d.ts +2 -0
- package/dist/kml-loader-types.d.ts.map +1 -0
- package/dist/kml-loader-types.js +2 -0
- package/dist/kml-loader-types.js.map +1 -0
- package/dist/kml-loader.cjs +77 -0
- package/dist/kml-loader.cjs.map +7 -0
- package/dist/kml-loader.d.ts +2 -0
- package/dist/kml-loader.d.ts.map +1 -0
- package/dist/kml-loader.js +2 -0
- package/dist/kml-loader.js.map +1 -0
- package/dist/kml-writer.cjs +212 -0
- package/dist/kml-writer.cjs.map +7 -0
- package/dist/kml-writer.d.ts +2 -0
- package/dist/kml-writer.d.ts.map +1 -0
- package/dist/kml-writer.js +2 -0
- package/dist/kml-writer.js.map +1 -0
- package/dist/kmz-loader-types.cjs +68 -0
- package/dist/kmz-loader-types.cjs.map +7 -0
- package/dist/kmz-loader-types.d.ts +2 -0
- package/dist/kmz-loader-types.d.ts.map +1 -0
- package/dist/kmz-loader-types.js +2 -0
- package/dist/kmz-loader-types.js.map +1 -0
- package/dist/kmz-loader.cjs +71 -0
- package/dist/kmz-loader.cjs.map +7 -0
- package/dist/kmz-loader.d.ts +2 -0
- package/dist/kmz-loader.d.ts.map +1 -0
- package/dist/kmz-loader.js +2 -0
- package/dist/kmz-loader.js.map +1 -0
- package/dist/kmz-source.cjs +177 -0
- package/dist/kmz-source.cjs.map +7 -0
- package/dist/kmz-source.d.ts +2 -0
- package/dist/kmz-source.d.ts.map +1 -0
- package/dist/kmz-source.js +2 -0
- package/dist/kmz-source.js.map +1 -0
- package/dist/shapefile/dbf-loader-types.cjs +5 -7
- package/dist/shapefile/dbf-loader-types.cjs.map +2 -2
- package/dist/shapefile/dbf-loader-types.d.ts +1 -3
- package/dist/shapefile/dbf-loader-types.d.ts.map +1 -1
- package/dist/shapefile/dbf-loader-types.js +3 -4
- package/dist/shapefile/dbf-loader-types.js.map +1 -1
- package/dist/shapefile/dbf-loader.cjs +24 -14
- package/dist/shapefile/dbf-loader.cjs.map +2 -2
- package/dist/shapefile/dbf-loader.d.ts +310 -4
- package/dist/shapefile/dbf-loader.d.ts.map +1 -1
- package/dist/shapefile/dbf-loader.js +30 -18
- package/dist/shapefile/dbf-loader.js.map +1 -1
- package/dist/shapefile/index.cjs +0 -6
- package/dist/shapefile/index.cjs.map +3 -3
- package/dist/shapefile/index.d.ts +0 -4
- package/dist/shapefile/index.d.ts.map +1 -1
- package/dist/shapefile/index.js +0 -5
- package/dist/shapefile/index.js.map +1 -1
- package/dist/shapefile/lib/parsers/build-geoarrow-geometry-arrow.cjs +1 -1
- package/dist/shapefile/lib/parsers/build-geoarrow-geometry-arrow.cjs.map +2 -2
- package/dist/shapefile/lib/parsers/build-geoarrow-geometry-arrow.js +1 -1
- package/dist/shapefile/lib/parsers/build-geoarrow-geometry-arrow.js.map +1 -1
- package/dist/shapefile/lib/parsers/parse-dbf-to-arrow.cjs.map +2 -2
- package/dist/shapefile/lib/parsers/parse-dbf-to-arrow.d.ts +4 -4
- package/dist/shapefile/lib/parsers/parse-dbf-to-arrow.d.ts.map +1 -1
- package/dist/shapefile/lib/parsers/parse-dbf-to-arrow.js.map +1 -1
- package/dist/shapefile/lib/parsers/parse-shapefile.cjs.map +1 -1
- package/dist/shapefile/lib/parsers/parse-shapefile.js +1 -1
- package/dist/shapefile/lib/parsers/parse-shapefile.js.map +1 -1
- package/dist/shapefile/lib/parsers/parse-shp-header.cjs +4 -3
- package/dist/shapefile/lib/parsers/parse-shp-header.cjs.map +2 -2
- package/dist/shapefile/lib/parsers/parse-shp-header.d.ts +2 -1
- package/dist/shapefile/lib/parsers/parse-shp-header.d.ts.map +1 -1
- package/dist/shapefile/lib/parsers/parse-shp-header.js +4 -5
- package/dist/shapefile/lib/parsers/parse-shp-header.js.map +1 -1
- package/dist/shapefile/lib/parsers/parse-shp-to-arrow.cjs +2 -2
- package/dist/shapefile/lib/parsers/parse-shp-to-arrow.cjs.map +2 -2
- package/dist/shapefile/lib/parsers/parse-shp-to-arrow.js +2 -2
- package/dist/shapefile/lib/parsers/parse-shp-to-arrow.js.map +1 -1
- package/dist/shapefile/lib/parsers/parse-shp.cjs +1 -1
- package/dist/shapefile/lib/parsers/parse-shp.cjs.map +2 -2
- package/dist/shapefile/lib/parsers/parse-shp.js +1 -1
- package/dist/shapefile/lib/parsers/parse-shp.js.map +1 -1
- package/dist/shapefile/lib/parsers/types.cjs.map +1 -1
- package/dist/shapefile/lib/parsers/types.d.ts +3 -3
- package/dist/shapefile/lib/parsers/types.d.ts.map +1 -1
- package/dist/shapefile/lib/shapefile-worker-transport.cjs +9 -3
- package/dist/shapefile/lib/shapefile-worker-transport.cjs.map +2 -2
- package/dist/shapefile/lib/shapefile-worker-transport.d.ts.map +1 -1
- package/dist/shapefile/lib/shapefile-worker-transport.js +7 -2
- package/dist/shapefile/lib/shapefile-worker-transport.js.map +1 -1
- package/dist/shapefile/shapefile-arrow-loader.cjs +48 -12
- package/dist/shapefile/shapefile-arrow-loader.cjs.map +3 -3
- package/dist/shapefile/shapefile-arrow-loader.d.ts.map +1 -1
- package/dist/shapefile/shapefile-arrow-loader.js +45 -10
- package/dist/shapefile/shapefile-arrow-loader.js.map +1 -1
- package/dist/shapefile/shapefile-loader-types.cjs +5 -3
- package/dist/shapefile/shapefile-loader-types.cjs.map +2 -2
- package/dist/shapefile/shapefile-loader-types.d.ts +17 -12
- package/dist/shapefile/shapefile-loader-types.d.ts.map +1 -1
- package/dist/shapefile/shapefile-loader-types.js +5 -3
- package/dist/shapefile/shapefile-loader-types.js.map +1 -1
- package/dist/shapefile/shapefile-loader.cjs +54 -5
- package/dist/shapefile/shapefile-loader.cjs.map +2 -2
- package/dist/shapefile/shapefile-loader.d.ts +42 -5
- package/dist/shapefile/shapefile-loader.d.ts.map +1 -1
- package/dist/shapefile/shapefile-loader.js +60 -5
- package/dist/shapefile/shapefile-loader.js.map +1 -1
- package/dist/shapefile/shp-loader-types.cjs +3 -5
- package/dist/shapefile/shp-loader-types.cjs.map +2 -2
- package/dist/shapefile/shp-loader-types.d.ts +1 -3
- package/dist/shapefile/shp-loader-types.d.ts.map +1 -1
- package/dist/shapefile/shp-loader-types.js +3 -4
- package/dist/shapefile/shp-loader-types.js.map +1 -1
- package/dist/shapefile/shp-loader.cjs +54 -6
- package/dist/shapefile/shp-loader.cjs.map +2 -2
- package/dist/shapefile/shp-loader.d.ts +190 -2
- package/dist/shapefile/shp-loader.d.ts.map +1 -1
- package/dist/shapefile/shp-loader.js +62 -8
- package/dist/shapefile/shp-loader.js.map +1 -1
- package/dist/shapefile/unbundled.cjs +0 -4
- package/dist/shapefile/unbundled.cjs.map +2 -2
- package/dist/shapefile/unbundled.d.ts +2 -2
- package/dist/shapefile/unbundled.d.ts.map +1 -1
- package/dist/shapefile/unbundled.js +2 -2
- package/dist/shapefile/unbundled.js.map +1 -1
- package/dist/shapefile-arrow-loader.cjs +415 -0
- package/dist/shapefile-arrow-loader.cjs.map +7 -0
- package/dist/shapefile-arrow-loader.d.ts +2 -0
- package/dist/shapefile-arrow-loader.d.ts.map +1 -0
- package/dist/shapefile-arrow-loader.js +2 -0
- package/dist/shapefile-arrow-loader.js.map +1 -0
- package/dist/shapefile-loader-types.cjs +67 -0
- package/dist/shapefile-loader-types.cjs.map +7 -0
- package/dist/shapefile-loader-types.d.ts +2 -0
- package/dist/shapefile-loader-types.d.ts.map +1 -0
- package/dist/shapefile-loader-types.js +2 -0
- package/dist/shapefile-loader-types.js.map +1 -0
- package/dist/shapefile-loader.cjs +124 -0
- package/dist/shapefile-loader.cjs.map +7 -0
- package/dist/shapefile-loader.d.ts +2 -0
- package/dist/shapefile-loader.d.ts.map +1 -0
- package/dist/shapefile-loader.js +2 -0
- package/dist/shapefile-loader.js.map +1 -0
- package/dist/shapefile-worker.js +28146 -26262
- package/dist/shp-loader-types.cjs +67 -0
- package/dist/shp-loader-types.cjs.map +7 -0
- package/dist/shp-loader-types.d.ts +2 -0
- package/dist/shp-loader-types.d.ts.map +1 -0
- package/dist/shp-loader-types.js +2 -0
- package/dist/shp-loader-types.js.map +1 -0
- package/dist/shp-loader.cjs +108 -0
- package/dist/shp-loader.cjs.map +7 -0
- package/dist/shp-loader.d.ts +2 -0
- package/dist/shp-loader.d.ts.map +1 -0
- package/dist/shp-loader.js +2 -0
- package/dist/shp-loader.js.map +1 -0
- package/dist/shp-worker.js +7881 -6208
- package/dist/tcx-loader-types.cjs +61 -0
- package/dist/tcx-loader-types.cjs.map +7 -0
- package/dist/tcx-loader-types.d.ts +2 -0
- package/dist/tcx-loader-types.d.ts.map +1 -0
- package/dist/tcx-loader-types.js +2 -0
- package/dist/tcx-loader-types.js.map +1 -0
- package/dist/tcx-loader.cjs +79 -0
- package/dist/tcx-loader.cjs.map +7 -0
- package/dist/tcx-loader.d.ts +2 -0
- package/dist/tcx-loader.d.ts.map +1 -0
- package/dist/tcx-loader.js +2 -0
- package/dist/tcx-loader.js.map +1 -0
- package/dist/twkb-loader-types.cjs +73 -0
- package/dist/twkb-loader-types.cjs.map +7 -0
- package/dist/twkb-loader-types.d.ts +2 -0
- package/dist/twkb-loader-types.d.ts.map +1 -0
- package/dist/twkb-loader-types.js +2 -0
- package/dist/twkb-loader-types.js.map +1 -0
- package/dist/twkb-loader.cjs +47 -0
- package/dist/twkb-loader.cjs.map +7 -0
- package/dist/twkb-loader.d.ts +2 -0
- package/dist/twkb-loader.d.ts.map +1 -0
- package/dist/twkb-loader.js +2 -0
- package/dist/twkb-loader.js.map +1 -0
- package/dist/twkb-writer.cjs +52 -0
- package/dist/twkb-writer.cjs.map +7 -0
- package/dist/twkb-writer.d.ts +2 -0
- package/dist/twkb-writer.d.ts.map +1 -0
- package/dist/twkb-writer.js +2 -0
- package/dist/twkb-writer.js.map +1 -0
- package/dist/wkb-loader-types.cjs +62 -0
- package/dist/wkb-loader-types.cjs.map +7 -0
- package/dist/wkb-loader-types.d.ts +2 -0
- package/dist/wkb-loader-types.d.ts.map +1 -0
- package/dist/wkb-loader-types.js +2 -0
- package/dist/wkb-loader-types.js.map +1 -0
- package/dist/wkb-loader.cjs +58 -0
- package/dist/wkb-loader.cjs.map +7 -0
- package/dist/wkb-loader.d.ts +2 -0
- package/dist/wkb-loader.d.ts.map +1 -0
- package/dist/wkb-loader.js +2 -0
- package/dist/wkb-loader.js.map +1 -0
- package/dist/wkb-writer.cjs +56 -0
- package/dist/wkb-writer.cjs.map +7 -0
- package/dist/wkb-writer.d.ts +2 -0
- package/dist/wkb-writer.d.ts.map +1 -0
- package/dist/wkb-writer.js +2 -0
- package/dist/wkb-writer.js.map +1 -0
- package/dist/wkt/hex-wkb-loader-types.cjs +1 -1
- package/dist/wkt/hex-wkb-loader-types.cjs.map +2 -2
- package/dist/wkt/hex-wkb-loader-types.d.ts +1 -1
- package/dist/wkt/hex-wkb-loader-types.js +1 -1
- package/dist/wkt/hex-wkb-loader-types.js.map +1 -1
- package/dist/wkt/index.cjs +0 -6
- package/dist/wkt/index.cjs.map +3 -3
- package/dist/wkt/index.d.ts +0 -4
- package/dist/wkt/index.d.ts.map +1 -1
- package/dist/wkt/index.js +0 -5
- package/dist/wkt/index.js.map +1 -1
- package/dist/wkt/lib/version.cjs +1 -1
- package/dist/wkt/lib/version.cjs.map +1 -1
- package/dist/wkt/lib/version.js +1 -1
- package/dist/wkt/lib/version.js.map +1 -1
- package/dist/wkt/twkb-loader-types.cjs +3 -6
- package/dist/wkt/twkb-loader-types.cjs.map +2 -2
- package/dist/wkt/twkb-loader-types.d.ts +0 -23
- package/dist/wkt/twkb-loader-types.d.ts.map +1 -1
- package/dist/wkt/twkb-loader-types.js +1 -3
- package/dist/wkt/twkb-loader-types.js.map +1 -1
- package/dist/wkt/twkb-loader.cjs +1 -1
- package/dist/wkt/twkb-loader.cjs.map +2 -2
- package/dist/wkt/twkb-loader.js +1 -1
- package/dist/wkt/twkb-loader.js.map +1 -1
- package/dist/wkt/unbundled.cjs +2 -6
- package/dist/wkt/unbundled.cjs.map +2 -2
- package/dist/wkt/unbundled.d.ts +2 -2
- package/dist/wkt/unbundled.d.ts.map +1 -1
- package/dist/wkt/unbundled.js +2 -2
- package/dist/wkt/unbundled.js.map +1 -1
- package/dist/wkt/wkb-loader-types.cjs +3 -6
- package/dist/wkt/wkb-loader-types.cjs.map +2 -2
- package/dist/wkt/wkb-loader-types.d.ts +2 -26
- package/dist/wkt/wkb-loader-types.d.ts.map +1 -1
- package/dist/wkt/wkb-loader-types.js +1 -3
- package/dist/wkt/wkb-loader-types.js.map +1 -1
- package/dist/wkt/wkb-loader.cjs +1 -1
- package/dist/wkt/wkb-loader.cjs.map +2 -2
- package/dist/wkt/wkb-loader.js +1 -1
- package/dist/wkt/wkb-loader.js.map +1 -1
- package/dist/wkt/wkt-crs-loader-types.cjs +1 -1
- package/dist/wkt/wkt-crs-loader-types.cjs.map +2 -2
- package/dist/wkt/wkt-crs-loader-types.d.ts +2 -2
- package/dist/wkt/wkt-crs-loader-types.js +1 -1
- package/dist/wkt/wkt-crs-loader-types.js.map +1 -1
- package/dist/wkt/wkt-format.cjs +2 -2
- package/dist/wkt/wkt-format.cjs.map +2 -2
- package/dist/wkt/wkt-format.js +1 -1
- package/dist/wkt/wkt-format.js.map +1 -1
- package/dist/wkt/wkt-loader-types.cjs +3 -6
- package/dist/wkt/wkt-loader-types.cjs.map +2 -2
- package/dist/wkt/wkt-loader-types.d.ts +2 -27
- package/dist/wkt/wkt-loader-types.d.ts.map +1 -1
- package/dist/wkt/wkt-loader-types.js +1 -3
- package/dist/wkt/wkt-loader-types.js.map +1 -1
- package/dist/wkt/wkt-loader.cjs +1 -1
- package/dist/wkt/wkt-loader.cjs.map +2 -2
- package/dist/wkt/wkt-loader.js +1 -1
- package/dist/wkt/wkt-loader.js.map +1 -1
- package/dist/wkt-crs-loader-types.cjs +66 -0
- package/dist/wkt-crs-loader-types.cjs.map +7 -0
- package/dist/wkt-crs-loader-types.d.ts +2 -0
- package/dist/wkt-crs-loader-types.d.ts.map +1 -0
- package/dist/wkt-crs-loader-types.js +2 -0
- package/dist/wkt-crs-loader-types.js.map +1 -0
- package/dist/wkt-crs-loader.cjs +40 -0
- package/dist/wkt-crs-loader.cjs.map +7 -0
- package/dist/wkt-crs-loader.d.ts +2 -0
- package/dist/wkt-crs-loader.d.ts.map +1 -0
- package/dist/wkt-crs-loader.js +2 -0
- package/dist/wkt-crs-loader.js.map +1 -0
- package/dist/wkt-crs-writer.cjs +54 -0
- package/dist/wkt-crs-writer.cjs.map +7 -0
- package/dist/wkt-crs-writer.d.ts +2 -0
- package/dist/wkt-crs-writer.d.ts.map +1 -0
- package/dist/wkt-crs-writer.js +2 -0
- package/dist/wkt-crs-writer.js.map +1 -0
- package/dist/wkt-loader-types.cjs +62 -0
- package/dist/wkt-loader-types.cjs.map +7 -0
- package/dist/wkt-loader-types.d.ts +2 -0
- package/dist/wkt-loader-types.d.ts.map +1 -0
- package/dist/wkt-loader-types.js +2 -0
- package/dist/wkt-loader-types.js.map +1 -0
- package/dist/wkt-loader.cjs +47 -0
- package/dist/wkt-loader.cjs.map +7 -0
- package/dist/wkt-loader.d.ts +2 -0
- package/dist/wkt-loader.d.ts.map +1 -0
- package/dist/wkt-loader.js +2 -0
- package/dist/wkt-loader.js.map +1 -0
- package/dist/wkt-worker.js +749 -124
- package/dist/wkt-writer.cjs +56 -0
- package/dist/wkt-writer.cjs.map +7 -0
- package/dist/wkt-writer.d.ts +2 -0
- package/dist/wkt-writer.d.ts.map +1 -0
- package/dist/wkt-writer.js +2 -0
- package/dist/wkt-writer.js.map +1 -0
- package/dist/workers/dbf-worker.cjs +4 -4
- package/dist/workers/dbf-worker.cjs.map +2 -2
- package/dist/workers/dbf-worker.js +5 -5
- package/dist/workers/dbf-worker.js.map +1 -1
- package/dist/workers/shapefile-worker.cjs +6 -6
- package/dist/workers/shapefile-worker.cjs.map +2 -2
- package/dist/workers/shapefile-worker.js +7 -9
- package/dist/workers/shapefile-worker.js.map +1 -1
- package/dist/workers/shp-worker.cjs +1 -1
- package/dist/workers/shp-worker.cjs.map +2 -2
- package/dist/workers/shp-worker.js +2 -2
- package/dist/workers/shp-worker.js.map +1 -1
- package/package.json +153 -131
- package/src/dbf-loader-types.ts +1 -0
- package/src/dbf-loader.ts +1 -0
- package/src/flatgeobuf/flatgeobuf-loader-types.ts +18 -17
- package/src/flatgeobuf/flatgeobuf-loader.ts +9 -11
- package/src/flatgeobuf/flatgeobuf-source-loader.ts +19 -32
- package/src/flatgeobuf/index.ts +1 -9
- package/src/flatgeobuf/lib/flatgeobuf-worker-transport.ts +12 -50
- package/src/flatgeobuf/lib/parse-flatgeobuf.ts +5 -5
- package/src/flatgeobuf/unbundled.ts +1 -1
- package/src/flatgeobuf-loader-types.ts +1 -0
- package/src/flatgeobuf-loader.ts +1 -0
- package/src/flatgeobuf-source-loader.ts +1 -0
- package/src/geopackage/geopackage-loader-types.ts +13 -8
- package/src/geopackage/geopackage-loader.ts +5 -2
- package/src/geopackage/geopackage-source-loader.ts +57 -58
- package/src/geopackage/index.ts +1 -1
- package/src/geopackage/lib/parse-geopackage.ts +10 -5
- package/src/geopackage-loader-types.ts +1 -0
- package/src/geopackage-loader.ts +1 -0
- package/src/geopackage-source-loader.ts +1 -0
- package/src/gpx-loader-types.ts +1 -0
- package/src/gpx-loader.ts +1 -0
- package/src/hex-wkb-loader-types.ts +1 -0
- package/src/hex-wkb-loader.ts +1 -0
- package/src/index.ts +2 -3
- package/src/kml/bundled.ts +1 -1
- package/src/kml/gpx-loader-types.ts +5 -3
- package/src/kml/gpx-loader.ts +8 -16
- package/src/kml/index.ts +1 -1
- package/src/kml/kml-loader-types.ts +7 -5
- package/src/kml/kml-loader.ts +8 -20
- package/src/kml/kml-parser.ts +3 -2
- package/src/kml/kmz-loader-types.ts +17 -4
- package/src/kml/kmz-loader.ts +7 -3
- package/src/kml/kmz-source.ts +12 -25
- package/src/kml/lib/feature-collection-to-arrow.ts +4 -10
- package/src/kml/sports-track-parser.ts +3 -2
- package/src/kml/tcx-loader-types.ts +5 -3
- package/src/kml/tcx-loader.ts +8 -16
- package/src/kml/unbundled.ts +1 -1
- package/src/kml-loader-types.ts +1 -0
- package/src/kml-loader.ts +1 -0
- package/src/kml-writer.ts +1 -0
- package/src/kmz-loader-types.ts +1 -0
- package/src/kmz-loader.ts +1 -0
- package/src/kmz-source.ts +1 -0
- package/src/shapefile/dbf-loader-types.ts +5 -7
- package/src/shapefile/dbf-loader.ts +43 -27
- package/src/shapefile/index.ts +0 -6
- package/src/shapefile/lib/parsers/build-geoarrow-geometry-arrow.ts +1 -1
- package/src/shapefile/lib/parsers/parse-dbf-to-arrow.ts +6 -5
- package/src/shapefile/lib/parsers/parse-shapefile.ts +1 -1
- package/src/shapefile/lib/parsers/parse-shp-header.ts +4 -5
- package/src/shapefile/lib/parsers/parse-shp-to-arrow.ts +2 -2
- package/src/shapefile/lib/parsers/parse-shp.ts +1 -1
- package/src/shapefile/lib/parsers/types.ts +3 -3
- package/src/shapefile/lib/shapefile-worker-transport.ts +10 -2
- package/src/shapefile/shapefile-arrow-loader.ts +62 -11
- package/src/shapefile/shapefile-loader-types.ts +11 -16
- package/src/shapefile/shapefile-loader.ts +75 -6
- package/src/shapefile/shp-loader-types.ts +6 -11
- package/src/shapefile/shp-loader.ts +73 -12
- package/src/shapefile/unbundled.ts +2 -2
- package/src/shapefile-arrow-loader.ts +1 -0
- package/src/shapefile-loader-types.ts +1 -0
- package/src/shapefile-loader.ts +1 -0
- package/src/shp-loader-types.ts +1 -0
- package/src/shp-loader.ts +1 -0
- package/src/tcx-loader-types.ts +1 -0
- package/src/tcx-loader.ts +1 -0
- package/src/twkb-loader-types.ts +1 -0
- package/src/twkb-loader.ts +1 -0
- package/src/twkb-writer.ts +1 -0
- package/src/wkb-loader-types.ts +1 -0
- package/src/wkb-loader.ts +1 -0
- package/src/wkb-writer.ts +1 -0
- package/src/wkt/hex-wkb-loader-types.ts +1 -1
- package/src/wkt/index.ts +0 -6
- package/src/wkt/twkb-loader-types.ts +1 -4
- package/src/wkt/twkb-loader.ts +1 -1
- package/src/wkt/unbundled.ts +2 -2
- package/src/wkt/wkb-loader-types.ts +1 -4
- package/src/wkt/wkb-loader.ts +1 -1
- package/src/wkt/wkt-crs-loader-types.ts +1 -1
- package/src/wkt/wkt-format.ts +1 -1
- package/src/wkt/wkt-loader-types.ts +1 -4
- package/src/wkt/wkt-loader.ts +1 -1
- package/src/wkt-crs-loader-types.ts +1 -0
- package/src/wkt-crs-loader.ts +1 -0
- package/src/wkt-crs-writer.ts +1 -0
- package/src/wkt-loader-types.ts +1 -0
- package/src/wkt-loader.ts +1 -0
- package/src/wkt-writer.ts +1 -0
- package/src/workers/dbf-worker.ts +5 -5
- package/src/workers/shapefile-worker.ts +7 -10
- package/src/workers/shp-worker.ts +2 -2
|
@@ -2,8 +2,10 @@
|
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
|
|
5
|
+
import {Table, RecordBatch} from 'apache-arrow';
|
|
6
|
+
import {convertArrowToSchema, makeArrowMetadataBatch} from '@loaders.gl/core/schema-utils';
|
|
5
7
|
import type {Loader, LoaderWithParser, StrictLoaderOptions} from '@loaders.gl/core/loader-utils';
|
|
6
|
-
import type {ArrowTable,
|
|
8
|
+
import type {ArrowTable, ObjectRowTable} from '@loaders.gl/core/schema';
|
|
7
9
|
import {
|
|
8
10
|
parseDBF as parseDBFToObjectRows,
|
|
9
11
|
parseDBFInBatches as parseDBFToObjectRowsInBatches
|
|
@@ -13,7 +15,7 @@ import {
|
|
|
13
15
|
parseDBFInBatches as parseDBFToArrowInBatches
|
|
14
16
|
} from './lib/parsers/parse-dbf-to-arrow';
|
|
15
17
|
import type {DBFHeader, DBFRowsOutput, DBFTableOutput} from './lib/parsers/types';
|
|
16
|
-
import {
|
|
18
|
+
import {DBFLoader as DBFWorkerLoaderMetadata} from './dbf-loader-types';
|
|
17
19
|
import {DBFLoader as DBFLoaderMetadata} from './dbf-loader-types';
|
|
18
20
|
import {
|
|
19
21
|
deserializeShapefileWorkerResult,
|
|
@@ -28,7 +30,7 @@ const {preload: _DBFLoaderPreload, ...DBFLoaderMetadataWithoutPreload} = DBFLoad
|
|
|
28
30
|
export type DBFLoaderOptions = StrictLoaderOptions & {
|
|
29
31
|
dbf?: {
|
|
30
32
|
encoding?: string;
|
|
31
|
-
shape?: 'rows' | 'table' | 'object-row-table' | 'arrow
|
|
33
|
+
shape?: 'rows' | 'table' | 'object-row-table' | 'arrow';
|
|
32
34
|
batchSize?: number;
|
|
33
35
|
/** Override the URL to the worker bundle (by default loads from unpkg.com) */
|
|
34
36
|
workerUrl?: string;
|
|
@@ -43,54 +45,68 @@ export const DBFWorkerLoaderWithParser = {
|
|
|
43
45
|
} as const satisfies Loader<any, any, DBFLoaderOptions>;
|
|
44
46
|
|
|
45
47
|
/** DBF file loader */
|
|
46
|
-
export const
|
|
47
|
-
DBFRowsOutput | DBFTableOutput | ObjectRowTable | ArrowTable,
|
|
48
|
-
DBFHeader | DBFRowsOutput | DBFTableOutput | ArrowTableBatch,
|
|
49
|
-
DBFLoaderOptions
|
|
50
|
-
> = {
|
|
48
|
+
export const DBFColumnLoader = {
|
|
51
49
|
...DBFLoaderMetadataWithoutPreload,
|
|
50
|
+
dataType: null as unknown as DBFRowsOutput | DBFTableOutput | ObjectRowTable | Table,
|
|
51
|
+
batchType: null as unknown as DBFHeader | DBFRowsOutput | DBFTableOutput | RecordBatch,
|
|
52
52
|
parse: async (arrayBuffer, options) =>
|
|
53
|
-
getDBFShape(options) === 'arrow
|
|
53
|
+
getDBFShape(options) === 'arrow'
|
|
54
54
|
? parseDBFToArrow(arrayBuffer, options)
|
|
55
55
|
: parseDBFToObjectRows(arrayBuffer, options),
|
|
56
56
|
parseSync: (arrayBuffer, options) =>
|
|
57
|
-
getDBFShape(options) === 'arrow
|
|
57
|
+
getDBFShape(options) === 'arrow'
|
|
58
58
|
? parseDBFToArrow(arrayBuffer, options)
|
|
59
59
|
: parseDBFToObjectRows(arrayBuffer, options),
|
|
60
60
|
parseInBatches(
|
|
61
61
|
arrayBufferIterator:
|
|
62
62
|
| AsyncIterable<ArrayBufferLike | ArrayBufferView>
|
|
63
63
|
| Iterable<ArrayBufferLike | ArrayBufferView>,
|
|
64
|
-
options
|
|
64
|
+
options?: DBFLoaderOptions
|
|
65
65
|
) {
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
66
|
+
const batchOptions =
|
|
67
|
+
typeof options?.core?.batchSize === 'number'
|
|
68
|
+
? {...options, dbf: {...options.dbf, batchSize: options.core.batchSize}}
|
|
69
|
+
: options;
|
|
70
|
+
return getDBFShape(batchOptions) === 'arrow'
|
|
71
|
+
? parseDBFToArrowInBatches(arrayBufferIterator, batchOptions)
|
|
72
|
+
: parseDBFToObjectRowsInBatches(arrayBufferIterator, batchOptions);
|
|
69
73
|
},
|
|
70
74
|
serializeWorkerResult: serializeShapefileWorkerResult,
|
|
71
75
|
deserializeWorkerResult: deserializeDBFWorkerResult,
|
|
72
76
|
serializeWorkerBatch: serializeShapefileWorkerBatch,
|
|
73
77
|
deserializeWorkerBatch: deserializeDBFWorkerBatch
|
|
74
|
-
}
|
|
78
|
+
} as const satisfies LoaderWithParser<
|
|
79
|
+
DBFRowsOutput | DBFTableOutput | ObjectRowTable | Table,
|
|
80
|
+
DBFHeader | DBFRowsOutput | DBFTableOutput | RecordBatch,
|
|
81
|
+
DBFLoaderOptions
|
|
82
|
+
>;
|
|
75
83
|
|
|
76
84
|
function getDBFShape(options?: DBFLoaderOptions): NonNullable<DBFLoaderOptions['dbf']>['shape'] {
|
|
77
|
-
return options?.dbf?.shape || 'arrow
|
|
85
|
+
return options?.dbf?.shape || 'arrow';
|
|
78
86
|
}
|
|
79
87
|
|
|
80
88
|
/** Converts hydrated Arrow scalars to the requested legacy row output on the caller. */
|
|
81
|
-
function deserializeDBFWorkerResult(result: unknown, options?: DBFLoaderOptions)
|
|
82
|
-
const
|
|
89
|
+
function deserializeDBFWorkerResult(result: unknown, options?: DBFLoaderOptions) {
|
|
90
|
+
const value = deserializeShapefileWorkerResult<Table | ArrowTable>(result);
|
|
91
|
+
const table = 'shape' in value ? value.data : value;
|
|
83
92
|
const shape = getDBFShape(options);
|
|
84
|
-
if (shape === 'arrow
|
|
85
|
-
const rows = table.
|
|
93
|
+
if (shape === 'arrow') return table;
|
|
94
|
+
const rows = table.toArray().map(row => row.toJSON());
|
|
86
95
|
if (shape === 'rows') return rows;
|
|
87
|
-
|
|
88
|
-
|
|
96
|
+
const schema = convertArrowToSchema(table.schema);
|
|
97
|
+
if (shape === 'table') return {schema, rows};
|
|
98
|
+
return {shape: 'object-row-table' as const, schema, data: rows};
|
|
89
99
|
}
|
|
90
100
|
|
|
91
|
-
/** Keeps
|
|
92
|
-
function deserializeDBFWorkerBatch(result: unknown, options?: DBFLoaderOptions)
|
|
93
|
-
|
|
94
|
-
const
|
|
95
|
-
|
|
101
|
+
/** Keeps legacy header events and materializes row arrays only on the caller. */
|
|
102
|
+
function deserializeDBFWorkerBatch(result: unknown, options?: DBFLoaderOptions) {
|
|
103
|
+
const value = deserializeShapefileWorkerResult<DBFHeader | RecordBatch | ArrowTable>(result);
|
|
104
|
+
const batch =
|
|
105
|
+
'shape' in value ? (value.data.batches[0] ?? makeArrowMetadataBatch(value.data.schema)) : value;
|
|
106
|
+
return batch instanceof RecordBatch && getDBFShape(options) !== 'arrow'
|
|
107
|
+
? batch.toArray().map(row => row.toJSON())
|
|
108
|
+
: batch;
|
|
96
109
|
}
|
|
110
|
+
|
|
111
|
+
/** Exposes native Arrow tables and batches. */
|
|
112
|
+
export const DBFLoaderWithParser = DBFColumnLoader;
|
package/src/shapefile/index.ts
CHANGED
|
@@ -17,9 +17,3 @@ export {SHPLoader} from './shp-loader-types';
|
|
|
17
17
|
export {BinaryReader as _BinaryReader} from './lib/streaming/binary-reader';
|
|
18
18
|
export {BinaryChunkReader as _BinaryChunkReader} from './lib/streaming/binary-chunk-reader';
|
|
19
19
|
export {zipBatchIterators as _zipBatchIterators} from './lib/streaming/zip-batch-iterators';
|
|
20
|
-
|
|
21
|
-
// DEPRECATED EXPORTS
|
|
22
|
-
/** @deprecated Use DBFLoader. */
|
|
23
|
-
export {DBFWorkerLoader} from './dbf-loader-types';
|
|
24
|
-
/** @deprecated Use SHPLoader. */
|
|
25
|
-
export {SHPWorkerLoader} from './shp-loader-types';
|
|
@@ -32,7 +32,7 @@ export function makeSHPGeoArrowGeometryTable(
|
|
|
32
32
|
options?: SHPLoaderOptions,
|
|
33
33
|
geoArrowOptions?: SHPGeoArrowGeometryOptions
|
|
34
34
|
): ArrowTable {
|
|
35
|
-
const header = parseSHPHeader(new DataView(arrayBuffer, 0, SHP_HEADER_SIZE));
|
|
35
|
+
const header = parseSHPHeader(new DataView(arrayBuffer, 0, SHP_HEADER_SIZE), options);
|
|
36
36
|
const encoding = getDefaultGeoArrowEncoding(header);
|
|
37
37
|
const builderOptions = {
|
|
38
38
|
encoding,
|
|
@@ -2,7 +2,8 @@
|
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
|
|
5
|
-
import type {
|
|
5
|
+
import type {Table, RecordBatch} from 'apache-arrow';
|
|
6
|
+
import type {Schema, Field} from '@loaders.gl/core/schema';
|
|
6
7
|
import {toArrayBufferIterator} from '@loaders.gl/core/loader-utils';
|
|
7
8
|
import {ArrowTableBuilder} from '@loaders.gl/core/schema-utils';
|
|
8
9
|
import {BinaryChunkReader} from '../streaming/binary-chunk-reader';
|
|
@@ -86,7 +87,7 @@ class DBFParser {
|
|
|
86
87
|
* @param options
|
|
87
88
|
* @returns DBFTable or rows
|
|
88
89
|
*/
|
|
89
|
-
export function parseDBF(arrayBuffer: ArrayBuffer, options: DBFLoaderOptions = {}):
|
|
90
|
+
export function parseDBF(arrayBuffer: ArrayBuffer, options: DBFLoaderOptions = {}): Table {
|
|
90
91
|
const dbfParser = new DBFParser({
|
|
91
92
|
...options,
|
|
92
93
|
dbf: {
|
|
@@ -111,8 +112,8 @@ export function parseDBFInBatches(
|
|
|
111
112
|
| AsyncIterable<ArrayBufferLike | ArrayBufferView>
|
|
112
113
|
| Iterable<ArrayBufferLike | ArrayBufferView>,
|
|
113
114
|
options?: DBFLoaderOptions
|
|
114
|
-
): AsyncIterable<
|
|
115
|
-
return parseDBFArrowBatches(iterator, options) as AsyncIterable<
|
|
115
|
+
): AsyncIterable<RecordBatch> {
|
|
116
|
+
return parseDBFArrowBatches(iterator, options) as AsyncIterable<RecordBatch>;
|
|
116
117
|
}
|
|
117
118
|
|
|
118
119
|
/** Streams the DBF header and Arrow batches for caller-side legacy row conversion. */
|
|
@@ -122,7 +123,7 @@ export async function* parseDBFArrowBatches(
|
|
|
122
123
|
| Iterable<ArrayBufferLike | ArrayBufferView>,
|
|
123
124
|
options: DBFLoaderOptions = {},
|
|
124
125
|
includeHeader = false
|
|
125
|
-
): AsyncIterable<
|
|
126
|
+
): AsyncIterable<RecordBatch | DBFHeader> {
|
|
126
127
|
const batchSize = options.dbf?.batchSize || Number.POSITIVE_INFINITY;
|
|
127
128
|
|
|
128
129
|
const parser = new DBFParser(options);
|
|
@@ -92,7 +92,7 @@ export async function* parseShapefileInBatches(
|
|
|
92
92
|
propertyIterable[Symbol.asyncIterator]?.() || propertyIterable[Symbol.iterator]();
|
|
93
93
|
}
|
|
94
94
|
|
|
95
|
-
// When `options.metadata` is `true`, there's an extra initial `metadata`
|
|
95
|
+
// When `options.core.metadata` is `true`, there's an extra initial `metadata`
|
|
96
96
|
// object before the iterator starts. zipBatchIterators expects to receive
|
|
97
97
|
// batches of Array objects, and will fail with non-iterable batches, so it's
|
|
98
98
|
// important to skip over the first batch.
|
|
@@ -32,7 +32,7 @@ const SHP_MAGIC_NUMBER = 0x0000270a;
|
|
|
32
32
|
* @param headerView
|
|
33
33
|
* @returns SHPHeader
|
|
34
34
|
*/
|
|
35
|
-
export function parseSHPHeader(headerView: DataView): SHPHeader {
|
|
35
|
+
export function parseSHPHeader(headerView: DataView, options?: LoaderOptions): SHPHeader {
|
|
36
36
|
// Note: The SHP format switches endianness between fields!
|
|
37
37
|
// https://www.esri.com/library/whitepapers/pdfs/shapefile.pdf
|
|
38
38
|
const header = {
|
|
@@ -53,12 +53,11 @@ export function parseSHPHeader(headerView: DataView): SHPHeader {
|
|
|
53
53
|
}
|
|
54
54
|
};
|
|
55
55
|
if (header.magic !== SHP_MAGIC_NUMBER) {
|
|
56
|
-
|
|
57
|
-
console.error(`SHP file: bad magic number ${header.magic}`);
|
|
56
|
+
getLoaderLog(options).error(`SHP file: bad magic number ${header.magic}`)();
|
|
58
57
|
}
|
|
59
58
|
if (header.version !== 1000) {
|
|
60
|
-
|
|
61
|
-
console.error(`SHP file: bad version ${header.version}`);
|
|
59
|
+
getLoaderLog(options).error(`SHP file: bad version ${header.version}`)();
|
|
62
60
|
}
|
|
63
61
|
return header;
|
|
64
62
|
}
|
|
63
|
+
import {getLoaderLog, type LoaderOptions} from '@loaders.gl/core/loader-utils';
|
|
@@ -54,7 +54,7 @@ export function parseSHPToArrow(arrayBuffer: ArrayBuffer, options?: SHPLoaderOpt
|
|
|
54
54
|
return makeSHPGeoArrowGeometryTable(arrayBuffer, options);
|
|
55
55
|
}
|
|
56
56
|
|
|
57
|
-
const header = parseSHPHeader(new DataView(arrayBuffer, 0, SHP_HEADER_SIZE));
|
|
57
|
+
const header = parseSHPHeader(new DataView(arrayBuffer, 0, SHP_HEADER_SIZE), options);
|
|
58
58
|
const schema = buildOutputSchema(header);
|
|
59
59
|
return makeSHPWKBGeometryArrowTable(arrayBuffer, schema, options);
|
|
60
60
|
}
|
|
@@ -180,5 +180,5 @@ function makeEmptyArrowBatch(schema: ArrowTable['schema']): ArrowTableBatch {
|
|
|
180
180
|
throw new Error('SHP Arrow batch requires a schema');
|
|
181
181
|
}
|
|
182
182
|
const table = new ArrowTableBuilder(schema).finishTable();
|
|
183
|
-
return makeTableScanBatch({
|
|
183
|
+
return makeTableScanBatch({shape: 'arrow-table', data: table, schema});
|
|
184
184
|
}
|
|
@@ -16,7 +16,7 @@ export type SHPLoaderOptions = StrictLoaderOptions & {
|
|
|
16
16
|
geoarrow?: {encodingPreference?: GeoArrowEncodingPreference};
|
|
17
17
|
shp?: {
|
|
18
18
|
_maxDimensions?: number;
|
|
19
|
-
shape?: 'arrow
|
|
19
|
+
shape?: 'arrow' | 'wkb';
|
|
20
20
|
geoarrowEncoding?: SHPGeoArrowEncoding;
|
|
21
21
|
/** Preferred encoding for Arrow geometry output. */
|
|
22
22
|
geoarrow?: {encodingPreference?: GeoArrowEncodingPreference};
|
|
@@ -29,7 +29,7 @@ export type SHPLoaderOptions = StrictLoaderOptions & {
|
|
|
29
29
|
export type DBFLoaderOptions = StrictLoaderOptions & {
|
|
30
30
|
dbf?: {
|
|
31
31
|
encoding?: string;
|
|
32
|
-
shape?: 'rows' | 'table' | 'object-row-table' | 'arrow
|
|
32
|
+
shape?: 'rows' | 'table' | 'object-row-table' | 'arrow';
|
|
33
33
|
batchSize?: number;
|
|
34
34
|
/** Override the URL to the worker bundle (by default loads from unpkg.com) */
|
|
35
35
|
workerUrl?: string;
|
|
@@ -40,7 +40,7 @@ export type ShapefileLoaderOptions = StrictLoaderOptions &
|
|
|
40
40
|
SHPLoaderOptions &
|
|
41
41
|
DBFLoaderOptions & {
|
|
42
42
|
shapefile?: {
|
|
43
|
-
shape?: 'geojson-table' | 'arrow
|
|
43
|
+
shape?: 'geojson-table' | 'arrow' | 'v3';
|
|
44
44
|
geoarrowEncoding?: SHPGeoArrowEncoding;
|
|
45
45
|
/** Preferred encoding for Arrow geometry output. */
|
|
46
46
|
geoarrow?: {encodingPreference?: GeoArrowEncodingPreference};
|
|
@@ -2,13 +2,18 @@
|
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
|
|
5
|
+
import {Table, RecordBatch} from 'apache-arrow';
|
|
5
6
|
import {
|
|
6
7
|
serializeArrowWorkerTable,
|
|
8
|
+
serializeNativeArrowWorkerResult,
|
|
9
|
+
deserializeNativeArrowWorkerResult,
|
|
7
10
|
deserializeArrowWorkerTable
|
|
8
|
-
} from '@loaders.gl/core/
|
|
11
|
+
} from '@loaders.gl/core/arrow-worker-transport';
|
|
9
12
|
|
|
10
13
|
/** Transfers owned Arrow columns or WKB buffers, with small SHP/DBF header envelopes. */
|
|
11
14
|
export function serializeShapefileWorkerResult(result: any): unknown {
|
|
15
|
+
if (result instanceof Table || result instanceof RecordBatch)
|
|
16
|
+
return serializeNativeArrowWorkerResult(result);
|
|
12
17
|
if (result?.shape === 'arrow-table') return serializeArrowWorkerTable(result);
|
|
13
18
|
if (
|
|
14
19
|
Array.isArray(result) &&
|
|
@@ -32,7 +37,10 @@ export function serializeShapefileWorkerResult(result: any): unknown {
|
|
|
32
37
|
|
|
33
38
|
/** Restores Arrow instances and binary geometry envelopes without accepting decoded row payloads. */
|
|
34
39
|
export function deserializeShapefileWorkerResult<T>(result: any): T {
|
|
35
|
-
if (result?.
|
|
40
|
+
if (result?.transport === 'arrow-table-columns' || result?.transport === 'arrow-record-batch')
|
|
41
|
+
return deserializeNativeArrowWorkerResult(result) as T;
|
|
42
|
+
if (result?.transport === 'arrow-column-envelope' || result?.shape === 'arrow-table')
|
|
43
|
+
return deserializeArrowWorkerTable(result);
|
|
36
44
|
if (result?.transport === 'shapefile-header') return result.header as T;
|
|
37
45
|
if (result?.transport === 'shp-wkb') {
|
|
38
46
|
return (
|
|
@@ -10,6 +10,7 @@ import {
|
|
|
10
10
|
toArrayBufferIterator
|
|
11
11
|
} from '@loaders.gl/core/loader-utils';
|
|
12
12
|
import * as arrow from 'apache-arrow';
|
|
13
|
+
import {convertArrowToSchema, isNativeArrowRecordBatch} from '@loaders.gl/core/schema-utils';
|
|
13
14
|
import type {
|
|
14
15
|
ArrowTable,
|
|
15
16
|
ArrowTableBatch,
|
|
@@ -96,20 +97,21 @@ export async function parseShapefileToArrow(
|
|
|
96
97
|
? await context.fetch(replaceExtension(context.url, 'dbf')).catch(() => null)
|
|
97
98
|
: null;
|
|
98
99
|
if (dbfResponse?.ok) {
|
|
99
|
-
|
|
100
|
+
const propertyData = (await parseFromContext(
|
|
100
101
|
dbfResponse as any,
|
|
101
102
|
DBFLoaderWithParser,
|
|
102
103
|
{
|
|
103
104
|
...options,
|
|
104
105
|
dbf: {
|
|
105
106
|
...options?.dbf,
|
|
106
|
-
shape: 'arrow
|
|
107
|
+
shape: 'arrow' as const,
|
|
107
108
|
encoding: cpg || 'latin1'
|
|
108
109
|
}
|
|
109
110
|
},
|
|
110
111
|
context!
|
|
111
|
-
)) as
|
|
112
|
-
propertySchema =
|
|
112
|
+
)) as arrow.Table;
|
|
113
|
+
propertySchema = convertArrowToSchema(propertyData.schema);
|
|
114
|
+
propertyTable = {shape: 'arrow-table', data: propertyData, schema: propertySchema};
|
|
113
115
|
}
|
|
114
116
|
|
|
115
117
|
const schema = buildOutputSchema(propertySchema, header, geometryTable.schema);
|
|
@@ -133,13 +135,22 @@ export async function* parseShapefileToArrowInBatches(
|
|
|
133
135
|
|
|
134
136
|
const {cpg, prj, shx} = await loadShapefileSidecarFiles(options, context);
|
|
135
137
|
const batchSize =
|
|
136
|
-
|
|
138
|
+
typeof options?.core?.batchSize === 'number'
|
|
139
|
+
? options.core.batchSize
|
|
140
|
+
: (options?.shapefile?.batchSize ??
|
|
141
|
+
options?.shp?.batchSize ??
|
|
142
|
+
options?.dbf?.batchSize ??
|
|
143
|
+
10000);
|
|
144
|
+
const childOptions = {
|
|
145
|
+
...options,
|
|
146
|
+
core: {...options?.core, batchMaxRowsPerSecond: 0}
|
|
147
|
+
};
|
|
137
148
|
|
|
138
149
|
const shapeIterable = await parseInBatchesFromContext(
|
|
139
150
|
toArrayBufferIterator(asyncIterator),
|
|
140
151
|
SHPLoaderWithParser,
|
|
141
152
|
{
|
|
142
|
-
...
|
|
153
|
+
...childOptions,
|
|
143
154
|
shp: {
|
|
144
155
|
...options?.shp,
|
|
145
156
|
shape: 'wkb',
|
|
@@ -161,10 +172,10 @@ export async function* parseShapefileToArrowInBatches(
|
|
|
161
172
|
: null;
|
|
162
173
|
if (dbfResponse?.ok) {
|
|
163
174
|
const dbfOptions = {
|
|
164
|
-
...
|
|
175
|
+
...childOptions,
|
|
165
176
|
dbf: {
|
|
166
177
|
...options?.dbf,
|
|
167
|
-
shape: 'arrow
|
|
178
|
+
shape: 'arrow' as const,
|
|
168
179
|
batchSize,
|
|
169
180
|
encoding: cpg || 'latin1'
|
|
170
181
|
}
|
|
@@ -418,18 +429,58 @@ async function getNextNonMetadataValue(iterator: AsyncIterator<any>): Promise<an
|
|
|
418
429
|
}
|
|
419
430
|
}
|
|
420
431
|
|
|
432
|
+
/** Reads both native and legacy DBF column batches. */
|
|
421
433
|
async function getNextArrowBatch(iterator: AsyncIterator<any>): Promise<ArrowTableBatch | null> {
|
|
422
434
|
while (true) {
|
|
423
435
|
const result = await iterator.next();
|
|
424
436
|
if (result.done) {
|
|
425
437
|
return null;
|
|
426
438
|
}
|
|
427
|
-
if (result.value
|
|
428
|
-
|
|
439
|
+
if (isNativeArrowRecordBatch(result.value)) {
|
|
440
|
+
const recordBatch = result.value;
|
|
441
|
+
const schema = convertArrowToSchema(recordBatch.schema);
|
|
442
|
+
const batch =
|
|
443
|
+
Object.getPrototypeOf(recordBatch) === arrow.RecordBatch.prototype
|
|
444
|
+
? recordBatch
|
|
445
|
+
: importDBFRecordBatch(recordBatch, schema);
|
|
446
|
+
const data = new arrow.Table(batch.schema, [batch]);
|
|
447
|
+
return makeTableScanBatch({
|
|
448
|
+
shape: 'arrow-table',
|
|
449
|
+
schema,
|
|
450
|
+
data
|
|
451
|
+
});
|
|
429
452
|
}
|
|
453
|
+
if (result.value?.shape === 'arrow-table') return result.value;
|
|
430
454
|
}
|
|
431
455
|
}
|
|
432
456
|
|
|
457
|
+
/** Rebuilds primitive DBF columns with local Arrow classes while reusing their buffers. */
|
|
458
|
+
function importDBFRecordBatch(
|
|
459
|
+
batch: arrow.RecordBatch,
|
|
460
|
+
tableSchema: TableSchema
|
|
461
|
+
): arrow.RecordBatch {
|
|
462
|
+
const schema = convertSchemaToArrow(tableSchema);
|
|
463
|
+
const children = batch.data.children.map(
|
|
464
|
+
(column, index) =>
|
|
465
|
+
new arrow.Data(
|
|
466
|
+
schema.fields[index].type,
|
|
467
|
+
column.offset,
|
|
468
|
+
column.length,
|
|
469
|
+
column.nullCount,
|
|
470
|
+
column.buffers,
|
|
471
|
+
undefined,
|
|
472
|
+
undefined,
|
|
473
|
+
column.variadicBuffers
|
|
474
|
+
)
|
|
475
|
+
);
|
|
476
|
+
const data = arrow.makeData({
|
|
477
|
+
type: new arrow.Struct(schema.fields),
|
|
478
|
+
length: batch.numRows,
|
|
479
|
+
children
|
|
480
|
+
});
|
|
481
|
+
return new arrow.RecordBatch(schema, data, new Map(batch.metadata));
|
|
482
|
+
}
|
|
483
|
+
|
|
433
484
|
function getQueuedRowCount(queue: arrow.Table[]): number {
|
|
434
485
|
return queue.reduce((rowCount, table) => rowCount + table.numRows, 0);
|
|
435
486
|
}
|
|
@@ -448,5 +499,5 @@ function takeRowsFromQueue(queue: arrow.Table[], rowCount: number): arrow.Table
|
|
|
448
499
|
/** Creates an explicit empty Arrow batch so zero-row shapefiles still expose schema in batch mode. */
|
|
449
500
|
function makeEmptyArrowBatch(schema: TableSchema): ArrowTableBatch {
|
|
450
501
|
const table = new ArrowTableBuilder(schema).finishTable();
|
|
451
|
-
return makeTableScanBatch({
|
|
502
|
+
return makeTableScanBatch({shape: 'arrow-table', data: table, schema});
|
|
452
503
|
}
|
|
@@ -7,13 +7,8 @@ import type {
|
|
|
7
7
|
StrictLoaderOptions,
|
|
8
8
|
Loader
|
|
9
9
|
} from '@loaders.gl/core/loader-utils';
|
|
10
|
-
import type {
|
|
11
|
-
|
|
12
|
-
GeoArrowEncodingPreference,
|
|
13
|
-
GeoJSONTable,
|
|
14
|
-
ArrowTable,
|
|
15
|
-
ArrowTableBatch
|
|
16
|
-
} from '@loaders.gl/core/schema';
|
|
10
|
+
import type {Table, RecordBatch} from 'apache-arrow';
|
|
11
|
+
import type {Batch, GeoArrowEncodingPreference, GeoJSONTable} from '@loaders.gl/core/schema';
|
|
17
12
|
import type {SHPLoaderOptions} from './shp-loader-types';
|
|
18
13
|
import type {ShapefileOutput} from './lib/parsers/parse-shapefile';
|
|
19
14
|
import type {DBFLoaderOptions} from './dbf-loader-types';
|
|
@@ -32,7 +27,7 @@ export type ShapefileLoaderOptions = StrictLoaderOptions &
|
|
|
32
27
|
shapefile?: {
|
|
33
28
|
/** Overrides the browser worker bundle URL. */
|
|
34
29
|
workerUrl?: string;
|
|
35
|
-
shape?: 'geojson-table' | 'arrow
|
|
30
|
+
shape?: 'geojson-table' | 'arrow' | 'v3';
|
|
36
31
|
geoarrowEncoding?: SHPGeoArrowEncoding;
|
|
37
32
|
/** Preferred encoding for Arrow geometry output. */
|
|
38
33
|
geoarrow?: {encodingPreference?: GeoArrowEncodingPreference};
|
|
@@ -44,23 +39,23 @@ export type ShapefileLoaderOptions = StrictLoaderOptions &
|
|
|
44
39
|
|
|
45
40
|
/** Preloads the parser-bearing Shapefile loader implementation. */
|
|
46
41
|
async function preloadShapefileLoader() {
|
|
47
|
-
const {ShapefileLoaderWithParser} = await import(
|
|
48
|
-
'@loaders.gl/geospatial/shapefile/shapefile-loader'
|
|
49
|
-
);
|
|
42
|
+
const {ShapefileLoaderWithParser} = await import('@loaders.gl/geospatial/shapefile-loader');
|
|
50
43
|
return ShapefileLoaderWithParser;
|
|
51
44
|
}
|
|
52
45
|
|
|
53
46
|
/** Metadata-only Shapefile loader. */
|
|
54
47
|
export const ShapefileLoader = {
|
|
55
|
-
|
|
56
|
-
|
|
48
|
+
defaultShape: 'arrow',
|
|
49
|
+
supportsNativeArrow: true,
|
|
50
|
+
dataType: null as unknown as ShapefileOutput | GeoJSONTable | Table,
|
|
51
|
+
batchType: null as unknown as ShapefileOutput | Batch | RecordBatch,
|
|
57
52
|
...ShapefileFormat,
|
|
58
53
|
version: VERSION,
|
|
59
54
|
worker: true,
|
|
60
55
|
workerInBatches: true,
|
|
61
56
|
options: {
|
|
62
57
|
shapefile: {
|
|
63
|
-
shape: 'arrow
|
|
58
|
+
shape: 'arrow'
|
|
64
59
|
},
|
|
65
60
|
shp: {
|
|
66
61
|
_maxDimensions: 4
|
|
@@ -68,7 +63,7 @@ export const ShapefileLoader = {
|
|
|
68
63
|
},
|
|
69
64
|
preload: preloadShapefileLoader
|
|
70
65
|
} as const satisfies Loader<
|
|
71
|
-
ShapefileOutput | GeoJSONTable |
|
|
72
|
-
ShapefileOutput | Batch |
|
|
66
|
+
ShapefileOutput | GeoJSONTable | Table,
|
|
67
|
+
ShapefileOutput | Batch | RecordBatch,
|
|
73
68
|
ShapefileLoaderOptions
|
|
74
69
|
>;
|
|
@@ -3,6 +3,8 @@ import {convertWKBToGeometry} from '@loaders.gl/core/arrow-geometry/geometry-cod
|
|
|
3
3
|
// SPDX-License-Identifier: MIT
|
|
4
4
|
// Copyright (c) vis.gl contributors
|
|
5
5
|
|
|
6
|
+
import type {Table, RecordBatch} from 'apache-arrow';
|
|
7
|
+
import {makeArrowMetadataBatch} from '@loaders.gl/core/schema-utils';
|
|
6
8
|
import type {StrictLoaderOptions, LoaderWithParser} from '@loaders.gl/core/loader-utils';
|
|
7
9
|
import type {
|
|
8
10
|
Batch,
|
|
@@ -38,7 +40,7 @@ export type ShapefileLoaderOptions = StrictLoaderOptions &
|
|
|
38
40
|
shapefile?: {
|
|
39
41
|
/** Overrides the browser worker bundle URL. */
|
|
40
42
|
workerUrl?: string;
|
|
41
|
-
shape?: 'geojson-table' | 'arrow
|
|
43
|
+
shape?: 'geojson-table' | 'arrow' | 'v3';
|
|
42
44
|
geoarrowEncoding?: SHPGeoArrowEncoding;
|
|
43
45
|
/** Preferred encoding for Arrow geometry output. */
|
|
44
46
|
geoarrow?: {encodingPreference?: GeoArrowEncodingPreference};
|
|
@@ -51,14 +53,16 @@ export type ShapefileLoaderOptions = StrictLoaderOptions &
|
|
|
51
53
|
* Shapefile loader
|
|
52
54
|
* @note Shapefile is multifile format and requires providing additional files
|
|
53
55
|
*/
|
|
54
|
-
export const
|
|
56
|
+
export const ShapefileColumnLoader = {
|
|
55
57
|
...ShapefileLoaderMetadataWithoutPreload,
|
|
58
|
+
dataType: null as unknown as ShapefileOutput | GeoJSONTable | ArrowTable,
|
|
59
|
+
batchType: null as unknown as ShapefileOutput | Batch | ArrowTableBatch,
|
|
56
60
|
parse: (arrayBuffer, options, context) =>
|
|
57
|
-
getShapefileShape(options) === 'arrow
|
|
61
|
+
getShapefileShape(options) === 'arrow'
|
|
58
62
|
? parseShapefileToArrow(arrayBuffer, options, context)
|
|
59
63
|
: parseShapefile(arrayBuffer, options, context),
|
|
60
64
|
parseInBatches: (asyncIterator, options, context) =>
|
|
61
|
-
getShapefileShape(options) === 'arrow
|
|
65
|
+
getShapefileShape(options) === 'arrow'
|
|
62
66
|
? parseShapefileToArrowInBatches(asyncIterator, options, context)
|
|
63
67
|
: parseShapefileInBatches(asyncIterator, options, context),
|
|
64
68
|
serializeWorkerResult: serializeShapefileWorkerResult,
|
|
@@ -74,13 +78,13 @@ export const ShapefileLoaderWithParser = {
|
|
|
74
78
|
function getShapefileShape(
|
|
75
79
|
options?: ShapefileLoaderOptions
|
|
76
80
|
): NonNullable<ShapefileLoaderOptions['shapefile']>['shape'] {
|
|
77
|
-
return options?.shapefile?.shape || 'arrow
|
|
81
|
+
return options?.shapefile?.shape || 'arrow';
|
|
78
82
|
}
|
|
79
83
|
|
|
80
84
|
/** Materializes requested GeoJSON features from hydrated WKB and property columns on the caller. */
|
|
81
85
|
function deserializeShapefileOutput(result: unknown, options?: ShapefileLoaderOptions): any {
|
|
82
86
|
const table = deserializeShapefileWorkerResult<ArrowTable & {loaderData?: object}>(result);
|
|
83
|
-
if (getShapefileShape(options) === 'arrow
|
|
87
|
+
if (getShapefileShape(options) === 'arrow') return table;
|
|
84
88
|
const features = table.data.toArray().map(row => {
|
|
85
89
|
const {geometry, ...properties} = row.toJSON();
|
|
86
90
|
return {
|
|
@@ -103,3 +107,68 @@ function deserializeShapefileOutput(result: unknown, options?: ShapefileLoaderOp
|
|
|
103
107
|
}
|
|
104
108
|
return {...table.loaderData, data: features};
|
|
105
109
|
}
|
|
110
|
+
|
|
111
|
+
/** Exposes native Arrow output after parsing or worker hydration. */
|
|
112
|
+
export const ShapefileLoaderWithParser = {
|
|
113
|
+
...ShapefileColumnLoader,
|
|
114
|
+
dataType: null as unknown as ShapefileOutput | GeoJSONTable | Table,
|
|
115
|
+
batchType: null as unknown as ShapefileOutput | Batch | RecordBatch,
|
|
116
|
+
async parse(input, options, context) {
|
|
117
|
+
return unwrapShapefileTable(await ShapefileColumnLoader.parse!(input, options, context));
|
|
118
|
+
},
|
|
119
|
+
async *parseInBatches(input, options, context) {
|
|
120
|
+
for await (const batch of ShapefileColumnLoader.parseInBatches!(input, options, context)) {
|
|
121
|
+
if (isShapefileArrowTable(batch)) {
|
|
122
|
+
const table = unwrapShapefileTable(batch);
|
|
123
|
+
if (table.batches.length) yield* table.batches;
|
|
124
|
+
else yield makeArrowMetadataBatch(table.schema);
|
|
125
|
+
} else yield batch;
|
|
126
|
+
}
|
|
127
|
+
},
|
|
128
|
+
deserializeWorkerResult(result, options) {
|
|
129
|
+
return unwrapShapefileTable(deserializeShapefileOutput(result, options));
|
|
130
|
+
},
|
|
131
|
+
deserializeWorkerBatch(result, options) {
|
|
132
|
+
const batch = deserializeShapefileOutput(result, options);
|
|
133
|
+
if (!isShapefileArrowTable(batch)) return batch;
|
|
134
|
+
const table = unwrapShapefileTable(batch);
|
|
135
|
+
return table.batches[0] ?? makeArrowMetadataBatch(table.schema);
|
|
136
|
+
}
|
|
137
|
+
} as const satisfies LoaderWithParser<
|
|
138
|
+
ShapefileOutput | GeoJSONTable | Table,
|
|
139
|
+
ShapefileOutput | Batch | RecordBatch,
|
|
140
|
+
ShapefileLoaderOptions
|
|
141
|
+
>;
|
|
142
|
+
|
|
143
|
+
/** Identifies Arrow output from the private column parser. */
|
|
144
|
+
function isShapefileArrowTable(result: unknown): result is ArrowTable {
|
|
145
|
+
return (result as {shape?: string} | null)?.shape === 'arrow-table';
|
|
146
|
+
}
|
|
147
|
+
|
|
148
|
+
/** Unwraps Arrow columns and passes through legacy results. */
|
|
149
|
+
function unwrapShapefileTable(result: ArrowTable): Table;
|
|
150
|
+
function unwrapShapefileTable<T>(result: T): Exclude<T, ArrowTable> | Table;
|
|
151
|
+
function unwrapShapefileTable(result: unknown): unknown {
|
|
152
|
+
if (!isShapefileArrowTable(result)) return result;
|
|
153
|
+
const loaderData = (
|
|
154
|
+
result as ArrowTable & {
|
|
155
|
+
loaderData?: {
|
|
156
|
+
header?: unknown;
|
|
157
|
+
encoding?: string;
|
|
158
|
+
prj?: string;
|
|
159
|
+
shx?: {offsets: Int32Array; lengths: Int32Array};
|
|
160
|
+
};
|
|
161
|
+
}
|
|
162
|
+
).loaderData;
|
|
163
|
+
if (loaderData) {
|
|
164
|
+
const {shx, ...header} = loaderData;
|
|
165
|
+
const metadata = JSON.stringify({
|
|
166
|
+
...header,
|
|
167
|
+
...(shx ? {shx: {offsets: Array.from(shx.offsets), lengths: Array.from(shx.lengths)}} : {})
|
|
168
|
+
});
|
|
169
|
+
result.data.schema.metadata.set('loaders.gl.shapefile.header', metadata);
|
|
170
|
+
for (const batch of result.data.batches)
|
|
171
|
+
batch.schema.metadata.set('loaders.gl.shapefile.header', metadata);
|
|
172
|
+
}
|
|
173
|
+
return result.data;
|
|
174
|
+
}
|