@webviz/subsurface-viewer 0.2.3 → 0.3.1
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/DashSubsurfaceViewer.d.ts +4 -0
- package/dist/DashSubsurfaceViewer.js +28 -0
- package/dist/DashSubsurfaceViewer.js.map +1 -0
- package/dist/components/ViewAnnotation.d.ts +1 -2
- package/dist/components/ViewFooter.d.ts +1 -2
- package/dist/index.d.ts +1 -0
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/layers/grid3d/grid3dLayer.d.ts +3 -1
- package/dist/layers/grid3d/grid3dLayer.js.map +1 -1
- package/dist/layers/grid3d/privateLayer.d.ts +1 -1
- package/dist/layers/grid3d/privateLayer.js +1 -24
- package/dist/layers/grid3d/privateLayer.js.map +1 -1
- package/dist/layers/map/fragment.fs.glsl.d.ts +1 -1
- package/dist/layers/map/fragment.fs.glsl.js +8 -10
- package/dist/layers/map/fragment.fs.glsl.js.map +1 -1
- package/dist/layers/map/fragment_lines.glsl.d.ts +1 -1
- package/dist/layers/map/fragment_lines.glsl.js +0 -7
- package/dist/layers/map/fragment_lines.glsl.js.map +1 -1
- package/dist/layers/map/mapLayer.d.ts +4 -2
- package/dist/layers/map/mapLayer.js +74 -65
- package/dist/layers/map/mapLayer.js.map +1 -1
- package/dist/layers/map/privateMapLayer.d.ts +6 -42
- package/dist/layers/map/privateMapLayer.js +17 -42
- package/dist/layers/map/privateMapLayer.js.map +1 -1
- package/dist/layers/map/utils.d.ts +5 -0
- package/dist/layers/map/utils.js +425 -0
- package/dist/layers/map/utils.js.map +1 -0
- package/dist/layers/utils/layerTools.d.ts +11 -0
- package/dist/layers/utils/layerTools.js +37 -0
- package/dist/layers/utils/layerTools.js.map +1 -1
- package/package.json +1 -1
- package/dist/layers/map/webworker.d.ts +0 -4
- package/dist/layers/map/webworker.js +0 -366
- package/dist/layers/map/webworker.js.map +0 -1
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
var __rest = (this && this.__rest) || function (s, e) {
|
|
2
|
+
var t = {};
|
|
3
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
4
|
+
t[p] = s[p];
|
|
5
|
+
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
6
|
+
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
7
|
+
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
8
|
+
t[p[i]] = s[p[i]];
|
|
9
|
+
}
|
|
10
|
+
return t;
|
|
11
|
+
};
|
|
12
|
+
import React from "react";
|
|
13
|
+
import SubsurfaceViewer from "./SubsurfaceViewer";
|
|
14
|
+
import { View } from "@deck.gl/core/typed";
|
|
15
|
+
function mapAnnotation(annotationContainers) {
|
|
16
|
+
return React.Children.map(annotationContainers, (annotationContainer) => {
|
|
17
|
+
const viewId = annotationContainer.key;
|
|
18
|
+
return (
|
|
19
|
+
// @ts-expect-error This is proven to work in JavaScript
|
|
20
|
+
React.createElement(View, { key: viewId, id: viewId }, annotationContainer));
|
|
21
|
+
});
|
|
22
|
+
}
|
|
23
|
+
const DashSubsurfaceViewer = (props) => {
|
|
24
|
+
const { children } = props, rest = __rest(props, ["children"]);
|
|
25
|
+
return (React.createElement(SubsurfaceViewer, Object.assign({}, rest), mapAnnotation(children)));
|
|
26
|
+
};
|
|
27
|
+
export default DashSubsurfaceViewer;
|
|
28
|
+
//# sourceMappingURL=DashSubsurfaceViewer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DashSubsurfaceViewer.js","sourceRoot":"","sources":["../src/DashSubsurfaceViewer.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAE3C,SAAS,aAAa,CAAC,oBAAqC;IACxD,OAAO,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC,mBAAmB,EAAE,EAAE;QACpE,MAAM,MAAM,GAAI,mBAA0C,CAAC,GAAG,CAAC;QAC/D,OAAO;QACH,wDAAwD;QACxD,oBAAC,IAAI,IAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,IACxB,mBAAmB,CACjB,CACV,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC;AAED,MAAM,oBAAoB,GAAoC,CAAC,KAAK,EAAE,EAAE;IACpE,MAAM,EAAE,QAAQ,KAAc,KAAK,EAAd,IAAI,UAAK,KAAK,EAA7B,YAAqB,CAAQ,CAAC;IACpC,OAAO,CACH,oBAAC,gBAAgB,oBAAK,IAAI,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAoB,CAC3E,CAAC;AACN,CAAC,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export { default } from "./SubsurfaceViewer";
|
|
2
|
+
export { default as DashSubsurfaceViewer } from "./DashSubsurfaceViewer";
|
|
2
3
|
export type { BoundsAccessor, LightsType, MapMouseEvent, SubsurfaceViewerProps, TooltipCallback, ViewStateType, ViewsType, colorTablesArray, } from "./SubsurfaceViewer";
|
|
3
4
|
export type { BoundingBox3D, ViewportType } from "./components/Map";
|
|
4
5
|
export type { ExtendedLayerProps, LayerPickInfo, PropertyDataType, } from "./layers/utils/layerTools";
|
package/dist/index.js
CHANGED
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,OAAO,IAAI,oBAAoB,EAAE,MAAM,wBAAwB,CAAC"}
|
|
@@ -42,8 +42,10 @@ export interface Grid3DLayerProps extends ExtendedLayerProps {
|
|
|
42
42
|
* If defined this function will override the color map.
|
|
43
43
|
* Takes a value in the range [0,1] and returns a color.
|
|
44
44
|
* E.g. (x) => [x * 255, x * 255, x * 255]
|
|
45
|
+
* May also be set as constant color:
|
|
46
|
+
* E.g. [255, 0, 0] for constant red cells.
|
|
45
47
|
*/
|
|
46
|
-
colorMapFunction?: colorMapFunctionType
|
|
48
|
+
colorMapFunction?: colorMapFunctionType;
|
|
47
49
|
/** Enable lines around cell faces.
|
|
48
50
|
* default: true.
|
|
49
51
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grid3dLayer.js","sourceRoot":"","sources":["../../../src/layers/grid3d/grid3dLayer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"grid3dLayer.js","sourceRoot":"","sources":["../../../src/layers/grid3d/grid3dLayer.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,7 +56,7 @@ export interface privateLayerProps extends ExtendedLayerProps {
|
|
|
56
56
|
colorMapName: string;
|
|
57
57
|
colorMapRange: [number, number];
|
|
58
58
|
colorMapClampColor: Color | undefined | boolean;
|
|
59
|
-
colorMapFunction?: colorMapFunctionType
|
|
59
|
+
colorMapFunction?: colorMapFunctionType;
|
|
60
60
|
gridLines: boolean;
|
|
61
61
|
propertyValueRange: [number, number];
|
|
62
62
|
depthTest: boolean;
|
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
import { COORDINATE_SYSTEM, Layer, picking, project, phongLighting, } from "@deck.gl/core/typed";
|
|
2
2
|
import { createPropertyData } from "../utils/layerTools";
|
|
3
3
|
import { Model, Geometry } from "@luma.gl/engine";
|
|
4
|
+
import { getImageData } from "../utils/layerTools";
|
|
4
5
|
import vsShader from "./vertex.glsl";
|
|
5
6
|
import fsShader from "./fragment.fs.glsl";
|
|
6
7
|
import vsLineShader from "./vertex_lines.glsl";
|
|
7
8
|
import fsLineShader from "./fragment_lines.glsl";
|
|
8
|
-
import { rgbValues } from "@emerson-eps/color-tables/";
|
|
9
|
-
import { createDefaultContinuousColorScale } from "@emerson-eps/color-tables/dist/component/Utils/legendCommonFunction";
|
|
10
9
|
import { Texture2D } from "@luma.gl/webgl";
|
|
11
10
|
import GL from "@luma.gl/constants";
|
|
12
11
|
const DEFAULT_TEXTURE_PARAMETERS = {
|
|
@@ -15,28 +14,6 @@ const DEFAULT_TEXTURE_PARAMETERS = {
|
|
|
15
14
|
[GL.TEXTURE_WRAP_S]: GL.CLAMP_TO_EDGE,
|
|
16
15
|
[GL.TEXTURE_WRAP_T]: GL.CLAMP_TO_EDGE,
|
|
17
16
|
};
|
|
18
|
-
function getImageData(colorMapName, colorTables, colorMapFunction) {
|
|
19
|
-
const isColorMapFunctionDefined = typeof colorMapFunction === "function";
|
|
20
|
-
const isColorMapNameDefined = !!colorMapName;
|
|
21
|
-
const data = new Uint8Array(256 * 3);
|
|
22
|
-
const defaultColorMap = createDefaultContinuousColorScale;
|
|
23
|
-
let colorMap = colorMapFunction;
|
|
24
|
-
if (!isColorMapFunctionDefined) {
|
|
25
|
-
colorMap = isColorMapNameDefined
|
|
26
|
-
? (value) => rgbValues(value, colorMapName, colorTables)
|
|
27
|
-
: defaultColorMap();
|
|
28
|
-
}
|
|
29
|
-
for (let i = 0; i < 256; i++) {
|
|
30
|
-
const value = i / 255.0;
|
|
31
|
-
const color = colorMap ? colorMap(value) : [0, 0, 0];
|
|
32
|
-
if (color) {
|
|
33
|
-
data[3 * i + 0] = color[0];
|
|
34
|
-
data[3 * i + 1] = color[1];
|
|
35
|
-
data[3 * i + 2] = color[2];
|
|
36
|
-
}
|
|
37
|
-
}
|
|
38
|
-
return data ? data : [0, 0, 0];
|
|
39
|
-
}
|
|
40
17
|
const defaultProps = {
|
|
41
18
|
colorMapName: "",
|
|
42
19
|
coordinateSystem: COORDINATE_SYSTEM.CARTESIAN,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"privateLayer.js","sourceRoot":"","sources":["../../../src/layers/grid3d/privateLayer.ts"],"names":[],"mappings":"AACA,OAAO,EACH,iBAAiB,EACjB,KAAK,EACL,OAAO,EACP,OAAO,EACP,aAAa,GAChB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"privateLayer.js","sourceRoot":"","sources":["../../../src/layers/grid3d/privateLayer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const fsShader = "#version 300 es\n#define SHADER_NAME terrainmap-shader\n\nprecision highp float;\n\n\nuniform bool isContoursDepth;\nuniform float contourReferencePoint;\nuniform float contourInterval;\n\nin vec2 vTexCoord;\nin vec3 cameraPosition;\nin vec3 normals_commonspace;\nin vec4 position_commonspace;\nin vec4 vColor;\n\nflat in int vertex_indexs_;\n\nout vec4 fragColor;\n\nin vec3 worldPos;\nin float property;\n\nuniform sampler2D colormap;\n\nuniform float valueRangeMin;\nuniform float valueRangeMax;\nuniform float colorMapRangeMin;\nuniform float colorMapRangeMax;\n\nuniform vec3 colorMapClampColor;\nuniform bool isClampColor;\nuniform bool isColorMapClampColorTransparent;\nuniform bool smoothShading;\n\n\nvoid main(void) {\n geometry.uv = vTexCoord;\n\n vec3 normal = normals_commonspace;\n\n if (!smoothShading) {\n normal = normalize(cross(dFdx(position_commonspace.xyz), dFdy(position_commonspace.xyz)));\n }
|
|
1
|
+
declare const fsShader = "#version 300 es\n#define SHADER_NAME terrainmap-shader\n\nprecision highp float;\n\n\nuniform bool isContoursDepth;\nuniform float contourReferencePoint;\nuniform float contourInterval;\n\nin vec2 vTexCoord;\nin vec3 cameraPosition;\nin vec3 normals_commonspace;\nin vec4 position_commonspace;\nin vec4 vColor;\n\nflat in int vertex_indexs_;\n\nout vec4 fragColor;\n\nin vec3 worldPos;\nin float property;\n\nuniform sampler2D colormap;\n\nuniform float valueRangeMin;\nuniform float valueRangeMax;\nuniform float colorMapRangeMin;\nuniform float colorMapRangeMax;\n\nuniform vec3 colorMapClampColor;\nuniform bool isClampColor;\nuniform bool isColorMapClampColorTransparent;\nuniform bool smoothShading;\n\n\nvoid main(void) { \n geometry.uv = vTexCoord;\n\n vec3 normal = normals_commonspace;\n // These are sent as Int8\n normal[0] /= 127.0;\n normal[1] /= 127.0;\n normal[2] /= 127.0;\n\n if (!smoothShading || (normal[0] == 0.0 && normal[1] == 0.0 && normal[2] == 0.0)) {\n normal = normalize(cross(dFdx(position_commonspace.xyz), dFdy(position_commonspace.xyz)));\n }\n\n //Picking pass.\n if (picking_uActive) {\n // Express triangle index in 255 system.\n float r = 0.0;\n float g = 0.0;\n float b = 0.0;\n \n int idx = vertex_indexs_;\n \n if (idx >= (256 * 256) - 1) {\n r = floor(float(idx) / (256.0 * 256.0));\n idx -= int(r * (256.0 * 256.0));\n }\n \n if (idx >= 256 - 1) {\n g = floor(float(idx) / 256.0);\n idx -= int(g * 256.0);\n }\n \n b = float(idx);\n \n fragColor = vec4(r / 255.0, g / 255.0, b / 255.0, 1.0);\n return;\n }\n\n vec4 color = vec4(1.0, 1.0, 1.0, 1.0);;\n float propertyValue = property;\n\n float x = (propertyValue - colorMapRangeMin) / (colorMapRangeMax - colorMapRangeMin);\n if (x < 0.0 || x > 1.0) {\n // Out of range. Use clampcolor.\n if (isClampColor) {\n color = vec4(colorMapClampColor.rgb, 1.0);\n\n }\n else if (isColorMapClampColorTransparent) {\n discard;\n return;\n }\n else {\n // Use min/max color to clamp.\n x = max(0.0, x);\n x = min(1.0, x);\n\n color = texture2D(colormap, vec2(x, 0.5));\n }\n }\n else {\n color = texture2D(colormap, vec2(x, 0.5));\n }\n\n \n bool is_contours = contourReferencePoint != -1.0 && contourInterval != -1.0;\n if (is_contours) {\n // Contours are made of either depths or properties.\n float val = isContoursDepth ? (abs(worldPos.z) - contourReferencePoint) / contourInterval\n : (propertyValue - contourReferencePoint) / contourInterval;\n\n float f = fract(val);\n float df = fwidth(val);\n\n // keep: float c = smoothstep(df * 1.0, df * 2.0, f); // smootstep from/to no of pixels distance fronm contour line.\n float c = smoothstep(0.0, df * 2.0, f);\n\n color = color * vec4(c, c, c, 1.0);\n }\n\n // Use normal lighting. This has no effect if \"material\" property is not set.\n vec3 lightColor = lighting_getLightColor(color.rgb, cameraPosition, position_commonspace.xyz, normal);\n fragColor = vec4(lightColor, 1.0);\n\n DECKGL_FILTER_COLOR(fragColor, geometry);\n}\n";
|
|
2
2
|
export default fsShader;
|
|
@@ -34,21 +34,19 @@ uniform bool isColorMapClampColorTransparent;
|
|
|
34
34
|
uniform bool smoothShading;
|
|
35
35
|
|
|
36
36
|
|
|
37
|
-
void main(void) {
|
|
37
|
+
void main(void) {
|
|
38
38
|
geometry.uv = vTexCoord;
|
|
39
39
|
|
|
40
40
|
vec3 normal = normals_commonspace;
|
|
41
|
+
// These are sent as Int8
|
|
42
|
+
normal[0] /= 127.0;
|
|
43
|
+
normal[1] /= 127.0;
|
|
44
|
+
normal[2] /= 127.0;
|
|
41
45
|
|
|
42
|
-
if (!smoothShading) {
|
|
46
|
+
if (!smoothShading || (normal[0] == 0.0 && normal[1] == 0.0 && normal[2] == 0.0)) {
|
|
43
47
|
normal = normalize(cross(dFdx(position_commonspace.xyz), dFdy(position_commonspace.xyz)));
|
|
44
|
-
}
|
|
45
|
-
|
|
46
|
-
// // Discard transparent pixels. KEEP
|
|
47
|
-
// if (!picking_uActive && isnan(propertyValue)) {
|
|
48
|
-
// discard;
|
|
49
|
-
// return;
|
|
50
|
-
// }
|
|
51
|
-
|
|
48
|
+
}
|
|
49
|
+
|
|
52
50
|
//Picking pass.
|
|
53
51
|
if (picking_uActive) {
|
|
54
52
|
// Express triangle index in 255 system.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fragment.fs.glsl.js","sourceRoot":"","sources":["../../../src/layers/map/fragment.fs.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,QAAQ,GAAG
|
|
1
|
+
{"version":3,"file":"fragment.fs.glsl.js","sourceRoot":"","sources":["../../../src/layers/map/fragment.fs.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,QAAQ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0HhB,CAAC;AAEF,eAAe,QAAQ,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const fragmentShader = "#version 300 es\n#define SHADER_NAME graph-layer-fragment-shader\n\nprecision highp float;\n\nout vec4 fragColor;\n\nvoid main(void) {\n
|
|
1
|
+
declare const fragmentShader = "#version 300 es\n#define SHADER_NAME graph-layer-fragment-shader\n\nprecision highp float;\n\nout vec4 fragColor;\n\nvoid main(void) {\n fragColor = vec4(0.0, 0.0, 0.0, 1.0);\n}\n";
|
|
2
2
|
export default fragmentShader;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fragment_lines.glsl.js","sourceRoot":"","sources":["../../../src/layers/map/fragment_lines.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,cAAc,GAAG
|
|
1
|
+
{"version":3,"file":"fragment_lines.glsl.js","sourceRoot":"","sources":["../../../src/layers/map/fragment_lines.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,cAAc,GAAG;;;;;;;;;;;CAWtB,CAAC;AAEF,eAAe,cAAc,CAAC"}
|
|
@@ -26,13 +26,15 @@ export type Params = {
|
|
|
26
26
|
isMesh: boolean;
|
|
27
27
|
frame: Frame;
|
|
28
28
|
smoothShading: boolean;
|
|
29
|
+
gridLines: boolean;
|
|
30
|
+
ZIncreasingDownwards: boolean;
|
|
29
31
|
};
|
|
30
32
|
export interface MapLayerProps extends ExtendedLayerProps {
|
|
31
33
|
setReportedBoundingBox?: any;
|
|
32
34
|
/** Url to the height (z values) mesh.
|
|
33
35
|
*/
|
|
34
36
|
meshUrl: string;
|
|
35
|
-
meshData: string | number[];
|
|
37
|
+
meshData: string | number[] | Float32Array;
|
|
36
38
|
/** Horizontal extent of the terrain mesh. Format:
|
|
37
39
|
{
|
|
38
40
|
origin: [number, number]; // mesh origin in x, y
|
|
@@ -50,7 +52,7 @@ export interface MapLayerProps extends ExtendedLayerProps {
|
|
|
50
52
|
* colored.
|
|
51
53
|
*/
|
|
52
54
|
propertiesUrl: string;
|
|
53
|
-
propertiesData: string | number[];
|
|
55
|
+
propertiesData: string | number[] | Float32Array;
|
|
54
56
|
/** Contourlines reference point and interval.
|
|
55
57
|
* A value of [-1.0, -1.0] will disable contour lines.
|
|
56
58
|
* Contour lines will also not be activated if cells are constant colored
|
|
@@ -12,14 +12,19 @@ import privateMapLayer from "./privateMapLayer";
|
|
|
12
12
|
import { getModelMatrix } from "../utils/layerTools";
|
|
13
13
|
import { isEqual } from "lodash";
|
|
14
14
|
import * as png from "@vivaxy/png";
|
|
15
|
-
import { makeFullMesh } from "./
|
|
15
|
+
import { makeFullMesh } from "./utils";
|
|
16
16
|
// Rotate x,y around x0, y0 rad radians
|
|
17
17
|
function rotate(x, y, x0, y0, rad) {
|
|
18
18
|
const xRot = Math.cos(rad) * (x - x0) - Math.sin(rad) * (y - y0) + x0; // eslint-disable-line
|
|
19
19
|
const yRot = Math.sin(rad) * (x - x0) + Math.cos(rad) * (y - y0) + y0; // eslint-disable-line
|
|
20
20
|
return [xRot, yRot];
|
|
21
21
|
}
|
|
22
|
-
|
|
22
|
+
/**
|
|
23
|
+
* Will load data for the mesh and the properties. Both of which may be given as arrays (javascript or typed)
|
|
24
|
+
* or as a URL to the data in binary format.
|
|
25
|
+
* Return value: A promise with the data given as typed arrays.
|
|
26
|
+
*/
|
|
27
|
+
function loadMeshAndProperties(meshData, propertiesData) {
|
|
23
28
|
return __awaiter(this, void 0, void 0, function* () {
|
|
24
29
|
// Keep
|
|
25
30
|
//const t0 = performance.now();
|
|
@@ -33,7 +38,11 @@ function load_mesh_and_properties(meshData, propertiesData, ZIncreasingDownwards
|
|
|
33
38
|
}
|
|
34
39
|
//-- PROPERTIES. --
|
|
35
40
|
let properties;
|
|
36
|
-
if (
|
|
41
|
+
if (ArrayBuffer.isView(propertiesData)) {
|
|
42
|
+
// Input data is typed array.
|
|
43
|
+
properties = propertiesData; // Note no copy. Make sure input data is not altered.
|
|
44
|
+
}
|
|
45
|
+
else if (Array.isArray(propertiesData)) {
|
|
37
46
|
// Input data is native javascript array.
|
|
38
47
|
properties = new Float32Array(propertiesData);
|
|
39
48
|
}
|
|
@@ -75,7 +84,11 @@ function load_mesh_and_properties(meshData, propertiesData, ZIncreasingDownwards
|
|
|
75
84
|
//-- MESH --
|
|
76
85
|
let mesh = new Float32Array();
|
|
77
86
|
if (isMesh) {
|
|
78
|
-
if (
|
|
87
|
+
if (ArrayBuffer.isView(meshData)) {
|
|
88
|
+
// Input data is typed array.
|
|
89
|
+
mesh = meshData; // Note no copy. Make sure data is never altered.
|
|
90
|
+
}
|
|
91
|
+
else if (Array.isArray(meshData)) {
|
|
79
92
|
// Input data is native javascript array.
|
|
80
93
|
mesh = new Float32Array(meshData);
|
|
81
94
|
}
|
|
@@ -115,14 +128,9 @@ function load_mesh_and_properties(meshData, propertiesData, ZIncreasingDownwards
|
|
|
115
128
|
}
|
|
116
129
|
}
|
|
117
130
|
}
|
|
118
|
-
if (!ZIncreasingDownwards) {
|
|
119
|
-
for (let i = 0; i < mesh.length; i++) {
|
|
120
|
-
mesh[i] *= -1;
|
|
121
|
-
}
|
|
122
|
-
}
|
|
123
|
-
//const t1 = performance.now();
|
|
124
131
|
// Keep this.
|
|
125
|
-
//
|
|
132
|
+
// const t1 = performance.now();
|
|
133
|
+
// console.debug(`Task loading took ${(t1 - t0) * 0.001} seconds.`);
|
|
126
134
|
return Promise.all([isMesh, mesh, properties]);
|
|
127
135
|
});
|
|
128
136
|
}
|
|
@@ -163,65 +171,62 @@ export default class MapLayer extends CompositeLayer {
|
|
|
163
171
|
}
|
|
164
172
|
const meshData = (_a = this.props.meshData) !== null && _a !== void 0 ? _a : this.props.meshUrl;
|
|
165
173
|
const propertiesData = (_b = this.props.propertiesData) !== null && _b !== void 0 ? _b : this.props.propertiesUrl;
|
|
166
|
-
const p =
|
|
174
|
+
const p = loadMeshAndProperties(meshData, propertiesData);
|
|
167
175
|
p.then(([isMesh, meshData, propertiesData]) => {
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
const blob = new Blob(["self.onmessage = ", makeFullMesh.toString()], { type: "text/javascript" });
|
|
171
|
-
const url = URL.createObjectURL(blob);
|
|
172
|
-
const webWorker = new Worker(url);
|
|
173
|
-
const webworkerParams = {
|
|
176
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
|
|
177
|
+
const params = {
|
|
174
178
|
meshData,
|
|
175
179
|
propertiesData,
|
|
176
180
|
isMesh,
|
|
177
181
|
frame: this.props.frame,
|
|
178
182
|
smoothShading: this.props.smoothShading,
|
|
183
|
+
gridLines: this.props.gridLines,
|
|
184
|
+
ZIncreasingDownwards: this.props.ZIncreasingDownwards,
|
|
179
185
|
};
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
};
|
|
186
|
+
const [positions, normals, triangleIndices, vertexProperties, vertexIndices, lineIndices, meshZValueRange, propertyValueRange,] = makeFullMesh(params);
|
|
187
|
+
this.setState(Object.assign(Object.assign({}, this.state), { positions,
|
|
188
|
+
normals,
|
|
189
|
+
triangleIndices,
|
|
190
|
+
vertexProperties,
|
|
191
|
+
vertexIndices,
|
|
192
|
+
lineIndices,
|
|
193
|
+
propertyValueRange }));
|
|
194
|
+
if (typeof this.props.setReportedBoundingBox !== "undefined" &&
|
|
195
|
+
reportBoundingBox) {
|
|
196
|
+
const xinc = (_c = (_b = (_a = this.props.frame) === null || _a === void 0 ? void 0 : _a.increment) === null || _b === void 0 ? void 0 : _b[0]) !== null && _c !== void 0 ? _c : 0;
|
|
197
|
+
const yinc = (_f = (_e = (_d = this.props.frame) === null || _d === void 0 ? void 0 : _d.increment) === null || _e === void 0 ? void 0 : _e[1]) !== null && _f !== void 0 ? _f : 0;
|
|
198
|
+
const nnodes_x = (_j = (_h = (_g = this.props.frame) === null || _g === void 0 ? void 0 : _g.count) === null || _h === void 0 ? void 0 : _h[0]) !== null && _j !== void 0 ? _j : 2; // number of nodes in x direction
|
|
199
|
+
const nnodes_y = (_m = (_l = (_k = this.props.frame) === null || _k === void 0 ? void 0 : _k.count) === null || _l === void 0 ? void 0 : _l[1]) !== null && _m !== void 0 ? _m : 2;
|
|
200
|
+
const xMin = (_q = (_p = (_o = this.props.frame) === null || _o === void 0 ? void 0 : _o.origin) === null || _p === void 0 ? void 0 : _p[0]) !== null && _q !== void 0 ? _q : 0;
|
|
201
|
+
const yMin = (_t = (_s = (_r = this.props.frame) === null || _r === void 0 ? void 0 : _r.origin) === null || _s === void 0 ? void 0 : _s[1]) !== null && _t !== void 0 ? _t : 0;
|
|
202
|
+
const zMin = -meshZValueRange[0];
|
|
203
|
+
const xMax = xMin + xinc * (nnodes_x - 1);
|
|
204
|
+
const yMax = yMin + yinc * (nnodes_y - 1);
|
|
205
|
+
const zMax = -meshZValueRange[1];
|
|
206
|
+
// If map is rotated the bounding box must reflect that.
|
|
207
|
+
const center = (_u = this.props.frame.rotPoint) !== null && _u !== void 0 ? _u : this.props.frame.origin;
|
|
208
|
+
const rotDeg = (_v = this.props.frame.rotDeg) !== null && _v !== void 0 ? _v : 0;
|
|
209
|
+
const rotRad = (rotDeg * (2.0 * Math.PI)) / 360.0;
|
|
210
|
+
// Rotate x,y around "center" "rad" radians
|
|
211
|
+
const [x0, y0] = rotate(xMin, yMin, center[0], center[1], rotRad); // eslint-disable-line
|
|
212
|
+
const [x1, y1] = rotate(xMax, yMin, center[0], center[1], rotRad); // eslint-disable-line
|
|
213
|
+
const [x2, y2] = rotate(xMax, yMax, center[0], center[1], rotRad); // eslint-disable-line
|
|
214
|
+
const [x3, y3] = rotate(xMin, yMax, center[0], center[1], rotRad); // eslint-disable-line
|
|
215
|
+
// Rotated bounds in x/y plane.
|
|
216
|
+
const x_min = Math.min(x0, x1, x2, x3);
|
|
217
|
+
const x_max = Math.max(x0, x1, x2, x3);
|
|
218
|
+
const y_min = Math.min(y0, y1, y2, y3);
|
|
219
|
+
const y_max = Math.max(y0, y1, y2, y3);
|
|
220
|
+
this.props.setReportedBoundingBox([
|
|
221
|
+
x_min,
|
|
222
|
+
y_min,
|
|
223
|
+
zMin,
|
|
224
|
+
x_max,
|
|
225
|
+
y_max,
|
|
226
|
+
zMax,
|
|
227
|
+
]);
|
|
228
|
+
}
|
|
229
|
+
this.setState(Object.assign(Object.assign({}, this.state), { isFinishedLoading: true }));
|
|
225
230
|
});
|
|
226
231
|
}
|
|
227
232
|
initializeState() {
|
|
@@ -262,8 +267,12 @@ export default class MapLayer extends CompositeLayer {
|
|
|
262
267
|
rotatingModelMatrix.multiplyRight(this.props.modelMatrix);
|
|
263
268
|
}
|
|
264
269
|
const layer = new privateMapLayer(this.getSubLayerProps({
|
|
265
|
-
|
|
266
|
-
|
|
270
|
+
positions: this.state["positions"],
|
|
271
|
+
normals: this.state["normals"],
|
|
272
|
+
triangleIndices: this.state["triangleIndices"],
|
|
273
|
+
vertexProperties: this.state["vertexProperties"],
|
|
274
|
+
vertexIndices: this.state["vertexIndices"],
|
|
275
|
+
lineIndices: this.state["lineIndices"],
|
|
267
276
|
pickable: this.props.pickable,
|
|
268
277
|
modelMatrix: rotatingModelMatrix,
|
|
269
278
|
contours: this.props.contours,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapLayer.js","sourceRoot":"","sources":["../../../src/layers/map/mapLayer.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"mapLayer.js","sourceRoot":"","sources":["../../../src/layers/map/mapLayer.ts"],"names":[],"mappings":"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"}
|