@webviz/subsurface-viewer 1.18.1 → 1.18.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/DashSubsurfaceViewer.js +2 -13
- package/dist/DashSubsurfaceViewer.js.map +1 -1
- package/dist/SubsurfaceViewer.js +10 -16
- package/dist/SubsurfaceViewer.js.map +1 -1
- package/dist/components/ColorLegend.js +3 -4
- package/dist/components/ColorLegend.js.map +1 -1
- package/dist/components/ColorLegends.js +6 -1
- package/dist/components/ColorLegends.js.map +1 -1
- package/dist/components/DistanceScale.js +5 -2
- package/dist/components/DistanceScale.js.map +1 -1
- package/dist/components/InfoCard.js +9 -13
- package/dist/components/InfoCard.js.map +1 -1
- package/dist/components/Map.js +182 -151
- package/dist/components/Map.js.map +1 -1
- package/dist/components/settings/DrawModeSelector.js +2 -2
- package/dist/components/settings/DrawModeSelector.js.map +1 -1
- package/dist/components/settings/NumericInput.js +1 -5
- package/dist/components/settings/NumericInput.js.map +1 -1
- package/dist/components/settings/Settings.js +1 -1
- package/dist/components/settings/Settings.js.map +1 -1
- package/dist/extensions/side-projection-extension.js +2 -2
- package/dist/extensions/side-projection-extension.js.map +1 -1
- package/dist/hooks/useMultiViewCursorTracking/useMultiViewCursorTracking.js +11 -6
- package/dist/hooks/useMultiViewCursorTracking/useMultiViewCursorTracking.js.map +1 -1
- package/dist/hooks/useMultiViewPicking/MultiViewPickingInfoAssembler.js +83 -97
- package/dist/hooks/useMultiViewPicking/MultiViewPickingInfoAssembler.js.map +1 -1
- package/dist/hooks/useMultiViewPicking/useMultiViewPicking.js +4 -1
- package/dist/hooks/useMultiViewPicking/useMultiViewPicking.js.map +1 -1
- package/dist/layers/BoxSelectionLayer/boxSelectionLayer.js +2 -3
- package/dist/layers/BoxSelectionLayer/boxSelectionLayer.js.map +1 -1
- package/dist/layers/axes/axesLayer.js +11 -4
- package/dist/layers/axes/axesLayer.js.map +1 -1
- package/dist/layers/axes/boxLayer.js +17 -10
- package/dist/layers/axes/boxLayer.js.map +1 -1
- package/dist/layers/axes2d/axes2DLayer.js +56 -32
- package/dist/layers/axes2d/axes2DLayer.js.map +1 -1
- package/dist/layers/colormap/colormapLayer.js +33 -34
- package/dist/layers/colormap/colormapLayer.js.map +1 -1
- package/dist/layers/crosshair/crosshairLayer.js +2 -2
- package/dist/layers/crosshair/crosshairLayer.js.map +1 -1
- package/dist/layers/drawing/drawingLayer.js +6 -4
- package/dist/layers/drawing/drawingLayer.js.map +1 -1
- package/dist/layers/fault_polygons/faultPolygonsLayer.js +5 -6
- package/dist/layers/fault_polygons/faultPolygonsLayer.js.map +1 -1
- package/dist/layers/gpglLayers/gpglValueMappedSurfaceLayer.js +195 -169
- package/dist/layers/gpglLayers/gpglValueMappedSurfaceLayer.js.map +1 -1
- package/dist/layers/grid3d/grid3dLayer.js +46 -53
- package/dist/layers/grid3d/grid3dLayer.js.map +1 -1
- package/dist/layers/grid3d/privateGrid3dLayer.js +73 -48
- package/dist/layers/grid3d/privateGrid3dLayer.js.map +1 -1
- package/dist/layers/grid3d/webworker.js +17 -6
- package/dist/layers/grid3d/webworker.js.map +1 -1
- package/dist/layers/hillshading2d/hillshading2dLayer.js +15 -9
- package/dist/layers/hillshading2d/hillshading2dLayer.js.map +1 -1
- package/dist/layers/map/mapLayer.js +49 -50
- package/dist/layers/map/mapLayer.js.map +1 -1
- package/dist/layers/map/privateMapLayer.js +52 -28
- package/dist/layers/map/privateMapLayer.js.map +1 -1
- package/dist/layers/map/webworker.js +1 -1
- package/dist/layers/map/webworker.js.map +1 -1
- package/dist/layers/northarrow/northArrow3DLayer.js +17 -10
- package/dist/layers/northarrow/northArrow3DLayer.js.map +1 -1
- package/dist/layers/piechart/pieChartLayer.js +26 -21
- package/dist/layers/piechart/pieChartLayer.js.map +1 -1
- package/dist/layers/points/pointsLayer.js +5 -3
- package/dist/layers/points/pointsLayer.js.map +1 -1
- package/dist/layers/points/privatePointsLayer.js +1 -2
- package/dist/layers/points/privatePointsLayer.js.map +1 -1
- package/dist/layers/polyline_group/polylineGroupLayer.js +84 -58
- package/dist/layers/polyline_group/polylineGroupLayer.js.map +1 -1
- package/dist/layers/polylines/polylinesLayer.js +5 -3
- package/dist/layers/polylines/polylinesLayer.js.map +1 -1
- package/dist/layers/polylines/privatePolylinesLayer.js +1 -2
- package/dist/layers/polylines/privatePolylinesLayer.js.map +1 -1
- package/dist/layers/seismic/seismicLayer.js +28 -23
- package/dist/layers/seismic/seismicLayer.js.map +1 -1
- package/dist/layers/shader_modules/phong-lighting/phong-material.js +2 -2
- package/dist/layers/shader_modules/phong-lighting/phong-material.js.map +1 -1
- package/dist/layers/shader_modules/test-precision/precisionForTests-shaders-glsl.js +4 -3
- package/dist/layers/shader_modules/test-precision/precisionForTests-shaders-glsl.js.map +1 -1
- package/dist/layers/triangle/privateTriangleLayer.js +66 -40
- package/dist/layers/triangle/privateTriangleLayer.js.map +1 -1
- package/dist/layers/triangle/triangleLayer.js +66 -66
- package/dist/layers/triangle/triangleLayer.js.map +1 -1
- package/dist/layers/utils/colormapTools.js +16 -3
- package/dist/layers/utils/colormapTools.js.map +1 -1
- package/dist/layers/utils/layerTools.js +5 -7
- package/dist/layers/utils/layerTools.js.map +1 -1
- package/dist/layers/well_markers/wellMarkersLayer.js +41 -16
- package/dist/layers/well_markers/wellMarkersLayer.js.map +1 -1
- package/dist/layers/wells/layers/dashedSectionsPathLayer.js +60 -31
- package/dist/layers/wells/layers/dashedSectionsPathLayer.js.map +1 -1
- package/dist/layers/wells/layers/flatWellMarkersLayer.js +79 -33
- package/dist/layers/wells/layers/flatWellMarkersLayer.js.map +1 -1
- package/dist/layers/wells/layers/logCurveLayer.js +80 -69
- package/dist/layers/wells/layers/logCurveLayer.js.map +1 -1
- package/dist/layers/wells/layers/mergedTextLayer.js +18 -12
- package/dist/layers/wells/layers/mergedTextLayer.js.map +1 -1
- package/dist/layers/wells/layers/wellLabelLayer.js +20 -13
- package/dist/layers/wells/layers/wellLabelLayer.js.map +1 -1
- package/dist/layers/wells/utils/abscissaTransform.js +10 -4
- package/dist/layers/wells/utils/abscissaTransform.js.map +1 -1
- package/dist/layers/wells/utils/features.js +2 -4
- package/dist/layers/wells/utils/features.js.map +1 -1
- package/dist/layers/wells/utils/log.js +11 -11
- package/dist/layers/wells/utils/log.js.map +1 -1
- package/dist/layers/wells/utils/readout.js +2 -4
- package/dist/layers/wells/utils/readout.js.map +1 -1
- package/dist/layers/wells/utils/spline.js +19 -25
- package/dist/layers/wells/utils/spline.js.map +1 -1
- package/dist/layers/wells/utils/trajectory.js +28 -22
- package/dist/layers/wells/utils/trajectory.js.map +1 -1
- package/dist/layers/wells/utils/wells.js +3 -4
- package/dist/layers/wells/utils/wells.js.map +1 -1
- package/dist/layers/wells/wellsLayer.js +232 -138
- package/dist/layers/wells/wellsLayer.js.map +1 -1
- package/dist/utils/BoundingBox2D.js +2 -2
- package/dist/utils/BoundingBox2D.js.map +1 -1
- package/dist/utils/BoundingBox3D.js +2 -2
- package/dist/utils/BoundingBox3D.js.map +1 -1
- package/dist/utils/Color.js +2 -3
- package/dist/utils/Color.js.map +1 -1
- package/dist/utils/camera.js +3 -5
- package/dist/utils/camera.js.map +1 -1
- package/dist/utils/configuration.d.ts +5 -5
- package/dist/utils/configuration.js +7 -2
- package/dist/utils/configuration.js.map +1 -1
- package/dist/utils/event.js +7 -7
- package/dist/utils/event.js.map +1 -1
- package/dist/utils/serialize.js +52 -68
- package/dist/utils/serialize.js.map +1 -1
- package/dist/utils/specExtractor.js +1 -1
- package/dist/utils/specExtractor.js.map +1 -1
- package/dist/views/sectionView.js +1 -1
- package/dist/views/sectionView.js.map +1 -1
- package/dist/views/viewport.d.ts +1 -0
- package/dist/views/viewport.js +10 -4
- package/dist/views/viewport.js.map +1 -1
- package/package.json +12 -16
|
@@ -1,12 +1,3 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import { project32 } from "@deck.gl/core";
|
|
11
2
|
import { BitmapLayer } from "@deck.gl/layers";
|
|
12
3
|
import * as png from "@vivaxy/png";
|
|
@@ -41,17 +32,17 @@ const defaultProps = {
|
|
|
41
32
|
export default class ColormapLayer extends BitmapLayer {
|
|
42
33
|
initializeState() {
|
|
43
34
|
super.initializeState();
|
|
44
|
-
const createPropertyTexture = () =>
|
|
45
|
-
const response =
|
|
35
|
+
const createPropertyTexture = async () => {
|
|
36
|
+
const response = await fetch(this.props.heightMapUrl);
|
|
46
37
|
if (!response.ok) {
|
|
47
38
|
console.error("Could not load ", this.props.heightMapUrl);
|
|
48
39
|
}
|
|
49
40
|
else {
|
|
50
|
-
const blob =
|
|
41
|
+
const blob = await response.blob();
|
|
51
42
|
const contentType = response.headers.get("content-type");
|
|
52
43
|
const isPng = contentType === "image/png";
|
|
53
44
|
if (isPng) {
|
|
54
|
-
const heightMapTexture =
|
|
45
|
+
const heightMapTexture = await new Promise((resolve) => {
|
|
55
46
|
const fileReader = new FileReader();
|
|
56
47
|
fileReader.readAsArrayBuffer(blob);
|
|
57
48
|
fileReader.onload = () => {
|
|
@@ -82,14 +73,16 @@ export default class ColormapLayer extends BitmapLayer {
|
|
|
82
73
|
resolve(propertyTexture);
|
|
83
74
|
};
|
|
84
75
|
});
|
|
85
|
-
this.setState(
|
|
76
|
+
this.setState({
|
|
77
|
+
...this.state,
|
|
78
|
+
heightMapTexture,
|
|
79
|
+
});
|
|
86
80
|
}
|
|
87
81
|
}
|
|
88
|
-
}
|
|
82
|
+
};
|
|
89
83
|
createPropertyTexture();
|
|
90
84
|
}
|
|
91
85
|
setShaderModuleProps(...props) {
|
|
92
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
|
|
93
86
|
if (!this.isLoaded) {
|
|
94
87
|
if (typeof this.props.reportBoundingBox !== "undefined") {
|
|
95
88
|
const xMin = this.props.bounds[0];
|
|
@@ -107,7 +100,8 @@ export default class ColormapLayer extends BitmapLayer {
|
|
|
107
100
|
const m = getModelMatrix(this.props.rotDeg, this.props.bounds[0], // Rotate around upper left corner of bounds
|
|
108
101
|
this.props.bounds[3]);
|
|
109
102
|
for (const model of this.getModels()) {
|
|
110
|
-
const isDefined =
|
|
103
|
+
const isDefined = props[0]?.project
|
|
104
|
+
?.modelMatrix !== undefined;
|
|
111
105
|
if (isDefined) {
|
|
112
106
|
props[0]["project"].modelMatrix =
|
|
113
107
|
m;
|
|
@@ -115,17 +109,17 @@ export default class ColormapLayer extends BitmapLayer {
|
|
|
115
109
|
model.shaderInputs.setProps(...props);
|
|
116
110
|
}
|
|
117
111
|
// Properties for local shader module.
|
|
118
|
-
const valueRangeMin =
|
|
119
|
-
const valueRangeMax =
|
|
112
|
+
const valueRangeMin = this.props.valueRange[0] ?? 0.0;
|
|
113
|
+
const valueRangeMax = this.props.valueRange[1] ?? 1.0;
|
|
120
114
|
// If specified, color map will extend from colormapRangeMin to colormapRangeMax.
|
|
121
115
|
// Otherwise it will extend from valueRangeMin to valueRangeMax.
|
|
122
|
-
const colormapRangeMin =
|
|
123
|
-
const colormapRangeMax =
|
|
116
|
+
const colormapRangeMin = this.props.colorMapRange?.[0] ?? valueRangeMin;
|
|
117
|
+
const colormapRangeMax = this.props.colorMapRange?.[1] ?? valueRangeMax;
|
|
124
118
|
const colormapTexture = this.context.device.createTexture({
|
|
125
119
|
width: 256,
|
|
126
120
|
height: 1,
|
|
127
121
|
format: "rgb8unorm-webgl",
|
|
128
|
-
data: getImageData(
|
|
122
|
+
data: getImageData(this.props.colorMapFunction ?? {
|
|
129
123
|
colormapName: this.props.colorMapName,
|
|
130
124
|
colorTables: this.context.userData
|
|
131
125
|
.colorTables,
|
|
@@ -150,9 +144,9 @@ export default class ColormapLayer extends BitmapLayer {
|
|
|
150
144
|
data: new Uint8Array([1, 1, 1, 1]),
|
|
151
145
|
});
|
|
152
146
|
}
|
|
153
|
-
const heightValueRangeMin =
|
|
154
|
-
const heightValueRangeMax =
|
|
155
|
-
|
|
147
|
+
const heightValueRangeMin = this.props.heightValueRange?.[0] ?? valueRangeMin;
|
|
148
|
+
const heightValueRangeMax = this.props.heightValueRange?.[1] ?? valueRangeMax;
|
|
149
|
+
this.state.model?.setBindings({ colormapTexture, heightMapTexture });
|
|
156
150
|
const bitmapResolution = this.props.image
|
|
157
151
|
? [
|
|
158
152
|
this.props.image.width,
|
|
@@ -169,7 +163,7 @@ export default class ColormapLayer extends BitmapLayer {
|
|
|
169
163
|
let colormapClampColor = isClampColor
|
|
170
164
|
? this.props.colorMapClampColor
|
|
171
165
|
: [0, 0, 0];
|
|
172
|
-
colormapClampColor = colormapClampColor.map((x) => (x
|
|
166
|
+
colormapClampColor = colormapClampColor.map((x) => (x ?? 0) / 255);
|
|
173
167
|
const isColormapClampColorTransparent = this.props.colorMapClampColor === false;
|
|
174
168
|
super.setShaderModuleProps({
|
|
175
169
|
map: {
|
|
@@ -212,26 +206,31 @@ export default class ColormapLayer extends BitmapLayer {
|
|
|
212
206
|
if (!info.color) {
|
|
213
207
|
return info;
|
|
214
208
|
}
|
|
215
|
-
const mergedDecoder =
|
|
209
|
+
const mergedDecoder = {
|
|
210
|
+
...defaultProps.valueDecoder,
|
|
211
|
+
...this.props.valueDecoder,
|
|
212
|
+
};
|
|
216
213
|
// The picked color is the one in raw image, not the one after colormapping.
|
|
217
214
|
// We just need to decode that RGB color into a property float value.
|
|
218
215
|
const val = decodeRGB(info.color, mergedDecoder, this.props.valueRange);
|
|
219
216
|
if (info.coordinate) {
|
|
220
217
|
info.coordinate[2] = NaN; // disable z value in 2D map;
|
|
221
218
|
}
|
|
222
|
-
return
|
|
219
|
+
return {
|
|
220
|
+
...info,
|
|
223
221
|
// Picking color doesn't represent object index in this layer.
|
|
224
222
|
// For more details, see https://deck.gl/docs/developer-guide/custom-layers/picking
|
|
225
|
-
index: 0,
|
|
223
|
+
index: 0,
|
|
224
|
+
propertyValue: val,
|
|
225
|
+
};
|
|
226
226
|
}
|
|
227
227
|
getLegendData() {
|
|
228
|
-
|
|
229
|
-
const
|
|
230
|
-
const valueRangeMax = (_b = this.props.valueRange[1]) !== null && _b !== void 0 ? _b : 1.0;
|
|
228
|
+
const valueRangeMin = this.props.valueRange[0] ?? 0.0;
|
|
229
|
+
const valueRangeMax = this.props.valueRange[1] ?? 1.0;
|
|
231
230
|
// If specified color map will extend from colormapRangeMin to colormapRangeMax.
|
|
232
231
|
// Otherwise it will extend from valueRangeMin to valueRangeMax.
|
|
233
|
-
const min =
|
|
234
|
-
const max =
|
|
232
|
+
const min = this.props.colorMapRange?.[0] ?? valueRangeMin;
|
|
233
|
+
const max = this.props.colorMapRange?.[1] ?? valueRangeMax;
|
|
235
234
|
return {
|
|
236
235
|
discrete: false,
|
|
237
236
|
valueRange: [min, max],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"colormapLayer.js","sourceRoot":"","sources":["../../../src/layers/colormap/colormapLayer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"colormapLayer.js","sourceRoot":"","sources":["../../../src/layers/colormap/colormapLayer.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,8 @@ const defaultProps = {
|
|
|
17
17
|
visible: true,
|
|
18
18
|
};
|
|
19
19
|
class CrosshairLayer extends CompositeLayer {
|
|
20
|
+
static layerName = "CrosshairLayer";
|
|
21
|
+
static defaultProps = defaultProps;
|
|
20
22
|
renderLayers() {
|
|
21
23
|
if (!this.props.worldCoordinates || !this.props.visible) {
|
|
22
24
|
return [];
|
|
@@ -44,8 +46,6 @@ class CrosshairLayer extends CompositeLayer {
|
|
|
44
46
|
];
|
|
45
47
|
}
|
|
46
48
|
}
|
|
47
|
-
CrosshairLayer.layerName = "CrosshairLayer";
|
|
48
|
-
CrosshairLayer.defaultProps = defaultProps;
|
|
49
49
|
function svgToDataURL(svg) {
|
|
50
50
|
return `data:image/svg+xml;charset=utf-8,${encodeURIComponent(svg)}`;
|
|
51
51
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crosshairLayer.js","sourceRoot":"","sources":["../../../src/layers/crosshair/crosshairLayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAM5C,SAAS,gBAAgB,CAAC,KAAgB;IACtC,OAAO;;;qDAG0C,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;qDAChB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;qDAChB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;sDACf,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;sDAChB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;OAC/D,CAAC;AACR,CAAC;AAUD,MAAM,YAAY,GAAsC;IACpD,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC;IACrB,MAAM,EAAE,EAAE;IACV,OAAO,EAAE,IAAI;CAChB,CAAC;AAEF,MAAM,cAAe,SAAQ,cAAmC;
|
|
1
|
+
{"version":3,"file":"crosshairLayer.js","sourceRoot":"","sources":["../../../src/layers/crosshair/crosshairLayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAM5C,SAAS,gBAAgB,CAAC,KAAgB;IACtC,OAAO;;;qDAG0C,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;qDAChB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;qDAChB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;sDACf,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;sDAChB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;OAC/D,CAAC;AACR,CAAC;AAUD,MAAM,YAAY,GAAsC;IACpD,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC;IACrB,MAAM,EAAE,EAAE;IACV,OAAO,EAAE,IAAI;CAChB,CAAC;AAEF,MAAM,cAAe,SAAQ,cAAmC;IAC5D,MAAM,CAAC,SAAS,GAAW,gBAAgB,CAAC;IAC5C,MAAM,CAAC,YAAY,GAAG,YAAY,CAAC;IAEnC,YAAY;QACR,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YACtD,OAAO,EAAE,CAAC;QACd,CAAC;QAED,OAAO;YACH,IAAI,SAAS,CACT,IAAI,CAAC,gBAAgB,CAAC;gBAClB,EAAE,EAAE,sBAAsB;gBAC1B,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;oBACZ,KAAK,EAAE,GAAG;oBACV,MAAM,EAAE,GAAG;oBACX,GAAG,EAAE,YAAY,CACb,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,CACvD;iBACJ,CAAC;gBACF,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,gBAAgB;oBAC7B,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC;oBAC/B,CAAC,CAAC,EAAE;gBACR,WAAW,EAAE,CAAC,CAA2B,EAAE,EAAE,CAAC,CAAC;gBAC/C,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM;gBAC1B,SAAS,EAAE,QAAQ;gBACnB,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC;gBAClD,QAAQ,EAAE,KAAK;gBACf,UAAU,EAAE;oBACR,SAAS,EAAE,KAAK;iBACnB;aACJ,CAAC,CACL;SACJ,CAAC;IACN,CAAC;;AAGL,SAAS,YAAY,CAAC,GAAW;IAC7B,OAAO,oCAAoC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC;AACzE,CAAC;AAED,eAAe,cAAc,CAAC"}
|
|
@@ -106,20 +106,22 @@ export default class DrawingLayer extends CompositeLayer {
|
|
|
106
106
|
// For now, use `any` for the picking types because this function should
|
|
107
107
|
// recieve PickInfo<FeatureCollection>, but it recieves PickInfo<Feature>.
|
|
108
108
|
getPickingInfo({ info }) {
|
|
109
|
-
var _a, _b;
|
|
110
109
|
if (!info.object)
|
|
111
110
|
return info;
|
|
112
111
|
const feature = info.object;
|
|
113
112
|
let measurement;
|
|
114
|
-
if (
|
|
113
|
+
if (feature.geometry?.type === "LineString") {
|
|
115
114
|
measurement = length(feature);
|
|
116
115
|
}
|
|
117
|
-
else if (
|
|
116
|
+
else if (feature.geometry?.type === "Polygon") {
|
|
118
117
|
measurement = area(feature);
|
|
119
118
|
}
|
|
120
119
|
else
|
|
121
120
|
return info;
|
|
122
|
-
return
|
|
121
|
+
return {
|
|
122
|
+
...info,
|
|
123
|
+
propertyValue: measurement,
|
|
124
|
+
};
|
|
123
125
|
}
|
|
124
126
|
// Callback for various editing events. Most events will update this component
|
|
125
127
|
// through patches sent to the map parent. See patchLayerPropsin layerTools.ts.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drawingLayer.js","sourceRoot":"","sources":["../../../src/layers/drawing/drawingLayer.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"drawingLayer.js","sourceRoot":"","sources":["../../../src/layers/drawing/drawingLayer.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
import { COORDINATE_SYSTEM, CompositeLayer } from "@deck.gl/core";
|
|
2
2
|
import { GeoJsonLayer } from "@deck.gl/layers";
|
|
3
3
|
const getColor = (d) => {
|
|
4
|
-
|
|
5
|
-
const
|
|
6
|
-
const
|
|
7
|
-
const
|
|
8
|
-
const b = (_d = c[2]) !== null && _d !== void 0 ? _d : 0;
|
|
4
|
+
const c = d?.properties?.["color"];
|
|
5
|
+
const r = c[0] ?? 0;
|
|
6
|
+
const g = c[1] ?? 0;
|
|
7
|
+
const b = c[2] ?? 0;
|
|
9
8
|
return [r, g, b, 30]; // make fill color transparent
|
|
10
9
|
};
|
|
11
10
|
const defaultProps = {
|
|
@@ -28,7 +27,7 @@ export default class FaultPolygonsLayer extends CompositeLayer {
|
|
|
28
27
|
filled: this.props.filled,
|
|
29
28
|
lineWidthMinPixels: this.props.lineWidthMinPixels,
|
|
30
29
|
coordinateSystem: COORDINATE_SYSTEM.CARTESIAN,
|
|
31
|
-
getLineColor: (d) =>
|
|
30
|
+
getLineColor: (d) => d?.properties?.["color"] ?? [0, 0, 0, 255],
|
|
32
31
|
getFillColor: getColor,
|
|
33
32
|
parameters: {
|
|
34
33
|
depthTest: this.props.depthTest,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"faultPolygonsLayer.js","sourceRoot":"","sources":["../../../src/layers/fault_polygons/faultPolygonsLayer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG/C,MAAM,QAAQ,GAAG,CAAC,CAAU,EAAS,EAAE
|
|
1
|
+
{"version":3,"file":"faultPolygonsLayer.js","sourceRoot":"","sources":["../../../src/layers/fault_polygons/faultPolygonsLayer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG/C,MAAM,QAAQ,GAAG,CAAC,CAAU,EAAS,EAAE;IACnC,MAAM,CAAC,GAAU,CAAC,EAAE,UAAU,EAAE,CAAC,OAAO,CAAC,CAAC;IAC1C,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACpB,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACpB,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACpB,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,8BAA8B;AACxD,CAAC,CAAC;AAOF,MAAM,YAAY,GAAG;IACjB,QAAQ,EAAE,oBAAoB;IAC9B,IAAI,EAAE,gBAAgB;IACtB,EAAE,EAAE,sBAAsB;IAC1B,QAAQ,EAAE,IAAI;IACd,OAAO,EAAE,IAAI;IACb,MAAM,EAAE,IAAI;IACZ,kBAAkB,EAAE,CAAC;IACrB,SAAS,EAAE,IAAI;CAClB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,cAAuC;IACnF,YAAY;QACR,MAAM,KAAK,GAAG,IAAI,YAAY,CAC1B,IAAI,CAAC,gBAAgB,CAAC;YAClB,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE;YACjB,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;YACrB,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;YAC7B,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO;YAC3B,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM;YACzB,kBAAkB,EAAE,IAAI,CAAC,KAAK,CAAC,kBAAkB;YACjD,gBAAgB,EAAE,iBAAiB,CAAC,SAAS;YAC7C,YAAY,EAAE,CAAC,CAAU,EAAE,EAAE,CACzB,CAAC,EAAE,UAAU,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC;YAC9C,YAAY,EAAE,QAAQ;YACtB,UAAU,EAAE;gBACR,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS;aAClC;SACJ,CAAC,CACL,CAAC;QACF,OAAO,CAAC,KAAK,CAAC,CAAC;IACnB,CAAC;CACJ;AAED,kBAAkB,CAAC,SAAS,GAAG,oBAAoB,CAAC;AACpD,kBAAkB,CAAC,YAAY,GAAG,YAAY,CAAC"}
|