diff --git a/examples/webpack.config.local.js b/examples/webpack.config.local.js index d7f213939d..3c13defbc2 100644 --- a/examples/webpack.config.local.js +++ b/examples/webpack.config.local.js @@ -100,6 +100,8 @@ function makeLocalDevConfig(env, EXAMPLE_DIR = LIB_DIR, externals = {}) { externals['loaders.gl'].forEach(mdl => { resolveAlias[`@loaders.gl/${mdl}`] = `${EXTERNAL_LOADERS_SRC}/modules/${mdl}/src`; }); + // kepler.gl and loaders.gl need to use same apache-arrow + resolveAlias['apache-arrow'] = resolve(__dirname, '../node_modules/apache-arrow'); } if (env.hubble_src) { @@ -166,6 +168,7 @@ function makeBabelRule(env, exampleDir) { join(EXTERNAL_DECK_SRC, 'node_modules/@loaders.gl') ] : []), + ...(env.loaders_src ? [join(EXTERNAL_LOADERS_SRC, 'modules')] : []), ...(env.hubble_src ? [join(EXTERNAL_HUBBLE_SRC, 'modules')] : []), join(exampleDir, 'src'), SRC_DIR diff --git a/package.json b/package.json index 3f299e48d6..1b92fb5986 100644 --- a/package.json +++ b/package.json @@ -114,7 +114,7 @@ "@hubble.gl/core": "1.2.0-alpha.6", "@hubble.gl/react": "1.2.0-alpha.6", "@kepler.gl/components": "3.0.0-alpha.1", - "@loaders.gl/polyfills": "^4.1.0-alpha.3", + "@loaders.gl/polyfills": "^4.1.0-alpha.4", "@types/mapbox__geo-viewport": "^0.4.1", "@typescript-eslint/parser": "^5.27.0", "eslint-config-developit": "^1.2.0", @@ -142,7 +142,7 @@ "@babel/traverse": "^7.12.1", "@cfaester/enzyme-adapter-react-18": "^0.7.0", "@deck.gl/test-utils": "^8.9.27", - "@loaders.gl/polyfills": "^4.1.0-alpha.3", + "@loaders.gl/polyfills": "^4.1.0-alpha.4", "@luma.gl/test-utils": "^8.5.20", "@nebula.gl/layers": "1.0.2-alpha.1", "@probe.gl/env": "^3.5.0", @@ -216,12 +216,12 @@ "webpack-stats-plugin": "^0.2.1" }, "resolutions": { - "@loaders.gl/core": "^4.1.0-alpha.3", - "@loaders.gl/csv": "^4.1.0-alpha.3", - "@loaders.gl/gltf": "^4.1.0-alpha.3", - "@loaders.gl/json": "^4.1.0-alpha.3", - "@loaders.gl/loader-utils": "^4.1.0-alpha.3", - "@loaders.gl/polyfills": "^4.1.0-alpha.3", + "@loaders.gl/core": "^4.1.0-alpha.4", + "@loaders.gl/csv": "^4.1.0-alpha.4", + "@loaders.gl/gltf": "^4.1.0-alpha.4", + "@loaders.gl/json": "^4.1.0-alpha.4", + "@loaders.gl/loader-utils": "^4.1.0-alpha.4", + "@loaders.gl/polyfills": "^4.1.0-alpha.4", "@luma.gl/constants": "8.5.21", "@luma.gl/core": "8.5.21", "@luma.gl/experimental": "8.5.21", diff --git a/src/actions/src/vis-state-actions.ts b/src/actions/src/vis-state-actions.ts index 31fb94dfc1..3480890bed 100644 --- a/src/actions/src/vis-state-actions.ts +++ b/src/actions/src/vis-state-actions.ts @@ -1240,20 +1240,6 @@ export function loadFileStepSuccess({ }; } -export function loadBatchDataSuccess({ - fileName, - fileCache -}: { - fileName: string; - fileCache: FileCacheItem[]; -}): Merge { - return { - type: ActionTypes.LOAD_BATCH_DATA_SUCCESS, - fileName, - fileCache - }; -} - export type LoadFilesErrUpdaterAction = { fileName: string; error: any; diff --git a/src/layers/package.json b/src/layers/package.json index 4bcf772064..f39aba82d5 100644 --- a/src/layers/package.json +++ b/src/layers/package.json @@ -42,11 +42,12 @@ "@kepler.gl/table": "3.0.0-alpha.1", "@kepler.gl/types": "3.0.0-alpha.1", "@kepler.gl/utils": "3.0.0-alpha.1", - "@loaders.gl/arrow": "^4.1.0-alpha.3", - "@loaders.gl/core": "^4.1.0-alpha.3", - "@loaders.gl/gis": "^4.1.0-alpha.3", - "@loaders.gl/gltf": "^4.1.0-alpha.3", - "@loaders.gl/wkt": "^4.1.0-alpha.3", + "@loaders.gl/arrow": "^4.1.0-alpha.4", + "@loaders.gl/core": "^4.1.0-alpha.4", + "@loaders.gl/gis": "^4.1.0-alpha.4", + "@loaders.gl/gltf": "^4.1.0-alpha.4", + "@loaders.gl/schema": "^4.1.0-alpha.4", + "@loaders.gl/wkt": "^4.1.0-alpha.4", "@luma.gl/constants": "^8.5.20", "@mapbox/geojson-normalize": "0.0.1", "@nebula.gl/edit-modes": "1.0.2-alpha.1", diff --git a/src/layers/src/geojson-layer/geojson-layer.ts b/src/layers/src/geojson-layer/geojson-layer.ts index 9aeee1877d..d95bc4b7ca 100644 --- a/src/layers/src/geojson-layer/geojson-layer.ts +++ b/src/layers/src/geojson-layer/geojson-layer.ts @@ -19,7 +19,6 @@ // THE SOFTWARE. import * as arrow from 'apache-arrow'; -import {BinaryFeatures} from '@loaders.gl/schema'; import {Feature} from 'geojson'; import uniq from 'lodash.uniq'; import {DATA_TYPES} from 'type-analyzer'; @@ -206,7 +205,7 @@ export default class GeoJsonLayer extends Layer { declare visConfigSettings: GeoJsonVisConfigSettings; declare meta: GeoJsonLayerMeta; - dataToFeature: GeojsonDataMaps | BinaryFeatures[] = []; + dataToFeature: GeojsonDataMaps = []; dataContainer: DataContainerInterface | null = null; filteredIndex: Uint8ClampedArray | null = null; filteredIndexTrigger: number[] | null = null; @@ -434,11 +433,7 @@ export default class GeoJsonLayer extends Layer { getGeoField, chunkIndex: this.dataToFeature.length }); - if (this.dataToFeature.length === 0) { - // not update bounds for every batch, to avoid interrupt user interacts with map while loading the map incrementally - this.updateMeta({bounds, fixedRadius, featureTypes}); - } - // @ts-expect-error TODO fix this + this.updateMeta({ bounds, fixedRadius, featureTypes }); this.dataToFeature = [...this.dataToFeature, ...dataToFeature]; } } else { diff --git a/src/layers/src/geojson-layer/geojson-utils.ts b/src/layers/src/geojson-layer/geojson-utils.ts index 72e8082721..9e46176918 100644 --- a/src/layers/src/geojson-layer/geojson-utils.ts +++ b/src/layers/src/geojson-layer/geojson-utils.ts @@ -24,12 +24,13 @@ import bbox from '@turf/bbox'; import {parseSync} from '@loaders.gl/core'; import {WKBLoader, WKTLoader} from '@loaders.gl/wkt'; import {binaryToGeometry} from '@loaders.gl/gis'; +import {BinaryFeatureCollection} from '@loaders.gl/schema'; import {DataContainerInterface, getSampleData} from '@kepler.gl/utils'; import {GeojsonLayerMetaProps} from '../layer-utils'; export type GetFeature = (d: any) => Feature; -export type GeojsonDataMaps = Array; +export type GeojsonDataMaps = Array; /* eslint-disable */ // TODO: Re-enable eslint when we upgrade to handle enums and type maps @@ -84,7 +85,7 @@ export function getGeojsonLayerMeta({ // get bounds from features const bounds = getGeojsonBounds(dataToFeature); // if any of the feature has properties.radius set to be true - const fixedRadius = Boolean(dataToFeature.find(d => d && d.properties && d.properties.radius)); + const fixedRadius = Boolean(dataToFeature.find(d => d && 'properties' in d && d.properties?.radius)); // keep a record of what type of geometry the collection has const featureTypes = getGeojsonFeatureTypes(dataToFeature); @@ -234,7 +235,7 @@ export function getGeojsonFeatureTypes(allFeatures: GeojsonDataMaps): DeckGlGeoT const featureTypes: DeckGlGeoTypes = {}; for (let f = 0; f < allFeatures.length; f++) { const feature = allFeatures[f]; - if (feature) { + if (feature && 'geometry' in feature) { const geoType = featureToDeckGlGeoType[feature.geometry && feature.geometry.type]; if (geoType) { featureTypes[geoType] = true; diff --git a/src/layers/src/layer-utils.ts b/src/layers/src/layer-utils.ts index 398ce3c724..6e787633da 100644 --- a/src/layers/src/layer-utils.ts +++ b/src/layers/src/layer-utils.ts @@ -22,14 +22,13 @@ import * as arrow from 'apache-arrow'; import {Feature, BBox} from 'geojson'; import {Field, FieldPair} from '@kepler.gl/types'; import {DataContainerInterface} from '@kepler.gl/utils'; -import {BinaryFeatures} from '@loaders.gl/schema'; import { getBinaryGeometriesFromArrow, parseGeometryFromArrow, BinaryGeometriesFromArrowOptions } from '@loaders.gl/arrow'; -import {DeckGlGeoTypes} from './geojson-layer/geojson-utils'; +import {DeckGlGeoTypes, GeojsonDataMaps} from './geojson-layer/geojson-utils'; export function assignPointPairToLayerColumn(pair: FieldPair, hasAlt: boolean) { const {lat, lng, alt} = pair.pair; @@ -47,7 +46,7 @@ export function assignPointPairToLayerColumn(pair: FieldPair, hasAlt: boolean) { } export type GeojsonLayerMetaProps = { - dataToFeature: BinaryFeatures[] | Array; + dataToFeature: GeojsonDataMaps; featureTypes: DeckGlGeoTypes; bounds: BBox | null; fixedRadius: boolean; diff --git a/src/processors/package.json b/src/processors/package.json index 9a05544253..571c25a8db 100644 --- a/src/processors/package.json +++ b/src/processors/package.json @@ -35,11 +35,11 @@ "@kepler.gl/schemas": "3.0.0-alpha.1", "@kepler.gl/types": "3.0.0-alpha.1", "@kepler.gl/utils": "3.0.0-alpha.1", - "@loaders.gl/arrow": "^4.1.0-alpha.3", - "@loaders.gl/core": "^4.1.0-alpha.3", - "@loaders.gl/csv": "^4.1.0-alpha.3", - "@loaders.gl/json": "^4.1.0-alpha.3", - "@loaders.gl/loader-utils": "^4.1.0-alpha.3", + "@loaders.gl/arrow": "^4.1.0-alpha.4", + "@loaders.gl/core": "^4.1.0-alpha.4", + "@loaders.gl/csv": "^4.1.0-alpha.4", + "@loaders.gl/json": "^4.1.0-alpha.4", + "@loaders.gl/loader-utils": "^4.1.0-alpha.4", "@mapbox/geojson-normalize": "0.0.1", "@nebula.gl/edit-modes": "1.0.2-alpha.1", "@turf/helpers": "^6.1.4", diff --git a/src/processors/src/file-handler.ts b/src/processors/src/file-handler.ts index 2211e4df47..72f3275834 100644 --- a/src/processors/src/file-handler.ts +++ b/src/processors/src/file-handler.ts @@ -48,7 +48,8 @@ const CSV_LOADER_OPTIONS = { }; const ARROW_LOADER_OPTIONS = { - shape: 'arrow-table' + shape: 'arrow-table', + batchDebounceMs: 10 // time to delay between batches, for incremental loading }; const JSON_LOADER_OPTIONS = { diff --git a/src/reducers/package.json b/src/reducers/package.json index c00b75ab37..9e9ce1d7f0 100644 --- a/src/reducers/package.json +++ b/src/reducers/package.json @@ -43,7 +43,7 @@ "@kepler.gl/tasks": "3.0.0-alpha.1", "@kepler.gl/types": "3.0.0-alpha.1", "@kepler.gl/utils": "3.0.0-alpha.1", - "@loaders.gl/loader-utils": "^4.1.0-alpha.3", + "@loaders.gl/loader-utils": "^4.1.0-alpha.4", "@types/lodash.clonedeep": "^4.5.7", "@types/lodash.flattendeep": "^4.4.7", "@types/lodash.get": "^4.4.6", diff --git a/src/reducers/src/combined-updaters.ts b/src/reducers/src/combined-updaters.ts index 5acf0e8dce..5e54ec827f 100644 --- a/src/reducers/src/combined-updaters.ts +++ b/src/reducers/src/combined-updaters.ts @@ -164,8 +164,8 @@ export const addDataToMapUpdater = ( const isProgressiveLoading = Array.isArray(datasets) && datasets[0]?.info.format === 'arrow' && - datasets[0].info.id && - datasets[0].info.id in state.visState.datasets; + datasets[0]?.info.id && + datasets[0]?.info.id in state.visState.datasets; if (isProgressiveLoading) { return compose_([ pick_('visState')( diff --git a/src/reducers/src/vis-state-updaters.ts b/src/reducers/src/vis-state-updaters.ts index 0b95700b73..5951b2cbfb 100644 --- a/src/reducers/src/vis-state-updaters.ts +++ b/src/reducers/src/vis-state-updaters.ts @@ -37,7 +37,6 @@ import { layerTypeChange, layerVisConfigChange, layerVisualChannelConfigChange, - loadBatchDataSuccess, loadFilesErr, loadFilesSuccess, loadFileStepSuccess, @@ -2277,21 +2276,6 @@ export function parseProgress(prevProgress = {}, progress) { }; } -export function loadBatchDataSuccessUpdater( - state: VisState, - action: VisStateActions.LoadFileStepSuccessAction -): VisState { - if (!state.fileLoading) { - return state; - } - const {fileCache} = action; - const {onFinish} = state.fileLoading; - return withTask( - state, - DELAY_TASK(200).map(() => onFinish(fileCache)) - ); -} - /** * gets called with payload = AsyncGenerator * @memberof visStateUpdaters @@ -2309,10 +2293,10 @@ export const nextFileBatchUpdater = ( }); return withTask(stateWithProgress, [ - ...(fileName.endsWith('arrow') && accumulated && accumulated.data?.length > 1 + ...(fileName.endsWith('arrow') && accumulated?.data?.length > 0 ? [ PROCESS_FILE_DATA({content: accumulated, fileCache: []}).bimap( - result => loadBatchDataSuccess({fileName, fileCache: result}), + result => loadFilesSuccess(result), err => loadFilesErr(fileName, err) ) ] diff --git a/src/reducers/src/vis-state.ts b/src/reducers/src/vis-state.ts index 1ebb771f79..f7633c027f 100644 --- a/src/reducers/src/vis-state.ts +++ b/src/reducers/src/vis-state.ts @@ -67,8 +67,6 @@ const actionHandler = { [ActionTypes.LOAD_NEXT_FILE]: visStateUpdaters.loadNextFileUpdater, - [ActionTypes.LOAD_BATCH_DATA_SUCCESS]: visStateUpdaters.loadBatchDataSuccessUpdater, - [ActionTypes.LOAD_FILE_STEP_SUCCESS]: visStateUpdaters.loadFileStepSuccessUpdater, [ActionTypes.MAP_CLICK]: visStateUpdaters.mapClickUpdater, diff --git a/src/schemas/package.json b/src/schemas/package.json index 56af5eb80e..6e2c267b52 100644 --- a/src/schemas/package.json +++ b/src/schemas/package.json @@ -35,7 +35,7 @@ "@kepler.gl/table": "3.0.0-alpha.1", "@kepler.gl/types": "3.0.0-alpha.1", "@kepler.gl/utils": "3.0.0-alpha.1", - "@loaders.gl/loader-utils": "^4.1.0-alpha.3", + "@loaders.gl/loader-utils": "^4.1.0-alpha.4", "@types/keymirror": "^0.1.1", "@types/lodash.clonedeep": "^4.5.7", "@types/lodash.pick": "^4.4.6", diff --git a/yarn.lock b/yarn.lock index 8de8a11df3..f74932ea3c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2165,45 +2165,45 @@ "@math.gl/geospatial" "^3.5.1" long "^5.2.1" -"@loaders.gl/arrow@^4.1.0-alpha.3": - version "4.1.0-alpha.3" - resolved "https://registry.yarnpkg.com/@loaders.gl/arrow/-/arrow-4.1.0-alpha.3.tgz#d790e1e5223097cf8b351efc3a5b8d2a484c725a" - integrity sha512-/CDiCS3n7D7UUHkcy07ahS010TEjaG1QjV12WxR5VGLr0Rr65yWSJxDBfNwXQvXD4TvyLloE+XAxs+fa04H1Dw== - dependencies: - "@loaders.gl/gis" "4.1.0-alpha.3" - "@loaders.gl/loader-utils" "4.1.0-alpha.3" - "@loaders.gl/schema" "4.1.0-alpha.3" - "@loaders.gl/wkt" "4.1.0-alpha.3" +"@loaders.gl/arrow@^4.1.0-alpha.4": + version "4.1.0-alpha.4" + resolved "https://registry.yarnpkg.com/@loaders.gl/arrow/-/arrow-4.1.0-alpha.4.tgz#b3282757a3999d5e30678b6f278c6a0bf452ce0a" + integrity sha512-lE9BtwWCSDQUI75XSu6LCdBnh1/5Ic5cB+/oM1Li45a0If8mIerD1bDWlfVMWCQdrXuEzzo5/90nKI3o4m+BCw== + dependencies: + "@loaders.gl/gis" "4.1.0-alpha.4" + "@loaders.gl/loader-utils" "4.1.0-alpha.4" + "@loaders.gl/schema" "4.1.0-alpha.4" + "@loaders.gl/wkt" "4.1.0-alpha.4" "@math.gl/polygon" "4.0.0" apache-arrow "^13.0.0" -"@loaders.gl/core@^2.1.6", "@loaders.gl/core@^3.4.13", "@loaders.gl/core@^4.1.0-alpha.3": - version "4.1.0-alpha.3" - resolved "https://registry.yarnpkg.com/@loaders.gl/core/-/core-4.1.0-alpha.3.tgz#da06f87957f900c64f283054151bafe733c1b0f4" - integrity sha512-+X4YsIpDnbnfdc8dmL/5yH1yr12t178tp7KeXAElTM34/lFlSun54DgUl5A8EKYMsJGq47NnT0K14pnN0yXahA== +"@loaders.gl/core@^2.1.6", "@loaders.gl/core@^3.4.13", "@loaders.gl/core@^4.1.0-alpha.4": + version "4.1.0-alpha.4" + resolved "https://registry.yarnpkg.com/@loaders.gl/core/-/core-4.1.0-alpha.4.tgz#ecf4231b90a49ef25e90a431ce45d6df9297b73d" + integrity sha512-s1+R/TuEmTALZuBn5dy1PfLgxEX9QWVOteZJM8Rh+dbgK0YheV7wPjHW7EGXZWIbhQF+XxqBt1xTdLZBDSAr1g== dependencies: "@babel/runtime" "^7.3.1" - "@loaders.gl/loader-utils" "4.1.0-alpha.3" - "@loaders.gl/worker-utils" "4.1.0-alpha.3" + "@loaders.gl/loader-utils" "4.1.0-alpha.4" + "@loaders.gl/worker-utils" "4.1.0-alpha.4" "@probe.gl/log" "^4.0.2" -"@loaders.gl/crypto@4.1.0-alpha.3": - version "4.1.0-alpha.3" - resolved "https://registry.yarnpkg.com/@loaders.gl/crypto/-/crypto-4.1.0-alpha.3.tgz#cd4943c3badfcffcb5e09880949dde970b68fcac" - integrity sha512-JEX54/w+85wOF5v4Qm+1IxNSu/B63glK+2LekVra4kj5JhmUpxe4lE28FLefswmY4UlLchmfcjXa7OgK6MHuQA== +"@loaders.gl/crypto@4.1.0-alpha.4": + version "4.1.0-alpha.4" + resolved "https://registry.yarnpkg.com/@loaders.gl/crypto/-/crypto-4.1.0-alpha.4.tgz#ca9d6c6c9ac14cd96477a9ec57ca2ec3ec8772f1" + integrity sha512-xWWLIc4Qd5qzLclQkiNajlFgtcof5jA1nCyNaPRK+AIkLyj5VITHBkDjnNgMmuJApsLLq/YAQwMnaimv98ZCYg== dependencies: "@babel/runtime" "^7.3.1" - "@loaders.gl/loader-utils" "4.1.0-alpha.3" - "@loaders.gl/worker-utils" "4.1.0-alpha.3" + "@loaders.gl/loader-utils" "4.1.0-alpha.4" + "@loaders.gl/worker-utils" "4.1.0-alpha.4" "@types/crypto-js" "^4.0.2" -"@loaders.gl/csv@^4.1.0-alpha.3": - version "4.1.0-alpha.3" - resolved "https://registry.yarnpkg.com/@loaders.gl/csv/-/csv-4.1.0-alpha.3.tgz#8bd42d4f69623e1d077f00ab2f75d71fcd7478a0" - integrity sha512-dwGhZjmD1Dr9il/aCjkdPl2Nh+FizE9hF1PDal3L6X4jE03IO7Foq5XbXi0ulA0rmzMu7yC/d1JdTmiE2W6vmg== +"@loaders.gl/csv@^4.1.0-alpha.4": + version "4.1.0-alpha.4" + resolved "https://registry.yarnpkg.com/@loaders.gl/csv/-/csv-4.1.0-alpha.4.tgz#4e35d34200abe4bf7949f1669bec424bde686f78" + integrity sha512-5XxKWjzn6Sg5QGDuQlMf4JdNFRKl75fPfRd1CPF4Sud/ZJmzLK12BfEg6x/7XRFFSRrw9hp3pNpjxvxUx/4nqQ== dependencies: - "@loaders.gl/loader-utils" "4.1.0-alpha.3" - "@loaders.gl/schema" "4.1.0-alpha.3" + "@loaders.gl/loader-utils" "4.1.0-alpha.4" + "@loaders.gl/schema" "4.1.0-alpha.4" "@loaders.gl/draco@3.4.14": version "3.4.14" @@ -2216,15 +2216,15 @@ "@loaders.gl/worker-utils" "3.4.14" draco3d "1.5.5" -"@loaders.gl/draco@4.1.0-alpha.3": - version "4.1.0-alpha.3" - resolved "https://registry.yarnpkg.com/@loaders.gl/draco/-/draco-4.1.0-alpha.3.tgz#a28e43784dc3a60c33424cc933d3a2259ae4690a" - integrity sha512-rKFWQ2Zc1x8EEfSmJjmSTZA+ZsxMC4B+GMbT61/Bpi+gCCtj+paqXXK8/UrKoeAe608lTAJFby3rMe5I8eJiCQ== +"@loaders.gl/draco@4.1.0-alpha.4": + version "4.1.0-alpha.4" + resolved "https://registry.yarnpkg.com/@loaders.gl/draco/-/draco-4.1.0-alpha.4.tgz#d833e2a66b62acd7ad266dffc71deb075c74f0a5" + integrity sha512-64y3WoGqvOiV8YF865HOSjCrNB2imbSx1AaSqg1ZVvT1+UodfHuBBcuq7jZhWu8fcXiKzxAUftpUuk5yGm2z5w== dependencies: "@babel/runtime" "^7.3.1" - "@loaders.gl/loader-utils" "4.1.0-alpha.3" - "@loaders.gl/schema" "4.1.0-alpha.3" - "@loaders.gl/worker-utils" "4.1.0-alpha.3" + "@loaders.gl/loader-utils" "4.1.0-alpha.4" + "@loaders.gl/schema" "4.1.0-alpha.4" + "@loaders.gl/worker-utils" "4.1.0-alpha.4" draco3d "1.5.5" "@loaders.gl/gis@3.4.14", "@loaders.gl/gis@^3.4.13": @@ -2238,26 +2238,26 @@ "@math.gl/polygon" "^3.5.1" pbf "^3.2.1" -"@loaders.gl/gis@4.1.0-alpha.3", "@loaders.gl/gis@^4.1.0-alpha.3": - version "4.1.0-alpha.3" - resolved "https://registry.yarnpkg.com/@loaders.gl/gis/-/gis-4.1.0-alpha.3.tgz#d89f6d8cdc477c11b7c06a32a0e736349980ba9d" - integrity sha512-pP1Hz6qVc2UkJ2UuNz81wcbmMQENKFvZktVQz3J4fBYBn4aLYTBkeAnvv1qQq5LZLGhwNgOEfPvUa+xZiRZalg== +"@loaders.gl/gis@4.1.0-alpha.4", "@loaders.gl/gis@^4.1.0-alpha.4": + version "4.1.0-alpha.4" + resolved "https://registry.yarnpkg.com/@loaders.gl/gis/-/gis-4.1.0-alpha.4.tgz#ab5c3419c1c4a2095dfdbaa67e7e207c1035ca87" + integrity sha512-3ve1dWQ4hp3zkgRA/iw3q4iFT4g9cWM/yZycz2E1KustRqqyE2CGYlBrdUXHY83ZX1VtAjMW06JdfOCIFxGCXg== dependencies: - "@loaders.gl/loader-utils" "4.1.0-alpha.3" - "@loaders.gl/schema" "4.1.0-alpha.3" + "@loaders.gl/loader-utils" "4.1.0-alpha.4" + "@loaders.gl/schema" "4.1.0-alpha.4" "@mapbox/vector-tile" "^1.3.1" "@math.gl/polygon" "^4.0.0" pbf "^3.2.1" -"@loaders.gl/gltf@3.4.14", "@loaders.gl/gltf@^3.4.13", "@loaders.gl/gltf@^4.1.0-alpha.3": - version "4.1.0-alpha.3" - resolved "https://registry.yarnpkg.com/@loaders.gl/gltf/-/gltf-4.1.0-alpha.3.tgz#4611d4cdde9d09a812c0cc628dd8a2a1a39a0136" - integrity sha512-40HfV+6lvRRZhv6vJbcdW+MxlVUebxlhtfApxmq1N8Z+uIlWm5b7jC2PM9YmSYmiNm2RIzq2tftj96etL1OQ4A== +"@loaders.gl/gltf@3.4.14", "@loaders.gl/gltf@^3.4.13", "@loaders.gl/gltf@^4.1.0-alpha.4": + version "4.1.0-alpha.4" + resolved "https://registry.yarnpkg.com/@loaders.gl/gltf/-/gltf-4.1.0-alpha.4.tgz#018b2e3adee8f4af7a986e2eb5377a0ed176548b" + integrity sha512-FHrJ3zMhnFUcnF5Im9Hfihqk/5CjRg7a+IRmY6ZW+PkbluwTguUOyPguHFn/xHdDaqwD7aovUGxqo6yjF3nlSg== dependencies: - "@loaders.gl/draco" "4.1.0-alpha.3" - "@loaders.gl/images" "4.1.0-alpha.3" - "@loaders.gl/loader-utils" "4.1.0-alpha.3" - "@loaders.gl/textures" "4.1.0-alpha.3" + "@loaders.gl/draco" "4.1.0-alpha.4" + "@loaders.gl/images" "4.1.0-alpha.4" + "@loaders.gl/loader-utils" "4.1.0-alpha.4" + "@loaders.gl/textures" "4.1.0-alpha.4" "@math.gl/core" "^4.0.0" "@loaders.gl/images@3.4.14", "@loaders.gl/images@^3.4.13": @@ -2267,29 +2267,29 @@ dependencies: "@loaders.gl/loader-utils" "3.4.14" -"@loaders.gl/images@4.1.0-alpha.3": - version "4.1.0-alpha.3" - resolved "https://registry.yarnpkg.com/@loaders.gl/images/-/images-4.1.0-alpha.3.tgz#4051b21e49a07bf8e29ce83fc34ca92b12a7614f" - integrity sha512-mv3+ZnovI2B5p6uExntdepQnqabqBNHsuRo3hDVX6TENMfSLUOYS8gMYXgaU0Cv36FH2cHd369k2D9da1ZIdVQ== +"@loaders.gl/images@4.1.0-alpha.4": + version "4.1.0-alpha.4" + resolved "https://registry.yarnpkg.com/@loaders.gl/images/-/images-4.1.0-alpha.4.tgz#e46d416e55343a2f8687485001b49261789b2607" + integrity sha512-XZ39+Bpx6+33jWWXcBblWo5SFAWdAc1He4PoOfIkhlw2BjNk58YiPP6RtJZVEXMlphbjZljQVM3aWcrz9eylOg== dependencies: - "@loaders.gl/loader-utils" "4.1.0-alpha.3" + "@loaders.gl/loader-utils" "4.1.0-alpha.4" -"@loaders.gl/json@^4.1.0-alpha.3": - version "4.1.0-alpha.3" - resolved "https://registry.yarnpkg.com/@loaders.gl/json/-/json-4.1.0-alpha.3.tgz#dfe4c2e07d8a90c0e3a84979210545ab58eca0ab" - integrity sha512-EwziXxXwi3FHgg7aRBECNWKtLlsG4d/6xpTp2c3pExw9XWUORgyoOioTOBOdZj2ykuQTm3faIxN9mWmSs3MS5Q== +"@loaders.gl/json@^4.1.0-alpha.4": + version "4.1.0-alpha.4" + resolved "https://registry.yarnpkg.com/@loaders.gl/json/-/json-4.1.0-alpha.4.tgz#46064131c50d0362c5a7506660480473a160cb30" + integrity sha512-ClBD7Xry/TyTTjGFWfcCPdO7Q/s158DiwREhNkDXZn7/4P8mJS7vlYyadHONpzTD+3tyXOhL8TWLS42MQ9y2Tw== dependencies: - "@loaders.gl/gis" "4.1.0-alpha.3" - "@loaders.gl/loader-utils" "4.1.0-alpha.3" - "@loaders.gl/schema" "4.1.0-alpha.3" + "@loaders.gl/gis" "4.1.0-alpha.4" + "@loaders.gl/loader-utils" "4.1.0-alpha.4" + "@loaders.gl/schema" "4.1.0-alpha.4" -"@loaders.gl/loader-utils@3.4.14", "@loaders.gl/loader-utils@4.1.0-alpha.3", "@loaders.gl/loader-utils@^2.1.3", "@loaders.gl/loader-utils@^3.4.13", "@loaders.gl/loader-utils@^4.1.0-alpha.3": - version "4.1.0-alpha.3" - resolved "https://registry.yarnpkg.com/@loaders.gl/loader-utils/-/loader-utils-4.1.0-alpha.3.tgz#91e7a3b0a94bb85a469411f1a84c73c0956852e9" - integrity sha512-a2FLoPjTzDV48nXUYcDLiTtzmxtDNGdoYj7eXDzNi5k81Oe+mSjpZ7SO0TogBhUdhCWDRfhiaRtQ6vttpAepCA== +"@loaders.gl/loader-utils@3.4.14", "@loaders.gl/loader-utils@4.1.0-alpha.4", "@loaders.gl/loader-utils@^2.1.3", "@loaders.gl/loader-utils@^3.4.13", "@loaders.gl/loader-utils@^4.1.0-alpha.4": + version "4.1.0-alpha.4" + resolved "https://registry.yarnpkg.com/@loaders.gl/loader-utils/-/loader-utils-4.1.0-alpha.4.tgz#089fd380b6c8d51dd4c703c40ad1a58d49152077" + integrity sha512-9+EpOo+cGFJD1jgni1Rbs39OvucL1dMrhVrHPMXJ2vJ/M5xxjC/FX6OZnFVluKtbQcIn2dxzCra4Kl4KPvx8eg== dependencies: "@babel/runtime" "^7.3.1" - "@loaders.gl/worker-utils" "4.1.0-alpha.3" + "@loaders.gl/worker-utils" "4.1.0-alpha.4" "@probe.gl/stats" "^4.0.2" "@loaders.gl/math@3.4.14": @@ -2312,14 +2312,14 @@ "@math.gl/polygon" "^3.5.1" pbf "^3.2.1" -"@loaders.gl/polyfills@^4.1.0-alpha.3": - version "4.1.0-alpha.3" - resolved "https://registry.yarnpkg.com/@loaders.gl/polyfills/-/polyfills-4.1.0-alpha.3.tgz#356d613b79ae3eff1df47b266d46dc2dac1e410e" - integrity sha512-t4C7zRF7GLFlXn5x6j3A0hKShFe3EZXX1NBQ+wYof0Po4PSN5XHVQVHVYG9JDNAukUFuKmMWIlmY+L5EGxkWSA== +"@loaders.gl/polyfills@^4.1.0-alpha.4": + version "4.1.0-alpha.4" + resolved "https://registry.yarnpkg.com/@loaders.gl/polyfills/-/polyfills-4.1.0-alpha.4.tgz#10ac42922583d0fcc6960c529bbdc5f9202acc87" + integrity sha512-JtGtPC+gu+3kNR2QZ2S1NuMRbMHC1/fRpfQs+Xa/ZSgIG4w3sTDmm7/+9/Hq4pGZqgaI/VGkmDVzH7Jy1kTuTQ== dependencies: "@babel/runtime" "^7.3.1" - "@loaders.gl/crypto" "4.1.0-alpha.3" - "@loaders.gl/loader-utils" "4.1.0-alpha.3" + "@loaders.gl/crypto" "4.1.0-alpha.4" + "@loaders.gl/loader-utils" "4.1.0-alpha.4" buffer "^6.0.3" get-pixels "^3.3.3" ndarray "^1.0.19" @@ -2335,10 +2335,10 @@ dependencies: "@types/geojson" "^7946.0.7" -"@loaders.gl/schema@4.1.0-alpha.3": - version "4.1.0-alpha.3" - resolved "https://registry.yarnpkg.com/@loaders.gl/schema/-/schema-4.1.0-alpha.3.tgz#01b65a60dc037ebf6972f4306fdfb5bf25fdd4ee" - integrity sha512-Gfb4PXSz9ZxiQhAk7yWjDhd5sOZmbTvvMa7Ads30ONoK/VuysYHDcc+3IlDnnCqU8hId7UJNoR72KE1ZmDKelQ== +"@loaders.gl/schema@4.1.0-alpha.4", "@loaders.gl/schema@^4.1.0-alpha.4": + version "4.1.0-alpha.4" + resolved "https://registry.yarnpkg.com/@loaders.gl/schema/-/schema-4.1.0-alpha.4.tgz#63825d99ac37180823c19240f77941f1cadf7781" + integrity sha512-eZ76TzxBkFymGgjDn5JYGJommDhc+F4otcR5Op+yHwXP/2RxSjgWhhveaBppTNqzDXVNJaW4WCRguL2ouBYuTQ== dependencies: "@types/geojson" "^7946.0.7" @@ -2353,15 +2353,15 @@ "@loaders.gl/schema" "3.4.14" "@mapbox/martini" "^0.2.0" -"@loaders.gl/textures@4.1.0-alpha.3": - version "4.1.0-alpha.3" - resolved "https://registry.yarnpkg.com/@loaders.gl/textures/-/textures-4.1.0-alpha.3.tgz#1267ed24edf2e2b2aad914e371c7b5e4bba9ff98" - integrity sha512-HFtKzQBo3yDcbGaWjHZm/DpF/Y8iZWVLeuI+pO5ggFhw1c4SrwqbQfKe16zd7h2wczItvZzt10KMgLxEUcTfpA== +"@loaders.gl/textures@4.1.0-alpha.4": + version "4.1.0-alpha.4" + resolved "https://registry.yarnpkg.com/@loaders.gl/textures/-/textures-4.1.0-alpha.4.tgz#fc85c2bc2764d73298bda469d3b38ef7f93ba5ad" + integrity sha512-XuG53YkzJZZxWG2/Tr3mJGxWqehYs/NPkqPNyj+Tr7NnWppAf/xtc4O1SPO3G430+vxXYwE92ndSalN2+NzV1A== dependencies: - "@loaders.gl/images" "4.1.0-alpha.3" - "@loaders.gl/loader-utils" "4.1.0-alpha.3" - "@loaders.gl/schema" "4.1.0-alpha.3" - "@loaders.gl/worker-utils" "4.1.0-alpha.3" + "@loaders.gl/images" "4.1.0-alpha.4" + "@loaders.gl/loader-utils" "4.1.0-alpha.4" + "@loaders.gl/schema" "4.1.0-alpha.4" + "@loaders.gl/worker-utils" "4.1.0-alpha.4" ktx-parse "^0.0.4" texture-compressor "^1.0.2" @@ -2386,13 +2386,13 @@ "@loaders.gl/loader-utils" "^2.1.3" gifshot "^0.4.5" -"@loaders.gl/wkt@4.1.0-alpha.3", "@loaders.gl/wkt@^4.1.0-alpha.3": - version "4.1.0-alpha.3" - resolved "https://registry.yarnpkg.com/@loaders.gl/wkt/-/wkt-4.1.0-alpha.3.tgz#54e99849131c140de9281de087facf7b06c8f572" - integrity sha512-N4CCAWYLlyCJp1gKndy40gg8Cu51qndVeGiRk+0qqWTe6heun8NeHSLtF8FQPzzA2PZDgQhUioTJfRPaNO6TMA== +"@loaders.gl/wkt@4.1.0-alpha.4", "@loaders.gl/wkt@^4.1.0-alpha.4": + version "4.1.0-alpha.4" + resolved "https://registry.yarnpkg.com/@loaders.gl/wkt/-/wkt-4.1.0-alpha.4.tgz#42cd5d931082aa18c32c4f62389bee7795ea4386" + integrity sha512-K1ZfdVha6xroJaX8EYrf6CMEZF8KVmlFjWOBaFD5/HhrD83nh3PB1IDsUt9MobSkCKqxRr2ZzoJeW092cK+I0w== dependencies: - "@loaders.gl/loader-utils" "4.1.0-alpha.3" - "@loaders.gl/schema" "4.1.0-alpha.3" + "@loaders.gl/loader-utils" "4.1.0-alpha.4" + "@loaders.gl/schema" "4.1.0-alpha.4" "@loaders.gl/wms@^3.4.13": version "3.4.14" @@ -2415,10 +2415,10 @@ dependencies: "@babel/runtime" "^7.3.1" -"@loaders.gl/worker-utils@4.1.0-alpha.3": - version "4.1.0-alpha.3" - resolved "https://registry.yarnpkg.com/@loaders.gl/worker-utils/-/worker-utils-4.1.0-alpha.3.tgz#c61e356f556e8e3a9f021a935dcb39495e396328" - integrity sha512-y3bM19vgpXsiRGvGnoxxWwt2ZcXxaqOMQskJ/7u3i2xG+cYfTdZDQY7w4MV1QfawU8sBOVOH29Rlk/p2zb/Wnw== +"@loaders.gl/worker-utils@4.1.0-alpha.4": + version "4.1.0-alpha.4" + resolved "https://registry.yarnpkg.com/@loaders.gl/worker-utils/-/worker-utils-4.1.0-alpha.4.tgz#02d8743d90a6c0528f8d9cea4e48cbe8136cf316" + integrity sha512-fj57TxnRRCMVYbjI6Zndhm71QD1ZZvjNEFch2G47nAaDF6VoqIxwflFc6WHiaQcwAiVxgGGqrugzlbDtHUJd/Q== dependencies: "@babel/runtime" "^7.3.1"