@deck.gl/geo-layers 8.10.0-alpha.6 → 8.10.0-alpha.7
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/dist/dist.dev.js +8612 -6342
- package/dist/es5/mvt-layer/find-index-binary.js.map +1 -1
- package/dist/es5/mvt-layer/mvt-layer.js.map +1 -1
- package/dist/es5/wms-layer/wms-layer.js.map +1 -1
- package/dist/esm/mvt-layer/find-index-binary.js.map +1 -1
- package/dist/esm/mvt-layer/mvt-layer.js.map +1 -1
- package/dist/esm/wms-layer/wms-layer.js.map +1 -1
- package/dist.min.js +45 -111
- package/package.json +14 -14
- package/src/mvt-layer/find-index-binary.ts +6 -6
- package/src/mvt-layer/mvt-layer.ts +3 -3
- package/src/wms-layer/wms-layer.ts +3 -1
- package/typed/mvt-layer/find-index-binary.d.ts +2 -2
- package/typed/mvt-layer/find-index-binary.d.ts.map +1 -1
- package/typed/mvt-layer/mvt-layer.d.ts +2 -2
- package/typed/mvt-layer/mvt-layer.d.ts.map +1 -1
- package/typed/wms-layer/wms-layer.d.ts +2 -1
- package/typed/wms-layer/wms-layer.d.ts.map +1 -1
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@deck.gl/geo-layers",
|
|
3
3
|
"description": "deck.gl layers supporting geospatial use cases and GIS formats",
|
|
4
4
|
"license": "MIT",
|
|
5
|
-
"version": "8.10.0-alpha.
|
|
5
|
+
"version": "8.10.0-alpha.7",
|
|
6
6
|
"publishConfig": {
|
|
7
7
|
"access": "public"
|
|
8
8
|
},
|
|
@@ -31,19 +31,19 @@
|
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
33
|
"@babel/runtime": "^7.0.0",
|
|
34
|
-
"@loaders.gl/3d-tiles": "^
|
|
35
|
-
"@loaders.gl/gis": "^
|
|
36
|
-
"@loaders.gl/loader-utils": "^
|
|
37
|
-
"@loaders.gl/mvt": "^
|
|
38
|
-
"@loaders.gl/schema": "^
|
|
39
|
-
"@loaders.gl/terrain": "^
|
|
40
|
-
"@loaders.gl/tiles": "^
|
|
41
|
-
"@loaders.gl/wms": "^
|
|
34
|
+
"@loaders.gl/3d-tiles": "^4.0.1",
|
|
35
|
+
"@loaders.gl/gis": "^4.0.1",
|
|
36
|
+
"@loaders.gl/loader-utils": "^4.0.1",
|
|
37
|
+
"@loaders.gl/mvt": "^4.0.1",
|
|
38
|
+
"@loaders.gl/schema": "^4.0.1",
|
|
39
|
+
"@loaders.gl/terrain": "^4.0.1",
|
|
40
|
+
"@loaders.gl/tiles": "^4.0.1",
|
|
41
|
+
"@loaders.gl/wms": "^4.0.1",
|
|
42
42
|
"@luma.gl/constants": "^8.5.20",
|
|
43
43
|
"@luma.gl/experimental": "^8.5.20",
|
|
44
|
-
"@math.gl/core": "^
|
|
45
|
-
"@math.gl/culling": "^
|
|
46
|
-
"@math.gl/web-mercator": "^
|
|
44
|
+
"@math.gl/core": "^4.0.0",
|
|
45
|
+
"@math.gl/culling": "^4.0.0",
|
|
46
|
+
"@math.gl/web-mercator": "^4.0.0",
|
|
47
47
|
"@types/geojson": "^7946.0.8",
|
|
48
48
|
"h3-js": "^4.1.0",
|
|
49
49
|
"long": "^3.2.0"
|
|
@@ -53,8 +53,8 @@
|
|
|
53
53
|
"@deck.gl/extensions": "^8.0.0",
|
|
54
54
|
"@deck.gl/layers": "^8.0.0",
|
|
55
55
|
"@deck.gl/mesh-layers": "^8.0.0",
|
|
56
|
-
"@loaders.gl/core": "^
|
|
56
|
+
"@loaders.gl/core": "^4.0.1",
|
|
57
57
|
"@luma.gl/core": "^8.0.0"
|
|
58
58
|
},
|
|
59
|
-
"gitHead": "
|
|
59
|
+
"gitHead": "1c62a9eec914019afd3969bc0c59f1488e491207"
|
|
60
60
|
}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import type {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
2
|
+
BinaryFeatureCollection,
|
|
3
|
+
BinaryLineFeature,
|
|
4
|
+
BinaryPointFeature,
|
|
5
|
+
BinaryPolygonFeature
|
|
6
6
|
} from '@loaders.gl/schema';
|
|
7
7
|
|
|
8
|
-
type FeatureTypes =
|
|
8
|
+
type FeatureTypes = BinaryPointFeature | BinaryLineFeature | BinaryPolygonFeature;
|
|
9
9
|
|
|
10
10
|
const GEOM_TYPES = ['points', 'lines', 'polygons'];
|
|
11
11
|
/**
|
|
@@ -18,7 +18,7 @@ const GEOM_TYPES = ['points', 'lines', 'polygons'];
|
|
|
18
18
|
* @param {String} layerName - the layer to search in
|
|
19
19
|
*/
|
|
20
20
|
export default function findIndexBinary(
|
|
21
|
-
data:
|
|
21
|
+
data: BinaryFeatureCollection,
|
|
22
22
|
uniqueIdProperty: string,
|
|
23
23
|
featureId: string | number,
|
|
24
24
|
layerName: string
|
|
@@ -17,7 +17,7 @@ import {MVTWorkerLoader} from '@loaders.gl/mvt';
|
|
|
17
17
|
import {binaryToGeojson} from '@loaders.gl/gis';
|
|
18
18
|
|
|
19
19
|
import type {Loader} from '@loaders.gl/loader-utils';
|
|
20
|
-
import type {
|
|
20
|
+
import type {BinaryFeatureCollection} from '@loaders.gl/schema';
|
|
21
21
|
import type {Feature} from 'geojson';
|
|
22
22
|
|
|
23
23
|
import {transform} from './coordinate-transform';
|
|
@@ -59,7 +59,7 @@ export type TileJson = {
|
|
|
59
59
|
version?: string;
|
|
60
60
|
};
|
|
61
61
|
|
|
62
|
-
type ParsedMvtTile = Feature[] |
|
|
62
|
+
type ParsedMvtTile = Feature[] | BinaryFeatureCollection;
|
|
63
63
|
|
|
64
64
|
/** All props supported by the MVTLayer */
|
|
65
65
|
export type MVTLayerProps = _MVTLayerProps &
|
|
@@ -289,7 +289,7 @@ export default class MVTLayer<ExtraProps extends {} = {}> extends TileLayer<
|
|
|
289
289
|
|
|
290
290
|
if (this.state.binary && info.index !== -1) {
|
|
291
291
|
const {data} = params.sourceLayer!.props;
|
|
292
|
-
info.object = binaryToGeojson(data as
|
|
292
|
+
info.object = binaryToGeojson(data as BinaryFeatureCollection, {
|
|
293
293
|
globalFeatureId: info.index
|
|
294
294
|
}) as Feature;
|
|
295
295
|
}
|
|
@@ -16,7 +16,8 @@ import {
|
|
|
16
16
|
_deepEqual as deepEqual
|
|
17
17
|
} from '@deck.gl/core';
|
|
18
18
|
import {BitmapLayer} from '@deck.gl/layers';
|
|
19
|
-
import type {ImageSourceMetadata, ImageType
|
|
19
|
+
import type {ImageSourceMetadata, ImageType} from '@loaders.gl/loader-utils';
|
|
20
|
+
import type {ImageServiceType} from '@loaders.gl/wms';
|
|
20
21
|
import {ImageSource, createImageSource} from '@loaders.gl/wms';
|
|
21
22
|
import {WGS84ToPseudoMercator} from './utils';
|
|
22
23
|
|
|
@@ -223,6 +224,7 @@ export class WMSLayer<ExtraPropsT extends {} = {}> extends CompositeLayer<
|
|
|
223
224
|
this.state.loadCounter++;
|
|
224
225
|
this.props.onImageLoadStart(requestId);
|
|
225
226
|
|
|
227
|
+
// @ts-expect-error Check type changes
|
|
226
228
|
const image = await this.state.imageSource.getImage(requestParams);
|
|
227
229
|
|
|
228
230
|
// If a request takes a long time, later requests may have already loaded.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { BinaryFeatureCollection } from '@loaders.gl/schema';
|
|
2
2
|
/**
|
|
3
3
|
* Return the index of feature (numericProps or featureIds) for given feature id
|
|
4
4
|
* Example: findIndexBinary(data, 'id', 33) will return the index in the array of numericProps
|
|
@@ -8,5 +8,5 @@ import type { BinaryFeatures } from '@loaders.gl/schema';
|
|
|
8
8
|
* @param {Number|String} featureId - feature id to find
|
|
9
9
|
* @param {String} layerName - the layer to search in
|
|
10
10
|
*/
|
|
11
|
-
export default function findIndexBinary(data:
|
|
11
|
+
export default function findIndexBinary(data: BinaryFeatureCollection, uniqueIdProperty: string, featureId: string | number, layerName: string): number;
|
|
12
12
|
//# sourceMappingURL=find-index-binary.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find-index-binary.d.ts","sourceRoot":"","sources":["../../src/mvt-layer/find-index-binary.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,
|
|
1
|
+
{"version":3,"file":"find-index-binary.d.ts","sourceRoot":"","sources":["../../src/mvt-layer/find-index-binary.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,uBAAuB,EAIxB,MAAM,oBAAoB,CAAC;AAK5B;;;;;;;;GAQG;AACH,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,IAAI,EAAE,uBAAuB,EAC7B,gBAAgB,EAAE,MAAM,EACxB,SAAS,EAAE,MAAM,GAAG,MAAM,EAC1B,SAAS,EAAE,MAAM,GAChB,MAAM,CASR"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Layer, LayersList, PickingInfo, UpdateParameters, GetPickingInfoParams, DefaultProps } from '@deck.gl/core/typed';
|
|
2
2
|
import { GeoJsonLayerProps } from '@deck.gl/layers/typed';
|
|
3
3
|
import type { Loader } from '@loaders.gl/loader-utils';
|
|
4
|
-
import type {
|
|
4
|
+
import type { BinaryFeatureCollection } from '@loaders.gl/schema';
|
|
5
5
|
import type { Feature } from 'geojson';
|
|
6
6
|
import TileLayer, { TiledPickingInfo, TileLayerProps } from '../tile-layer/tile-layer';
|
|
7
7
|
import type { Tileset2DProps, TileLoadProps } from '../tileset-2d';
|
|
@@ -16,7 +16,7 @@ export declare type TileJson = {
|
|
|
16
16
|
minzoom?: number;
|
|
17
17
|
version?: string;
|
|
18
18
|
};
|
|
19
|
-
declare type ParsedMvtTile = Feature[] |
|
|
19
|
+
declare type ParsedMvtTile = Feature[] | BinaryFeatureCollection;
|
|
20
20
|
/** All props supported by the MVTLayer */
|
|
21
21
|
export declare type MVTLayerProps = _MVTLayerProps & Omit<GeoJsonLayerProps, 'data'> & TileLayerProps<ParsedMvtTile>;
|
|
22
22
|
/** Props added by the MVTLayer */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mvt-layer.d.ts","sourceRoot":"","sources":["../../src/mvt-layer/mvt-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,UAAU,EAEV,WAAW,EACX,gBAAgB,EAChB,oBAAoB,EAGpB,YAAY,EACb,MAAM,eAAe,CAAC;AACvB,OAAO,EAAe,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAOhE,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,0BAA0B,CAAC;AACrD,OAAO,KAAK,EAAC,
|
|
1
|
+
{"version":3,"file":"mvt-layer.d.ts","sourceRoot":"","sources":["../../src/mvt-layer/mvt-layer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Layer, CompositeLayer, CompositeLayerProps, UpdateParameters, DefaultProps, Viewport } from '@deck.gl/core/typed';
|
|
2
|
-
import type { ImageSourceMetadata, ImageType
|
|
2
|
+
import type { ImageSourceMetadata, ImageType } from '@loaders.gl/loader-utils';
|
|
3
|
+
import type { ImageServiceType } from '@loaders.gl/wms';
|
|
3
4
|
import { ImageSource } from '@loaders.gl/wms';
|
|
4
5
|
/** All props supported by the TileLayer */
|
|
5
6
|
export declare type WMSLayerProps = CompositeLayerProps & _WMSLayerProps;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wms-layer.d.ts","sourceRoot":"","sources":["../../src/wms-layer/wms-layer.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,KAAK,EACL,cAAc,EACd,mBAAmB,EACnB,gBAAgB,EAChB,YAAY,EACZ,QAAQ,EAGT,MAAM,eAAe,CAAC;AAEvB,OAAO,KAAK,EAAC,mBAAmB,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"wms-layer.d.ts","sourceRoot":"","sources":["../../src/wms-layer/wms-layer.ts"],"names":[],"mappings":"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"}
|