@deck.gl/geo-layers 8.9.1 → 8.9.3
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 +1511 -6872
- package/dist/es5/wms-layer/utils.js +18 -0
- package/dist/es5/wms-layer/utils.js.map +1 -0
- package/dist/es5/wms-layer/wms-layer.js +4 -8
- package/dist/es5/wms-layer/wms-layer.js.map +1 -1
- package/dist/esm/wms-layer/utils.js +9 -0
- package/dist/esm/wms-layer/utils.js.map +1 -0
- package/dist/esm/wms-layer/wms-layer.js +3 -7
- package/dist/esm/wms-layer/wms-layer.js.map +1 -1
- package/dist.min.js +56 -59
- package/package.json +2 -3
- package/src/wms-layer/utils.ts +15 -0
- package/src/wms-layer/wms-layer.ts +3 -5
- package/typed/wms-layer/utils.d.ts +5 -0
- package/typed/wms-layer/utils.d.ts.map +1 -0
- 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.9.
|
|
5
|
+
"version": "8.9.3",
|
|
6
6
|
"publishConfig": {
|
|
7
7
|
"access": "public"
|
|
8
8
|
},
|
|
@@ -42,7 +42,6 @@
|
|
|
42
42
|
"@luma.gl/experimental": "^8.5.16",
|
|
43
43
|
"@math.gl/core": "^3.6.2",
|
|
44
44
|
"@math.gl/culling": "^3.6.2",
|
|
45
|
-
"@math.gl/proj4": "^3.6.3",
|
|
46
45
|
"@math.gl/web-mercator": "^3.6.2",
|
|
47
46
|
"@types/geojson": "^7946.0.8",
|
|
48
47
|
"h3-js": "^3.7.0",
|
|
@@ -56,5 +55,5 @@
|
|
|
56
55
|
"@loaders.gl/core": "^3.3.0",
|
|
57
56
|
"@luma.gl/core": "^8.0.0"
|
|
58
57
|
},
|
|
59
|
-
"gitHead": "
|
|
58
|
+
"gitHead": "6f194255993e10898d6bd01ea38935385d222dd4"
|
|
60
59
|
}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import {lngLatToWorld} from '@math.gl/web-mercator';
|
|
2
|
+
|
|
3
|
+
// https://epsg.io/3857
|
|
4
|
+
// +proj=merc +a=6378137 +b=6378137 +lat_ts=0 +lon_0=0 +x_0=0 +y_0=0 +k=1 +units=m +nadgrids=@null +wktext +no_defs +type=crs
|
|
5
|
+
const HALF_EARTH_CIRCUMFERENCE = 6378137 * Math.PI;
|
|
6
|
+
|
|
7
|
+
/** Projects EPSG:4326 to EPSG:3857
|
|
8
|
+
* This is a lightweight replacement of proj4. Use tests to ensure conformance.
|
|
9
|
+
*/
|
|
10
|
+
export function WGS84ToPseudoMercator(coord: [number, number]): [number, number] {
|
|
11
|
+
const mercator = lngLatToWorld(coord);
|
|
12
|
+
mercator[0] = (mercator[0] / 256 - 1) * HALF_EARTH_CIRCUMFERENCE;
|
|
13
|
+
mercator[1] = (mercator[1] / 256 - 1) * HALF_EARTH_CIRCUMFERENCE;
|
|
14
|
+
return mercator;
|
|
15
|
+
}
|
|
@@ -18,7 +18,7 @@ import {
|
|
|
18
18
|
import {BitmapLayer} from '@deck.gl/layers';
|
|
19
19
|
import type {ImageSourceMetadata, ImageType, ImageServiceType} from '@loaders.gl/wms';
|
|
20
20
|
import {ImageSource, createImageSource} from '@loaders.gl/wms';
|
|
21
|
-
import {
|
|
21
|
+
import {WGS84ToPseudoMercator} from './utils';
|
|
22
22
|
|
|
23
23
|
/** All props supported by the TileLayer */
|
|
24
24
|
export type WMSLayerProps = CompositeLayerProps & _WMSLayerProps;
|
|
@@ -55,8 +55,6 @@ const defaultProps: DefaultProps<WMSLayerProps> = {
|
|
|
55
55
|
}
|
|
56
56
|
};
|
|
57
57
|
|
|
58
|
-
const projConverter = new Proj4Projection({from: 'EPSG:4326', to: 'EPSG:3857'});
|
|
59
|
-
|
|
60
58
|
/**
|
|
61
59
|
* The layer is used in Hex Tile layer in order to properly discard invisible elements during animation
|
|
62
60
|
*/
|
|
@@ -205,8 +203,8 @@ export class WMSLayer<ExtraPropsT extends {} = {}> extends CompositeLayer<
|
|
|
205
203
|
srs
|
|
206
204
|
};
|
|
207
205
|
if (srs === 'EPSG:3857') {
|
|
208
|
-
const [minX, minY] =
|
|
209
|
-
const [maxX, maxY] =
|
|
206
|
+
const [minX, minY] = WGS84ToPseudoMercator([bounds[0], bounds[1]]);
|
|
207
|
+
const [maxX, maxY] = WGS84ToPseudoMercator([bounds[2], bounds[3]]);
|
|
210
208
|
requestParams.bbox = [minX, minY, maxX, maxY];
|
|
211
209
|
}
|
|
212
210
|
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/wms-layer/utils.ts"],"names":[],"mappings":"AAMA;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAK/E"}
|
|
@@ -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,EAAE,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AACtF,OAAO,EAAC,WAAW,EAAoB,MAAM,iBAAiB,CAAC;AAG/D,2CAA2C;AAC3C,oBAAY,aAAa,GAAG,mBAAmB,GAAG,cAAc,CAAC;AAEjE,mCAAmC;AACnC,aAAK,cAAc,GAAG;IACpB,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;IAC3B,WAAW,CAAC,EAAE,gBAAgB,GAAG,MAAM,CAAC;IACxC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,GAAG,CAAC,EAAE,WAAW,GAAG,WAAW,GAAG,MAAM,CAAC;IACzC,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,mBAAmB,KAAK,IAAI,CAAC;IACzD,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAC7C,gBAAgB,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;IAChD,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;IAC3C,gBAAgB,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAC/D,CAAC;
|
|
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,EAAE,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AACtF,OAAO,EAAC,WAAW,EAAoB,MAAM,iBAAiB,CAAC;AAG/D,2CAA2C;AAC3C,oBAAY,aAAa,GAAG,mBAAmB,GAAG,cAAc,CAAC;AAEjE,mCAAmC;AACnC,aAAK,cAAc,GAAG;IACpB,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;IAC3B,WAAW,CAAC,EAAE,gBAAgB,GAAG,MAAM,CAAC;IACxC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,GAAG,CAAC,EAAE,WAAW,GAAG,WAAW,GAAG,MAAM,CAAC;IACzC,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,mBAAmB,KAAK,IAAI,CAAC;IACzD,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAC7C,gBAAgB,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;IAChD,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;IAC3C,gBAAgB,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAC/D,CAAC;AAqBF;;GAEG;AACH,qBAAa,QAAQ,CAAC,WAAW,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,cAAc,CACvE,WAAW,GAAG,QAAQ,CAAC,cAAc,CAAC,CACvC;IACC,MAAM,CAAC,SAAS,SAAc;IAC9B,MAAM,CAAC,YAAY,EAAE,YAAY,CAAgB;IAEjD,KAAK,EAAG;QACN,WAAW,EAAE,WAAW,CAAC;QACzB,KAAK,EAAE,SAAS,CAAC;QACjB,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QACzC,qBAAqB,EAAE;YACrB,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;YACvC,MAAM,EAAE,MAAM,EAAE,CAAC;YACjB,GAAG,EAAE,WAAW,GAAG,WAAW,CAAC;YAC/B,KAAK,EAAE,MAAM,CAAC;YACd,MAAM,EAAE,MAAM,CAAC;SAChB,CAAC;QACF,aAAa,EAAE,MAAM,CAAC;QAEtB,cAAc,EAAE,MAAM,CAAC;QACvB,UAAU,EAAE,GAAG,CAAC;KACjB,CAAC;IAEF,4DAA4D;IACnD,iBAAiB,IAAI,OAAO;IAI5B,eAAe,IAAI,IAAI;IAMvB,WAAW,CAAC,EAAC,WAAW,EAAE,KAAK,EAAE,QAAQ,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI;IAgBzE,aAAa,IAAI,IAAI;IAIrB,YAAY,IAAI,KAAK;IAmBxB,kBAAkB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAgBtE,kBAAkB,CAAC,KAAK,EAAE,aAAa,GAAG,WAAW;IAgBrD,6CAA6C;IACvC,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAcpC,oBAAoB;IACd,SAAS,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqDlE,oDAAoD;IACpD,OAAO,CAAC,YAAY;IAIpB,8FAA8F;IAC9F,OAAO,CAAC,QAAQ;CAIjB"}
|