@loaders.gl/geospatial 5.0.0-beta.1 → 5.0.0-beta.11
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 +81 -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 +1557 -689
- 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 +5 -19
- package/dist/flatgeobuf/lib/parse-flatgeobuf.cjs.map +2 -2
- package/dist/flatgeobuf/lib/parse-flatgeobuf.d.ts +7 -6
- package/dist/flatgeobuf/lib/parse-flatgeobuf.d.ts.map +1 -1
- package/dist/flatgeobuf/lib/parse-flatgeobuf.js +8 -21
- 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 +5610 -1943
- 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 +37 -37
- 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 +41 -41
- 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 +2 -2
- package/dist/geopackage/lib/parse-geopackage.cjs.map +2 -2
- package/dist/geopackage/lib/parse-geopackage.d.ts +5 -4
- package/dist/geopackage/lib/parse-geopackage.d.ts.map +1 -1
- package/dist/geopackage/lib/parse-geopackage.js +2 -3
- 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.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.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 +21 -13
- 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 +27 -17
- 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 +2 -6
- package/dist/shapefile/lib/parsers/build-geoarrow-geometry-arrow.cjs.map +2 -2
- package/dist/shapefile/lib/parsers/build-geoarrow-geometry-arrow.d.ts +5 -4
- package/dist/shapefile/lib/parsers/build-geoarrow-geometry-arrow.d.ts.map +1 -1
- package/dist/shapefile/lib/parsers/build-geoarrow-geometry-arrow.js +3 -7
- package/dist/shapefile/lib/parsers/build-geoarrow-geometry-arrow.js.map +1 -1
- package/dist/shapefile/lib/parsers/build-wkb-geometry-arrow.cjs.map +2 -2
- package/dist/shapefile/lib/parsers/build-wkb-geometry-arrow.d.ts +4 -3
- package/dist/shapefile/lib/parsers/build-wkb-geometry-arrow.d.ts.map +1 -1
- package/dist/shapefile/lib/parsers/build-wkb-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 +8 -11
- package/dist/shapefile/lib/parsers/parse-shp-to-arrow.cjs.map +2 -2
- package/dist/shapefile/lib/parsers/parse-shp-to-arrow.d.ts +3 -3
- package/dist/shapefile/lib/parsers/parse-shp-to-arrow.d.ts.map +1 -1
- package/dist/shapefile/lib/parsers/parse-shp-to-arrow.js +12 -10
- 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 +6 -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 +6 -5
- package/dist/shapefile/lib/shapefile-worker-transport.js.map +1 -1
- package/dist/shapefile/shapefile-arrow-loader.cjs +87 -46
- package/dist/shapefile/shapefile-arrow-loader.cjs.map +3 -3
- package/dist/shapefile/shapefile-arrow-loader.d.ts +5 -3
- package/dist/shapefile/shapefile-arrow-loader.d.ts.map +1 -1
- package/dist/shapefile/shapefile-arrow-loader.js +81 -44
- 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 +25 -12
- package/dist/shapefile/shapefile-loader.cjs.map +2 -2
- package/dist/shapefile/shapefile-loader.d.ts +12 -12
- package/dist/shapefile/shapefile-loader.d.ts.map +1 -1
- package/dist/shapefile/shapefile-loader.js +27 -14
- 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 +10 -5
- package/dist/shapefile/shp-loader.cjs.map +2 -2
- package/dist/shapefile/shp-loader.d.ts +77 -3
- package/dist/shapefile/shp-loader.d.ts.map +1 -1
- package/dist/shapefile/shp-loader.js +14 -7
- 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 +420 -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 +88 -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 +27319 -25590
- 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 +65 -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 +3757 -2205
- 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 +3 -3
- package/dist/workers/shapefile-worker.cjs.map +2 -2
- package/dist/workers/shapefile-worker.js +3 -5
- package/dist/workers/shapefile-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 +16 -34
- 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 +56 -57
- package/src/geopackage/index.ts +1 -1
- package/src/geopackage/lib/parse-geopackage.ts +6 -6
- 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 +3 -9
- 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 +40 -27
- package/src/shapefile/index.ts +0 -6
- package/src/shapefile/lib/parsers/build-geoarrow-geometry-arrow.ts +6 -10
- package/src/shapefile/lib/parsers/build-wkb-geometry-arrow.ts +4 -3
- 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 +15 -21
- 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 +8 -5
- package/src/shapefile/shapefile-arrow-loader.ts +120 -63
- package/src/shapefile/shapefile-loader-types.ts +11 -16
- package/src/shapefile/shapefile-loader.ts +45 -26
- package/src/shapefile/shp-loader-types.ts +6 -11
- package/src/shapefile/shp-loader.ts +21 -14
- 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 +3 -6
|
@@ -4,19 +4,14 @@
|
|
|
4
4
|
|
|
5
5
|
import {CRSReprojectionError, type LoaderContext} from '@loaders.gl/core/loader-utils';
|
|
6
6
|
import {
|
|
7
|
-
makeTableScanBatch,
|
|
8
7
|
parseFromContext,
|
|
9
8
|
parseInBatchesFromContext,
|
|
10
9
|
toArrayBufferIterator
|
|
11
10
|
} from '@loaders.gl/core/loader-utils';
|
|
12
11
|
import * as arrow from 'apache-arrow';
|
|
13
|
-
import
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
Field,
|
|
17
|
-
Schema as TableSchema
|
|
18
|
-
} from '@loaders.gl/core/schema';
|
|
19
|
-
import {ArrowTableBuilder, convertSchemaToArrow} from '@loaders.gl/core/schema-utils';
|
|
12
|
+
import {convertArrowToSchema, isArrowRecordBatch} from '@loaders.gl/core/schema-utils';
|
|
13
|
+
import type {Field, Schema as TableSchema} from '@loaders.gl/core/schema';
|
|
14
|
+
import {makeArrowMetadataBatch, convertSchemaToArrow} from '@loaders.gl/core/schema-utils';
|
|
20
15
|
import {convertFeaturesToGeoArrowTable} from '@loaders.gl/core/arrow-geometry/feature-table';
|
|
21
16
|
import {convertWKBToGeometry} from '@loaders.gl/core/arrow-geometry/geometry-codecs';
|
|
22
17
|
import {type GeoParquetGeometryType} from '@loaders.gl/core/schema';
|
|
@@ -44,12 +39,12 @@ export async function parseShapefileToArrow(
|
|
|
44
39
|
arrayBuffer: ArrayBuffer,
|
|
45
40
|
options?: ShapefileLoaderOptions,
|
|
46
41
|
context?: LoaderContext
|
|
47
|
-
): Promise<
|
|
42
|
+
): Promise<arrow.Table> {
|
|
48
43
|
const {cpg, prj, shx} = await loadShapefileSidecarFiles(options, context);
|
|
49
44
|
const transform = getReprojectionTransform(prj, options);
|
|
50
45
|
const geoArrowEncoding = getTypedGeoArrowEncoding(options);
|
|
51
46
|
let header: SHPHeader | undefined;
|
|
52
|
-
let geometryTable:
|
|
47
|
+
let geometryTable: arrow.Table;
|
|
53
48
|
|
|
54
49
|
if (geoArrowEncoding) {
|
|
55
50
|
geometryTable = makeSHPGeoArrowGeometryTable(arrayBuffer, options, {transform});
|
|
@@ -76,7 +71,7 @@ export async function parseShapefileToArrow(
|
|
|
76
71
|
options?.geoarrow?.encodingPreference === 'geoarrow.geometry' ||
|
|
77
72
|
options?.shapefile?.geoarrow?.encodingPreference === 'geoarrow.geometry'
|
|
78
73
|
) {
|
|
79
|
-
const geometryColumn = geometryTable.
|
|
74
|
+
const geometryColumn = geometryTable.getChild(GEOMETRY_COLUMN_NAME);
|
|
80
75
|
const geometries = geometryColumn?.toArray() || [];
|
|
81
76
|
geometryTable = convertFeaturesToGeoArrowTable(
|
|
82
77
|
geometries.map(geometry => ({
|
|
@@ -90,33 +85,41 @@ export async function parseShapefileToArrow(
|
|
|
90
85
|
}
|
|
91
86
|
|
|
92
87
|
let propertySchema: TableSchema | null = null;
|
|
93
|
-
let propertyTable:
|
|
88
|
+
let propertyTable: arrow.Table | null = null;
|
|
94
89
|
|
|
95
90
|
const dbfResponse = context?.url
|
|
96
91
|
? await context.fetch(replaceExtension(context.url, 'dbf')).catch(() => null)
|
|
97
92
|
: null;
|
|
98
93
|
if (dbfResponse?.ok) {
|
|
99
|
-
|
|
94
|
+
const propertyData = (await parseFromContext(
|
|
100
95
|
dbfResponse as any,
|
|
101
96
|
DBFLoaderWithParser,
|
|
102
97
|
{
|
|
103
98
|
...options,
|
|
104
99
|
dbf: {
|
|
105
100
|
...options?.dbf,
|
|
106
|
-
shape: 'arrow
|
|
101
|
+
shape: 'arrow' as const,
|
|
107
102
|
encoding: cpg || 'latin1'
|
|
108
103
|
}
|
|
109
104
|
},
|
|
110
105
|
context!
|
|
111
|
-
)) as
|
|
112
|
-
propertySchema =
|
|
106
|
+
)) as arrow.Table;
|
|
107
|
+
propertySchema = convertArrowToSchema(propertyData.schema);
|
|
108
|
+
propertyTable = propertyData;
|
|
113
109
|
}
|
|
114
110
|
|
|
115
|
-
const schema = buildOutputSchema(
|
|
111
|
+
const schema = buildOutputSchema(
|
|
112
|
+
propertySchema,
|
|
113
|
+
header,
|
|
114
|
+
convertArrowToSchema(geometryTable.schema)
|
|
115
|
+
);
|
|
116
116
|
const table = propertyTable
|
|
117
117
|
? appendGeometryColumnToArrowTable(propertyTable, geometryTable, schema)
|
|
118
118
|
: geometryTable;
|
|
119
|
-
|
|
119
|
+
const encoded = encodeShapefileHeader({header, encoding: cpg, prj, shx});
|
|
120
|
+
table.schema.metadata.set(SHAPEFILE_HEADER_KEY, encoded);
|
|
121
|
+
for (const batch of table.batches) batch.schema.metadata.set(SHAPEFILE_HEADER_KEY, encoded);
|
|
122
|
+
return table;
|
|
120
123
|
}
|
|
121
124
|
|
|
122
125
|
/** Parses a shapefile into Arrow batches while keeping DBF-derived schema stable. */
|
|
@@ -126,20 +129,29 @@ export async function* parseShapefileToArrowInBatches(
|
|
|
126
129
|
| Iterable<ArrayBufferLike | ArrayBufferView>,
|
|
127
130
|
options?: ShapefileLoaderOptions,
|
|
128
131
|
context?: LoaderContext
|
|
129
|
-
): AsyncIterable<
|
|
132
|
+
): AsyncIterable<arrow.RecordBatch> {
|
|
130
133
|
if (getTypedGeoArrowEncoding(options)) {
|
|
131
134
|
throw new Error('Typed GeoArrow shapefile output is only supported for non-streaming parse.');
|
|
132
135
|
}
|
|
133
136
|
|
|
134
137
|
const {cpg, prj, shx} = await loadShapefileSidecarFiles(options, context);
|
|
135
138
|
const batchSize =
|
|
136
|
-
|
|
139
|
+
typeof options?.core?.batchSize === 'number'
|
|
140
|
+
? options.core.batchSize
|
|
141
|
+
: (options?.shapefile?.batchSize ??
|
|
142
|
+
options?.shp?.batchSize ??
|
|
143
|
+
options?.dbf?.batchSize ??
|
|
144
|
+
10000);
|
|
145
|
+
const childOptions = {
|
|
146
|
+
...options,
|
|
147
|
+
core: {...options?.core, batchMaxRowsPerSecond: 0}
|
|
148
|
+
};
|
|
137
149
|
|
|
138
150
|
const shapeIterable = await parseInBatchesFromContext(
|
|
139
151
|
toArrayBufferIterator(asyncIterator),
|
|
140
152
|
SHPLoaderWithParser,
|
|
141
153
|
{
|
|
142
|
-
...
|
|
154
|
+
...childOptions,
|
|
143
155
|
shp: {
|
|
144
156
|
...options?.shp,
|
|
145
157
|
shape: 'wkb',
|
|
@@ -152,6 +164,7 @@ export async function* parseShapefileToArrowInBatches(
|
|
|
152
164
|
|
|
153
165
|
const shapeHeader = await getNextNonMetadataValue(shapeIterator);
|
|
154
166
|
const header = shapeHeader as SHPHeader;
|
|
167
|
+
const encodedHeader = encodeShapefileHeader({header, encoding: cpg, prj, shx});
|
|
155
168
|
|
|
156
169
|
let propertyIterator: AsyncIterator<any> | null = null;
|
|
157
170
|
let propertySchema: TableSchema | null = null;
|
|
@@ -161,10 +174,10 @@ export async function* parseShapefileToArrowInBatches(
|
|
|
161
174
|
: null;
|
|
162
175
|
if (dbfResponse?.ok) {
|
|
163
176
|
const dbfOptions = {
|
|
164
|
-
...
|
|
177
|
+
...childOptions,
|
|
165
178
|
dbf: {
|
|
166
179
|
...options?.dbf,
|
|
167
|
-
shape: 'arrow
|
|
180
|
+
shape: 'arrow' as const,
|
|
168
181
|
batchSize,
|
|
169
182
|
encoding: cpg || 'latin1'
|
|
170
183
|
}
|
|
@@ -178,14 +191,14 @@ export async function* parseShapefileToArrowInBatches(
|
|
|
178
191
|
propertyIterator = getAsyncIterator(propertyIterable);
|
|
179
192
|
|
|
180
193
|
const firstPropertyBatch = await getNextArrowBatch(propertyIterator);
|
|
181
|
-
propertySchema = firstPropertyBatch
|
|
194
|
+
propertySchema = firstPropertyBatch ? convertArrowToSchema(firstPropertyBatch.schema) : null;
|
|
182
195
|
const outputSchema = buildOutputSchema(propertySchema, header);
|
|
183
196
|
const propertyQueue: arrow.Table[] = [];
|
|
184
197
|
const geometryQueue: arrow.Table[] = [];
|
|
185
198
|
let yieldedDataBatch = false;
|
|
186
199
|
|
|
187
|
-
if (firstPropertyBatch && firstPropertyBatch.
|
|
188
|
-
propertyQueue.push(firstPropertyBatch.
|
|
200
|
+
if (firstPropertyBatch && firstPropertyBatch.numRows > 0) {
|
|
201
|
+
propertyQueue.push(new arrow.Table(firstPropertyBatch.schema, [firstPropertyBatch]));
|
|
189
202
|
}
|
|
190
203
|
|
|
191
204
|
let shapeDone = false;
|
|
@@ -204,7 +217,6 @@ export async function* parseShapefileToArrowInBatches(
|
|
|
204
217
|
const transform = getReprojectionTransform(prj, options);
|
|
205
218
|
geometryQueue.push(
|
|
206
219
|
makeGeometryArrowTable(shapeBatch.value as (SHPWKBGeometry | null)[], header, transform)
|
|
207
|
-
.data
|
|
208
220
|
);
|
|
209
221
|
}
|
|
210
222
|
}
|
|
@@ -213,8 +225,8 @@ export async function* parseShapefileToArrowInBatches(
|
|
|
213
225
|
const propertyBatch = await getNextArrowBatch(propertyIterator);
|
|
214
226
|
if (!propertyBatch) {
|
|
215
227
|
propertyDone = true;
|
|
216
|
-
} else if (propertyBatch.
|
|
217
|
-
propertyQueue.push(propertyBatch.
|
|
228
|
+
} else if (propertyBatch.numRows > 0) {
|
|
229
|
+
propertyQueue.push(new arrow.Table(propertyBatch.schema, [propertyBatch]));
|
|
218
230
|
}
|
|
219
231
|
}
|
|
220
232
|
|
|
@@ -231,16 +243,14 @@ export async function* parseShapefileToArrowInBatches(
|
|
|
231
243
|
|
|
232
244
|
const propertyTable = takeRowsFromQueue(propertyQueue, rowCount);
|
|
233
245
|
const geometryTable = takeRowsFromQueue(geometryQueue, rowCount);
|
|
234
|
-
const batch = appendGeometryColumnToArrowTable(
|
|
235
|
-
{shape: 'arrow-table', schema: propertySchema || undefined, data: propertyTable},
|
|
236
|
-
{shape: 'arrow-table', data: geometryTable},
|
|
237
|
-
outputSchema
|
|
238
|
-
);
|
|
246
|
+
const batch = appendGeometryColumnToArrowTable(propertyTable, geometryTable, outputSchema);
|
|
239
247
|
yieldedDataBatch = true;
|
|
240
|
-
|
|
248
|
+
const recordBatch = batch.batches[0];
|
|
249
|
+
recordBatch.schema.metadata.set(SHAPEFILE_HEADER_KEY, encodedHeader);
|
|
250
|
+
yield recordBatch;
|
|
241
251
|
}
|
|
242
252
|
if (!yieldedDataBatch) {
|
|
243
|
-
yield
|
|
253
|
+
yield makeEmptyArrowBatch(outputSchema, encodedHeader);
|
|
244
254
|
}
|
|
245
255
|
return;
|
|
246
256
|
}
|
|
@@ -263,13 +273,13 @@ export async function* parseShapefileToArrowInBatches(
|
|
|
263
273
|
transform
|
|
264
274
|
);
|
|
265
275
|
yieldedDataBatch = true;
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
}
|
|
276
|
+
for (const batch of arrowTable.batches) {
|
|
277
|
+
batch.schema.metadata.set(SHAPEFILE_HEADER_KEY, encodedHeader);
|
|
278
|
+
yield batch;
|
|
279
|
+
}
|
|
270
280
|
}
|
|
271
281
|
if (!yieldedDataBatch) {
|
|
272
|
-
yield
|
|
282
|
+
yield makeEmptyArrowBatch(outputSchema, encodedHeader);
|
|
273
283
|
}
|
|
274
284
|
}
|
|
275
285
|
|
|
@@ -309,24 +319,20 @@ function makeGeometryArrowTable(
|
|
|
309
319
|
}
|
|
310
320
|
|
|
311
321
|
function appendGeometryColumnToArrowTable(
|
|
312
|
-
propertyTable:
|
|
313
|
-
geometryTable:
|
|
322
|
+
propertyTable: arrow.Table,
|
|
323
|
+
geometryTable: arrow.Table,
|
|
314
324
|
schema: TableSchema
|
|
315
|
-
):
|
|
316
|
-
const propertyBatch = propertyTable.
|
|
317
|
-
const geometryBatch = geometryTable.
|
|
325
|
+
): arrow.Table {
|
|
326
|
+
const propertyBatch = propertyTable.batches[0];
|
|
327
|
+
const geometryBatch = geometryTable.batches[0];
|
|
318
328
|
const arrowSchema = convertSchemaToArrow(schema);
|
|
319
329
|
const structField = new arrow.Struct(arrowSchema.fields);
|
|
320
330
|
const children = [...propertyBatch.data.children, geometryBatch.data.children[0]];
|
|
321
|
-
const rowCount = Math.max(propertyTable.
|
|
331
|
+
const rowCount = Math.max(propertyTable.numRows, geometryTable.numRows);
|
|
322
332
|
const structData = new arrow.Data(structField, 0, rowCount, 0, undefined, children);
|
|
323
333
|
const recordBatch = new arrow.RecordBatch(arrowSchema, structData);
|
|
324
334
|
|
|
325
|
-
return
|
|
326
|
-
shape: 'arrow-table',
|
|
327
|
-
schema,
|
|
328
|
-
data: new arrow.Table(arrowSchema, [recordBatch])
|
|
329
|
-
};
|
|
335
|
+
return new arrow.Table(arrowSchema, [recordBatch]);
|
|
330
336
|
}
|
|
331
337
|
|
|
332
338
|
function getReprojectionTransform(
|
|
@@ -418,18 +424,49 @@ async function getNextNonMetadataValue(iterator: AsyncIterator<any>): Promise<an
|
|
|
418
424
|
}
|
|
419
425
|
}
|
|
420
426
|
|
|
421
|
-
|
|
427
|
+
/** Reads native DBF batches and imports columns originating from another Arrow build. */
|
|
428
|
+
async function getNextArrowBatch(
|
|
429
|
+
iterator: AsyncIterator<unknown>
|
|
430
|
+
): Promise<arrow.RecordBatch | null> {
|
|
422
431
|
while (true) {
|
|
423
432
|
const result = await iterator.next();
|
|
424
|
-
if (result.done)
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
433
|
+
if (result.done) return null;
|
|
434
|
+
if (isArrowRecordBatch(result.value)) {
|
|
435
|
+
const batch = result.value;
|
|
436
|
+
return Object.getPrototypeOf(batch) === arrow.RecordBatch.prototype
|
|
437
|
+
? batch
|
|
438
|
+
: importDBFRecordBatch(batch, convertArrowToSchema(batch.schema));
|
|
429
439
|
}
|
|
430
440
|
}
|
|
431
441
|
}
|
|
432
442
|
|
|
443
|
+
/** Rebuilds primitive DBF columns with local Arrow classes while reusing their buffers. */
|
|
444
|
+
function importDBFRecordBatch(
|
|
445
|
+
batch: arrow.RecordBatch,
|
|
446
|
+
tableSchema: TableSchema
|
|
447
|
+
): arrow.RecordBatch {
|
|
448
|
+
const schema = convertSchemaToArrow(tableSchema);
|
|
449
|
+
const children = batch.data.children.map(
|
|
450
|
+
(column, index) =>
|
|
451
|
+
new arrow.Data(
|
|
452
|
+
schema.fields[index].type,
|
|
453
|
+
column.offset,
|
|
454
|
+
column.length,
|
|
455
|
+
column.nullCount,
|
|
456
|
+
column.buffers,
|
|
457
|
+
undefined,
|
|
458
|
+
undefined,
|
|
459
|
+
column.variadicBuffers
|
|
460
|
+
)
|
|
461
|
+
);
|
|
462
|
+
const data = arrow.makeData({
|
|
463
|
+
type: new arrow.Struct(schema.fields),
|
|
464
|
+
length: batch.numRows,
|
|
465
|
+
children
|
|
466
|
+
});
|
|
467
|
+
return new arrow.RecordBatch(schema, data, new Map(batch.metadata));
|
|
468
|
+
}
|
|
469
|
+
|
|
433
470
|
function getQueuedRowCount(queue: arrow.Table[]): number {
|
|
434
471
|
return queue.reduce((rowCount, table) => rowCount + table.numRows, 0);
|
|
435
472
|
}
|
|
@@ -441,12 +478,32 @@ function takeRowsFromQueue(queue: arrow.Table[], rowCount: number): arrow.Table
|
|
|
441
478
|
return table;
|
|
442
479
|
}
|
|
443
480
|
const result = table.slice(0, rowCount);
|
|
444
|
-
queue[0] = table.slice(rowCount
|
|
481
|
+
queue[0] = table.slice(rowCount);
|
|
445
482
|
return result;
|
|
446
483
|
}
|
|
447
484
|
|
|
448
|
-
/** Creates an explicit empty Arrow batch so zero-row shapefiles still expose schema
|
|
449
|
-
function makeEmptyArrowBatch(schema: TableSchema):
|
|
450
|
-
const
|
|
451
|
-
|
|
485
|
+
/** Creates an explicit empty Arrow batch so zero-row shapefiles still expose their schema. */
|
|
486
|
+
function makeEmptyArrowBatch(schema: TableSchema, header: string): arrow.RecordBatch {
|
|
487
|
+
const nativeSchema = convertSchemaToArrow(schema);
|
|
488
|
+
nativeSchema.metadata.set(SHAPEFILE_HEADER_KEY, header);
|
|
489
|
+
return makeArrowMetadataBatch(nativeSchema);
|
|
490
|
+
}
|
|
491
|
+
|
|
492
|
+
/** Schema metadata key for the Shapefile header and sidecar data. */
|
|
493
|
+
export const SHAPEFILE_HEADER_KEY = 'loaders.gl.shapefile.header';
|
|
494
|
+
|
|
495
|
+
/** Encodes Shapefile sidecars for schema and worker transport. */
|
|
496
|
+
function encodeShapefileHeader({
|
|
497
|
+
shx,
|
|
498
|
+
...header
|
|
499
|
+
}: {
|
|
500
|
+
header?: SHPHeader;
|
|
501
|
+
encoding?: string;
|
|
502
|
+
prj?: WKTCRSDefinition;
|
|
503
|
+
shx?: {offsets: Int32Array; lengths: Int32Array};
|
|
504
|
+
}): string {
|
|
505
|
+
return JSON.stringify({
|
|
506
|
+
...header,
|
|
507
|
+
...(shx ? {shx: {offsets: Array.from(shx.offsets), lengths: Array.from(shx.lengths)}} : {})
|
|
508
|
+
});
|
|
452
509
|
}
|
|
@@ -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,14 +3,10 @@ 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 {convertArrowToSchema} from '@loaders.gl/core/schema-utils';
|
|
6
8
|
import type {StrictLoaderOptions, LoaderWithParser} from '@loaders.gl/core/loader-utils';
|
|
7
|
-
import type {
|
|
8
|
-
Batch,
|
|
9
|
-
GeoArrowEncodingPreference,
|
|
10
|
-
GeoJSONTable,
|
|
11
|
-
ArrowTable,
|
|
12
|
-
ArrowTableBatch
|
|
13
|
-
} from '@loaders.gl/core/schema';
|
|
9
|
+
import type {Batch, GeoArrowEncodingPreference, GeoJSONTable} from '@loaders.gl/core/schema';
|
|
14
10
|
import {SHPLoaderOptions} from './shp-loader-types';
|
|
15
11
|
import {
|
|
16
12
|
parseShapefile,
|
|
@@ -19,7 +15,11 @@ import {
|
|
|
19
15
|
} from './lib/parsers/parse-shapefile';
|
|
20
16
|
import {DBFLoaderOptions} from './dbf-loader-types';
|
|
21
17
|
import type {SHPGeoArrowEncoding} from './lib/parsers/types';
|
|
22
|
-
import {
|
|
18
|
+
import {
|
|
19
|
+
parseShapefileToArrow,
|
|
20
|
+
parseShapefileToArrowInBatches,
|
|
21
|
+
SHAPEFILE_HEADER_KEY
|
|
22
|
+
} from './shapefile-arrow-loader';
|
|
23
23
|
import {ShapefileLoader as ShapefileLoaderMetadata} from './shapefile-loader-types';
|
|
24
24
|
import {
|
|
25
25
|
deserializeShapefileWorkerResult,
|
|
@@ -38,7 +38,7 @@ export type ShapefileLoaderOptions = StrictLoaderOptions &
|
|
|
38
38
|
shapefile?: {
|
|
39
39
|
/** Overrides the browser worker bundle URL. */
|
|
40
40
|
workerUrl?: string;
|
|
41
|
-
shape?: 'geojson-table' | 'arrow
|
|
41
|
+
shape?: 'geojson-table' | 'arrow' | 'v3';
|
|
42
42
|
geoarrowEncoding?: SHPGeoArrowEncoding;
|
|
43
43
|
/** Preferred encoding for Arrow geometry output. */
|
|
44
44
|
geoarrow?: {encodingPreference?: GeoArrowEncodingPreference};
|
|
@@ -53,53 +53,72 @@ export type ShapefileLoaderOptions = StrictLoaderOptions &
|
|
|
53
53
|
*/
|
|
54
54
|
export const ShapefileLoaderWithParser = {
|
|
55
55
|
...ShapefileLoaderMetadataWithoutPreload,
|
|
56
|
+
dataType: null as unknown as ShapefileOutput | GeoJSONTable | Table,
|
|
57
|
+
batchType: null as unknown as ShapefileOutput | Batch | RecordBatch,
|
|
56
58
|
parse: (arrayBuffer, options, context) =>
|
|
57
|
-
getShapefileShape(options) === 'arrow
|
|
59
|
+
getShapefileShape(options) === 'arrow'
|
|
58
60
|
? parseShapefileToArrow(arrayBuffer, options, context)
|
|
59
61
|
: parseShapefile(arrayBuffer, options, context),
|
|
60
62
|
parseInBatches: (asyncIterator, options, context) =>
|
|
61
|
-
getShapefileShape(options) === 'arrow
|
|
63
|
+
getShapefileShape(options) === 'arrow'
|
|
62
64
|
? parseShapefileToArrowInBatches(asyncIterator, options, context)
|
|
63
65
|
: parseShapefileInBatches(asyncIterator, options, context),
|
|
64
66
|
serializeWorkerResult: serializeShapefileWorkerResult,
|
|
65
|
-
deserializeWorkerResult: deserializeShapefileOutput,
|
|
67
|
+
deserializeWorkerResult: (result, options) => deserializeShapefileOutput(result, options, false),
|
|
66
68
|
serializeWorkerBatch: serializeShapefileWorkerBatch,
|
|
67
|
-
deserializeWorkerBatch: deserializeShapefileOutput
|
|
69
|
+
deserializeWorkerBatch: (result, options) => deserializeShapefileOutput(result, options, true)
|
|
68
70
|
} as const satisfies LoaderWithParser<
|
|
69
|
-
ShapefileOutput | GeoJSONTable |
|
|
70
|
-
ShapefileOutput | Batch |
|
|
71
|
+
ShapefileOutput | GeoJSONTable | Table,
|
|
72
|
+
ShapefileOutput | Batch | RecordBatch,
|
|
71
73
|
ShapefileLoaderOptions
|
|
72
74
|
>;
|
|
73
75
|
|
|
74
76
|
function getShapefileShape(
|
|
75
77
|
options?: ShapefileLoaderOptions
|
|
76
78
|
): NonNullable<ShapefileLoaderOptions['shapefile']>['shape'] {
|
|
77
|
-
return options?.shapefile?.shape || 'arrow
|
|
79
|
+
return options?.shapefile?.shape || 'arrow';
|
|
78
80
|
}
|
|
79
81
|
|
|
80
|
-
/** Materializes requested GeoJSON features from
|
|
81
|
-
function deserializeShapefileOutput(
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
82
|
+
/** Materializes requested GeoJSON features from native worker columns on the caller. */
|
|
83
|
+
function deserializeShapefileOutput(
|
|
84
|
+
result: unknown,
|
|
85
|
+
options: ShapefileLoaderOptions | undefined,
|
|
86
|
+
isBatch: boolean
|
|
87
|
+
): any {
|
|
88
|
+
const table = deserializeShapefileWorkerResult<Table | RecordBatch>(result);
|
|
89
|
+
if (getShapefileShape(options) === 'arrow') return table;
|
|
90
|
+
|
|
91
|
+
const header = JSON.parse(table.schema.metadata.get(SHAPEFILE_HEADER_KEY) || '{}');
|
|
92
|
+
const loaderData = header.shx
|
|
93
|
+
? {
|
|
94
|
+
...header,
|
|
95
|
+
shx: {
|
|
96
|
+
offsets: Int32Array.from(header.shx.offsets),
|
|
97
|
+
lengths: Int32Array.from(header.shx.lengths)
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
: header;
|
|
101
|
+
const features = table.toArray().map(row => {
|
|
102
|
+
const {geometry, ...properties} = row!.toJSON();
|
|
86
103
|
return {
|
|
87
104
|
type: 'Feature',
|
|
88
105
|
geometry: geometry ? convertWKBToGeometry(geometry.slice().buffer) : null,
|
|
89
106
|
properties
|
|
90
107
|
};
|
|
91
108
|
});
|
|
92
|
-
if (getShapefileShape(options) === 'geojson-table' && !
|
|
109
|
+
if (getShapefileShape(options) === 'geojson-table' && !isBatch) {
|
|
93
110
|
return {
|
|
94
|
-
...
|
|
111
|
+
...loaderData,
|
|
95
112
|
shape: 'geojson-table',
|
|
96
113
|
type: 'FeatureCollection',
|
|
97
114
|
schema: {
|
|
98
|
-
fields: table.schema
|
|
115
|
+
fields: convertArrowToSchema(table.schema).fields.filter(
|
|
116
|
+
field => field.name !== 'geometry'
|
|
117
|
+
),
|
|
99
118
|
metadata: {}
|
|
100
119
|
},
|
|
101
120
|
features
|
|
102
121
|
};
|
|
103
122
|
}
|
|
104
|
-
return {...
|
|
123
|
+
return {...loaderData, data: features};
|
|
105
124
|
}
|
|
@@ -3,11 +3,8 @@
|
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
|
|
5
5
|
import type {Loader, StrictLoaderOptions} from '@loaders.gl/core/loader-utils';
|
|
6
|
-
import type {
|
|
7
|
-
|
|
8
|
-
ArrowTableBatch,
|
|
9
|
-
GeoArrowEncodingPreference
|
|
10
|
-
} from '@loaders.gl/core/schema';
|
|
6
|
+
import type {Table, RecordBatch} from 'apache-arrow';
|
|
7
|
+
import type {GeoArrowEncodingPreference} from '@loaders.gl/core/schema';
|
|
11
8
|
import type {SHPGeoArrowEncoding} from './lib/parsers/types';
|
|
12
9
|
import {SHPFormat} from './shp-format';
|
|
13
10
|
|
|
@@ -23,7 +20,7 @@ export type SHPLoaderOptions = StrictLoaderOptions & {
|
|
|
23
20
|
geoarrow?: {encodingPreference?: GeoArrowEncodingPreference};
|
|
24
21
|
shp?: {
|
|
25
22
|
_maxDimensions?: number;
|
|
26
|
-
shape?: 'arrow
|
|
23
|
+
shape?: 'arrow' | 'wkb';
|
|
27
24
|
geoarrowEncoding?: SHPGeoArrowEncoding;
|
|
28
25
|
/** Preferred encoding for Arrow geometry output. */
|
|
29
26
|
geoarrow?: {encodingPreference?: GeoArrowEncodingPreference};
|
|
@@ -48,14 +45,12 @@ export const SHPLoader: Loader<any, any, SHPLoaderOptions> = {
|
|
|
48
45
|
version: VERSION,
|
|
49
46
|
worker: true,
|
|
50
47
|
workerInBatches: true,
|
|
48
|
+
supportsNativeArrow: true,
|
|
51
49
|
options: {
|
|
52
50
|
shp: {
|
|
53
51
|
_maxDimensions: 4,
|
|
54
|
-
shape: 'arrow
|
|
52
|
+
shape: 'arrow'
|
|
55
53
|
}
|
|
56
54
|
},
|
|
57
55
|
preload: preloadSHPLoader
|
|
58
|
-
} as const satisfies Loader<any |
|
|
59
|
-
|
|
60
|
-
/** @deprecated Use SHPLoader. */
|
|
61
|
-
export const SHPWorkerLoader = SHPLoader;
|
|
56
|
+
} as const satisfies Loader<any | Table, any | RecordBatch, SHPLoaderOptions>;
|
|
@@ -2,14 +2,14 @@
|
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
|
|
5
|
+
import type {Table, RecordBatch} from 'apache-arrow';
|
|
5
6
|
import type {Loader, LoaderWithParser, StrictLoaderOptions} from '@loaders.gl/core/loader-utils';
|
|
6
|
-
import type {ArrowTable, ArrowTableBatch} from '@loaders.gl/core/schema';
|
|
7
7
|
import {parseSHP, parseSHPInBatches} from './lib/parsers/parse-shp';
|
|
8
8
|
import type {SHPResult} from './lib/parsers/parse-shp';
|
|
9
9
|
import {parseSHPToArrow, parseSHPToArrowInBatches} from './lib/parsers/parse-shp-to-arrow';
|
|
10
10
|
import type {SHPHeader} from './lib/parsers/parse-shp-header';
|
|
11
11
|
import type {SHPGeoArrowEncoding} from './lib/parsers/types';
|
|
12
|
-
import {
|
|
12
|
+
import {SHPLoader as SHPWorkerLoaderMetadata} from './shp-loader-types';
|
|
13
13
|
import {SHPLoader as SHPLoaderMetadata} from './shp-loader-types';
|
|
14
14
|
import {
|
|
15
15
|
deserializeShapefileWorkerBatch,
|
|
@@ -28,7 +28,7 @@ export const SHP_MAGIC_NUMBER = [0x00, 0x00, 0x27, 0x0a];
|
|
|
28
28
|
export type SHPLoaderOptions = StrictLoaderOptions & {
|
|
29
29
|
shp?: {
|
|
30
30
|
_maxDimensions?: number;
|
|
31
|
-
shape?: 'arrow
|
|
31
|
+
shape?: 'arrow' | 'wkb';
|
|
32
32
|
geoarrowEncoding?: SHPGeoArrowEncoding;
|
|
33
33
|
batchSize?: number;
|
|
34
34
|
/** Override the URL to the worker bundle (by default loads from unpkg.com) */
|
|
@@ -45,17 +45,19 @@ export const SHPWorkerLoaderWithParser = {
|
|
|
45
45
|
|
|
46
46
|
/** SHP file loader */
|
|
47
47
|
export const SHPLoaderWithParser: LoaderWithParser<
|
|
48
|
-
SHPResult |
|
|
49
|
-
SHPHeader | (Uint8Array | null)[] |
|
|
48
|
+
SHPResult | Table,
|
|
49
|
+
SHPHeader | (Uint8Array | null)[] | RecordBatch,
|
|
50
50
|
SHPLoaderOptions
|
|
51
51
|
> = {
|
|
52
52
|
...SHPLoaderMetadataWithoutPreload,
|
|
53
|
+
dataType: null as unknown as SHPResult | Table,
|
|
54
|
+
batchType: null as unknown as SHPHeader | (Uint8Array | null)[] | RecordBatch,
|
|
53
55
|
parse: async (arrayBuffer, options?) =>
|
|
54
|
-
getSHPShape(options) === 'arrow
|
|
56
|
+
getSHPShape(options) === 'arrow'
|
|
55
57
|
? parseSHPToArrow(arrayBuffer, options)
|
|
56
58
|
: parseSHP(arrayBuffer, options),
|
|
57
59
|
parseSync: (arrayBuffer, options?) =>
|
|
58
|
-
getSHPShape(options) === 'arrow
|
|
60
|
+
getSHPShape(options) === 'arrow'
|
|
59
61
|
? parseSHPToArrow(arrayBuffer, options)
|
|
60
62
|
: parseSHP(arrayBuffer, options),
|
|
61
63
|
parseInBatches: (
|
|
@@ -63,12 +65,17 @@ export const SHPLoaderWithParser: LoaderWithParser<
|
|
|
63
65
|
| AsyncIterable<ArrayBufferLike | ArrayBufferView>
|
|
64
66
|
| Iterable<ArrayBufferLike | ArrayBufferView>,
|
|
65
67
|
options
|
|
66
|
-
): AsyncIterable<SHPHeader | (Uint8Array | null)[] |
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
68
|
+
): AsyncIterable<SHPHeader | (Uint8Array | null)[] | RecordBatch> => {
|
|
69
|
+
const batchOptions =
|
|
70
|
+
typeof options?.core?.batchSize === 'number'
|
|
71
|
+
? {...options, shp: {...options.shp, batchSize: options.core.batchSize}}
|
|
72
|
+
: options;
|
|
73
|
+
return (
|
|
74
|
+
getSHPShape(batchOptions) === 'arrow'
|
|
75
|
+
? parseSHPToArrowInBatches(arrayBufferIterator, batchOptions)
|
|
76
|
+
: parseSHPInBatches(arrayBufferIterator, batchOptions)
|
|
77
|
+
) as AsyncIterable<SHPHeader | (Uint8Array | null)[] | RecordBatch>;
|
|
78
|
+
},
|
|
72
79
|
serializeWorkerResult: serializeShapefileWorkerResult,
|
|
73
80
|
deserializeWorkerResult: deserializeShapefileWorkerResult,
|
|
74
81
|
serializeWorkerBatch: serializeShapefileWorkerBatch,
|
|
@@ -76,5 +83,5 @@ export const SHPLoaderWithParser: LoaderWithParser<
|
|
|
76
83
|
};
|
|
77
84
|
|
|
78
85
|
function getSHPShape(options?: SHPLoaderOptions): NonNullable<SHPLoaderOptions['shp']>['shape'] {
|
|
79
|
-
return options?.shp?.shape || 'arrow
|
|
86
|
+
return options?.shp?.shape || 'arrow';
|
|
80
87
|
}
|
|
@@ -6,7 +6,7 @@ export type {ShapefileLoaderOptions} from './shapefile-loader-types';
|
|
|
6
6
|
export {ShapefileLoader} from './shapefile-loader-types';
|
|
7
7
|
|
|
8
8
|
export type {DBFLoaderOptions} from './dbf-loader-types';
|
|
9
|
-
export {DBFLoader
|
|
9
|
+
export {DBFLoader} from './dbf-loader-types';
|
|
10
10
|
|
|
11
11
|
export type {SHPLoaderOptions} from './shp-loader-types';
|
|
12
|
-
export {SHPLoader
|
|
12
|
+
export {SHPLoader} from './shp-loader-types';
|