@webviz/subsurface-viewer 1.18.1 → 1.18.2
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/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 +194 -168
- 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
|
@@ -21,13 +21,19 @@ export var SubLayerId;
|
|
|
21
21
|
* `WellMarkersLayer` class
|
|
22
22
|
*/
|
|
23
23
|
export class FlatWellMarkersLayer extends CompositeLayer {
|
|
24
|
+
static layerName = "FlatWellMarkersLayer";
|
|
25
|
+
static defaultProps = {
|
|
26
|
+
getMarkers: { type: "accessor", value: [] },
|
|
27
|
+
// Default to undefined so we can fall back to trajectory color
|
|
28
|
+
getMarkerColor: undefined,
|
|
29
|
+
getCumulativePathDistance: undefined,
|
|
30
|
+
};
|
|
24
31
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
25
32
|
constructor(...args) {
|
|
26
33
|
super(...args);
|
|
27
34
|
this.getMarkerColor = this.getMarkerColor.bind(this);
|
|
28
35
|
}
|
|
29
36
|
updateState({ changeFlags, props, oldProps, }) {
|
|
30
|
-
var _a, _b;
|
|
31
37
|
if (!this.isLoaded)
|
|
32
38
|
return;
|
|
33
39
|
const data = this.props.data;
|
|
@@ -48,7 +54,7 @@ export class FlatWellMarkersLayer extends CompositeLayer {
|
|
|
48
54
|
return;
|
|
49
55
|
if (!Array.isArray(data))
|
|
50
56
|
throw new Error(`Expected data to be a list, instead got ${typeof data}`);
|
|
51
|
-
const cumulativePathDistanceCache =
|
|
57
|
+
const cumulativePathDistanceCache = this.state.cumulativePathDistanceCache ?? new Map();
|
|
52
58
|
const markers = [];
|
|
53
59
|
let markerDataOffset = 0;
|
|
54
60
|
for (let index = 0; index < data.length; index++) {
|
|
@@ -56,10 +62,10 @@ export class FlatWellMarkersLayer extends CompositeLayer {
|
|
|
56
62
|
const datum = data[index];
|
|
57
63
|
const trajectoryPath = getFromAccessor(this.props.getTrajectoryPath, datum, itemContext);
|
|
58
64
|
if (cumulativeDistanceUpdate || changeFlags.dataChanged) {
|
|
59
|
-
const cumulativeDistance =
|
|
65
|
+
const cumulativeDistance = getFromAccessor(props.getCumulativePathDistance, datum, itemContext
|
|
60
66
|
// The typing is a little misleading here; the *default* accessor could
|
|
61
67
|
// potentially return undefined, so we need to include a fallback here
|
|
62
|
-
)
|
|
68
|
+
) ?? getCumulativeDistance(trajectoryPath);
|
|
63
69
|
cumulativePathDistanceCache.set(index, cumulativeDistance);
|
|
64
70
|
}
|
|
65
71
|
const cumulativePathDistance = cumulativePathDistanceCache.get(index);
|
|
@@ -84,7 +90,10 @@ export class FlatWellMarkersLayer extends CompositeLayer {
|
|
|
84
90
|
markers.push(markerData);
|
|
85
91
|
// ! We want to show perforations as a spike on both sides of the line. Since they will rendered as disconnected lines, we need to inject a second, rotated row for it
|
|
86
92
|
if (type === "perforation") {
|
|
87
|
-
const markerData2 =
|
|
93
|
+
const markerData2 = {
|
|
94
|
+
...markerData,
|
|
95
|
+
angle: angle + Math.PI,
|
|
96
|
+
};
|
|
88
97
|
markers.push(markerData2);
|
|
89
98
|
}
|
|
90
99
|
}
|
|
@@ -100,8 +109,7 @@ export class FlatWellMarkersLayer extends CompositeLayer {
|
|
|
100
109
|
return true;
|
|
101
110
|
}
|
|
102
111
|
getPickingInfo({ info }) {
|
|
103
|
-
|
|
104
|
-
const hoveredIndex = (_b = (_a = info.object) === null || _a === void 0 ? void 0 : _a.markerIndex) !== null && _b !== void 0 ? _b : -1;
|
|
112
|
+
const hoveredIndex = info.object?.markerIndex ?? -1;
|
|
105
113
|
this.setState({ hoveredMarkerIndex: hoveredIndex });
|
|
106
114
|
return info;
|
|
107
115
|
}
|
|
@@ -163,7 +171,6 @@ export class FlatWellMarkersLayer extends CompositeLayer {
|
|
|
163
171
|
return blendColors(baseColor, highlightColor);
|
|
164
172
|
}
|
|
165
173
|
renderLayers() {
|
|
166
|
-
var _a, _b, _c, _d, _e, _f;
|
|
167
174
|
const { cumulativePathDistanceCache } = this.state;
|
|
168
175
|
const lineWidthAccessor = this.getSubLayerAccessor(this.props.getLineWidth);
|
|
169
176
|
const sourceFilterAccessor = this.getSubLayerAccessor(this.props.getFilterValue);
|
|
@@ -172,51 +179,90 @@ export class FlatWellMarkersLayer extends CompositeLayer {
|
|
|
172
179
|
const sourceFilterValue = getFromAccessor(sourceFilterAccessor, d, ctx);
|
|
173
180
|
return getMarkerFilterValue(d, sourceFilterValue, sourcePathDistance);
|
|
174
181
|
};
|
|
175
|
-
const sharedSubLayerProps =
|
|
176
|
-
|
|
182
|
+
const sharedSubLayerProps = {
|
|
183
|
+
...this.props,
|
|
184
|
+
data: this.state.markers,
|
|
185
|
+
billboard: this.props.lineBillboard,
|
|
186
|
+
widthScale: this.props.lineWidthScale,
|
|
187
|
+
widthUnits: this.props.lineWidthUnits,
|
|
188
|
+
getWidth: lineWidthAccessor,
|
|
189
|
+
getPath: (d) => buildMarkerPath2D(d.type, d.position, d.angle),
|
|
190
|
+
updateTriggers: {
|
|
191
|
+
getPath: this.props.updateTriggers?.["getTrajectoryPath"],
|
|
177
192
|
getColor: [
|
|
178
193
|
this.state.hoveredMarkerIndex,
|
|
179
194
|
this.state.highlightedSourceIndex,
|
|
180
|
-
...(
|
|
181
|
-
...(
|
|
195
|
+
...(this.props.updateTriggers?.["getLineColor"] ?? []),
|
|
196
|
+
...(this.props.updateTriggers?.["getMarkerColor"] ?? []),
|
|
182
197
|
],
|
|
183
|
-
}
|
|
198
|
+
},
|
|
199
|
+
};
|
|
184
200
|
// TODO: Distinct layers based on 2D or 3D views, as they should render completely differently based on context
|
|
185
201
|
// TODO: Better scaling for markers. For instance, a screen marker should always be the same amount bigger than it's parent line
|
|
186
202
|
return [
|
|
187
|
-
new PathLayer(
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
203
|
+
new PathLayer({
|
|
204
|
+
...this.getSubLayerProps({
|
|
205
|
+
...sharedSubLayerProps,
|
|
206
|
+
id: SubLayerId.MARKERS_2D_OUTLINE,
|
|
207
|
+
parameters: {
|
|
208
|
+
[GL.POLYGON_OFFSET_FACTOR]: 1,
|
|
209
|
+
[GL.POLYGON_OFFSET_UNITS]: 1,
|
|
210
|
+
},
|
|
211
|
+
}),
|
|
212
|
+
visible: this.props.outline,
|
|
213
|
+
getColor: [0, 0, 0],
|
|
214
|
+
getWidth: getSize(LINE, lineWidthAccessor, 1),
|
|
191
215
|
// Disable this layer for picking, instead using MARKERS_2D_PICKING
|
|
192
|
-
pickable: false,
|
|
193
|
-
|
|
216
|
+
pickable: false,
|
|
217
|
+
autoHighlight: false,
|
|
218
|
+
highlightedObjectIndex: -1,
|
|
219
|
+
getFilterValue: markerFilterAccessor,
|
|
220
|
+
}),
|
|
221
|
+
new PathLayer({
|
|
222
|
+
...this.getSubLayerProps({
|
|
223
|
+
...sharedSubLayerProps,
|
|
224
|
+
id: SubLayerId.MARKERS_2D,
|
|
225
|
+
}),
|
|
226
|
+
getColor: this.getMarkerColor,
|
|
227
|
+
getFilterValue: markerFilterAccessor,
|
|
194
228
|
// Disable this layer for picking, instead using MARKERS_2D_PICKING
|
|
195
|
-
pickable: false,
|
|
229
|
+
pickable: false,
|
|
230
|
+
autoHighlight: false,
|
|
231
|
+
highlightedObjectIndex: -1,
|
|
232
|
+
}),
|
|
196
233
|
// To make markers easier to pick, we render them as filled polygons whilst picking
|
|
197
|
-
new PolygonLayer(
|
|
198
|
-
|
|
199
|
-
|
|
234
|
+
new PolygonLayer({
|
|
235
|
+
...this.getSubLayerProps({
|
|
236
|
+
...sharedSubLayerProps,
|
|
237
|
+
id: SubLayerId.MARKERS_2D_PICKING,
|
|
238
|
+
updateTriggers: {
|
|
239
|
+
getPolygon: this.props.updateTriggers?.["getTrajectoryPath"],
|
|
240
|
+
},
|
|
241
|
+
}),
|
|
242
|
+
visible: this.props.pickable,
|
|
243
|
+
filled: true,
|
|
244
|
+
stroked: true,
|
|
200
245
|
// Only render pick-able markers
|
|
201
246
|
extensions: [
|
|
202
247
|
...this.props.extensions,
|
|
203
248
|
new DataFilterExtension({ categorySize: 1 }),
|
|
204
|
-
],
|
|
249
|
+
],
|
|
250
|
+
getFilterValue: markerFilterAccessor,
|
|
251
|
+
getFilterCategory: (d) => Number(d.type !== "perforation"),
|
|
252
|
+
getPolygon: (d) => buildMarkerPath2D(d.type, d.position, d.angle),
|
|
253
|
+
getLineWidth: lineWidthAccessor,
|
|
254
|
+
lineWidthScale: this.props.lineWidthScale,
|
|
255
|
+
lineWidthUnits: this.props.lineWidthUnits,
|
|
205
256
|
// Disable auto-highlight, since we've implemented it manually
|
|
206
|
-
autoHighlight: false,
|
|
257
|
+
autoHighlight: false,
|
|
258
|
+
highlightedObjectIndex: -1,
|
|
259
|
+
}),
|
|
207
260
|
];
|
|
208
261
|
}
|
|
209
262
|
}
|
|
210
|
-
FlatWellMarkersLayer.layerName = "FlatWellMarkersLayer";
|
|
211
|
-
FlatWellMarkersLayer.defaultProps = {
|
|
212
|
-
getMarkers: { type: "accessor", value: [] },
|
|
213
|
-
// Default to undefined so we can fall back to trajectory color
|
|
214
|
-
getMarkerColor: undefined,
|
|
215
|
-
getCumulativePathDistance: undefined,
|
|
216
|
-
};
|
|
217
263
|
function getMarkerFilterValue(markerData, sourceFilterValue, cumulativePathDistance) {
|
|
218
264
|
if (!Array.isArray(sourceFilterValue))
|
|
219
|
-
return sourceFilterValue
|
|
265
|
+
return sourceFilterValue ?? 1;
|
|
220
266
|
const [lowerIndex] = getFractionPositionSegmentIndices(markerData.positionAlongPath, sourceFilterValue, cumulativePathDistance);
|
|
221
267
|
return sourceFilterValue[lowerIndex];
|
|
222
268
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flatWellMarkersLayer.js","sourceRoot":"","sources":["../../../../src/layers/wells/layers/flatWellMarkersLayer.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAExC,OAAO,CAAC,MAAM,QAAQ,CAAC;AAGvB,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EACH,eAAe,EACf,uBAAuB,GAC1B,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAElD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EACH,qBAAqB,EACrB,iCAAiC,EACjC,mCAAmC,GACtC,MAAM,qBAAqB,CAAC;AAE7B,MAAM,CAAN,IAAY,UAIX;AAJD,WAAY,UAAU;IAClB,uCAAyB,CAAA;IACzB,wDAA0C,CAAA;IAC1C,wDAA0C,CAAA;AAC9C,CAAC,EAJW,UAAU,KAAV,UAAU,QAIrB;AAmCD;;;;;GAKG;AACH,MAAM,OAAO,oBAAsC,SAAQ,cAE1D;
|
|
1
|
+
{"version":3,"file":"flatWellMarkersLayer.js","sourceRoot":"","sources":["../../../../src/layers/wells/layers/flatWellMarkersLayer.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ export var SubLayerId;
|
|
|
12
12
|
})(SubLayerId || (SubLayerId = {}));
|
|
13
13
|
/** Aggregation layer for displaying Log Curves a long a well path */
|
|
14
14
|
export class LogCurveLayer extends CompositeLayer {
|
|
15
|
+
static layerName = "Log Curve Layer";
|
|
15
16
|
constructor(...args) {
|
|
16
17
|
super(...args);
|
|
17
18
|
this._getFromSourceAccessor = this._getFromSourceAccessor.bind(this);
|
|
@@ -20,7 +21,6 @@ export class LogCurveLayer extends CompositeLayer {
|
|
|
20
21
|
this.getSelectionLayer = this.getSelectionLayer.bind(this);
|
|
21
22
|
}
|
|
22
23
|
updateState({ props, oldProps, changeFlags, }) {
|
|
23
|
-
var _a, _b;
|
|
24
24
|
if (!changeFlags.propsOrDataChanged)
|
|
25
25
|
return;
|
|
26
26
|
if (!this.isLoaded)
|
|
@@ -45,7 +45,7 @@ export class LogCurveLayer extends CompositeLayer {
|
|
|
45
45
|
// this.getSubLayerRow(d, wellFeatureObject, wellFeatureIndex)
|
|
46
46
|
this.getSubLayerRow(extendedLog, wellFeatureObject, wellFeatureIndex));
|
|
47
47
|
});
|
|
48
|
-
|
|
48
|
+
this.props.onLogDataComputed?.(subLayerData);
|
|
49
49
|
this.setState({ subLayerData });
|
|
50
50
|
}
|
|
51
51
|
setLegend(value) {
|
|
@@ -77,10 +77,9 @@ export class LogCurveLayer extends CompositeLayer {
|
|
|
77
77
|
if (!activeLog)
|
|
78
78
|
return false;
|
|
79
79
|
const sourcePath = this._getFromSourceAccessor(getTrajectoryPath, d, ctx);
|
|
80
|
-
return Boolean(sourcePath
|
|
80
|
+
return Boolean(sourcePath?.length);
|
|
81
81
|
}
|
|
82
82
|
renderLayers() {
|
|
83
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
|
|
84
83
|
const { getTrajectoryPath, getWellMds } = this.props;
|
|
85
84
|
const sharedProps = {
|
|
86
85
|
data: this.state.subLayerData,
|
|
@@ -89,93 +88,106 @@ export class LogCurveLayer extends CompositeLayer {
|
|
|
89
88
|
miterLimit: 1000,
|
|
90
89
|
};
|
|
91
90
|
return [
|
|
92
|
-
new PathLayer(
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
91
|
+
new PathLayer({
|
|
92
|
+
...this.getSubLayerProps({
|
|
93
|
+
...sharedProps,
|
|
94
|
+
id: SubLayerId.CURVE,
|
|
95
|
+
pickable: true,
|
|
96
|
+
updateTriggers: {
|
|
97
|
+
getPath: [
|
|
98
|
+
this.props.activeLog?.logRun,
|
|
99
|
+
this.props.trajectoryData,
|
|
100
|
+
this.props.positionFormat,
|
|
101
|
+
],
|
|
102
|
+
getColor: [
|
|
103
|
+
this.props.activeLog?.logRun,
|
|
104
|
+
this.props.activeLog?.curveName,
|
|
105
|
+
this.props.colorScale.name,
|
|
106
|
+
this.props.colorScale.colorTables,
|
|
107
|
+
this.props.colorScale.isLogarithmic,
|
|
108
|
+
this.props.colorScale.mappingFunction,
|
|
109
|
+
],
|
|
110
|
+
getWidth: [
|
|
111
|
+
this.props.activeLog?.logRun,
|
|
112
|
+
this.props.activeLog?.curveName,
|
|
113
|
+
this.props.logWidth,
|
|
114
|
+
],
|
|
115
|
+
},
|
|
116
|
+
}),
|
|
112
117
|
// The log curve layer is (usually) used alongside the trajectory curve layer. We want the log line to appear right *behind* the trajectory, from all angles. A positive layer-index will push it away from the camera
|
|
113
|
-
getPolygonOffset: ({ layerIndex }) => [2, layerIndex * 1000],
|
|
114
|
-
|
|
118
|
+
getPolygonOffset: ({ layerIndex }) => [2, layerIndex * 1000],
|
|
119
|
+
getPath: (d, ctx) => {
|
|
115
120
|
if (!this._logCurveIsVisible(d, ctx))
|
|
116
121
|
return [];
|
|
117
|
-
return getLogPath(d,
|
|
118
|
-
},
|
|
119
|
-
|
|
122
|
+
return getLogPath(d, this.props.activeLog?.logRun, this._getFromSourceAccessor(getTrajectoryPath, d, ctx), this._getFromSourceAccessor(getWellMds, d, ctx));
|
|
123
|
+
},
|
|
124
|
+
getColor: (d, ctx) => {
|
|
120
125
|
if (!this._logCurveIsVisible(d, ctx))
|
|
121
126
|
return [];
|
|
122
|
-
return getLogColor(d,
|
|
127
|
+
return getLogColor(d, this.props.activeLog?.logRun, this.props.activeLog?.curveName, this.props.colorScale.name,
|
|
123
128
|
// This is from the context, should it just be inferred from the lifecycle?
|
|
124
129
|
this.props.colorScale.colorTables, this.props.colorScale.mappingFunction, this.props.colorScale.isLogarithmic);
|
|
125
|
-
},
|
|
130
|
+
},
|
|
131
|
+
getWidth: this.props.logWidth !== "value"
|
|
126
132
|
? this.props.logWidth
|
|
127
133
|
: (d, ctx) => {
|
|
128
|
-
var _a, _b;
|
|
129
134
|
if (!this._logCurveIsVisible(d, ctx))
|
|
130
135
|
return [];
|
|
131
|
-
return getLogWidth(d,
|
|
132
|
-
}
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
136
|
+
return getLogWidth(d, this.props.activeLog?.logRun, this.props.activeLog?.curveName);
|
|
137
|
+
},
|
|
138
|
+
}),
|
|
139
|
+
new PathLayer({
|
|
140
|
+
...this.getSubLayerProps({
|
|
141
|
+
...sharedProps,
|
|
142
|
+
id: SubLayerId.SELECTION,
|
|
143
|
+
widthScale: sharedProps.widthScale * 1.5,
|
|
144
|
+
updateTriggers: {
|
|
145
|
+
getWidth: [
|
|
146
|
+
this.props.logWidth,
|
|
147
|
+
this.props.activeLog?.logRun,
|
|
148
|
+
this.props.activeLog?.curveName,
|
|
149
|
+
this.state.domainSelection?.well,
|
|
150
|
+
this.state.domainSelection?.selection,
|
|
151
|
+
],
|
|
152
|
+
getColor: [
|
|
153
|
+
this.props.activeLog?.logRun,
|
|
154
|
+
this.state.domainSelection?.well,
|
|
155
|
+
this.state.domainSelection?.selection,
|
|
156
|
+
],
|
|
157
|
+
getPath: [
|
|
158
|
+
this.props.activeLog?.logRun,
|
|
159
|
+
this.state.domainSelection?.well,
|
|
160
|
+
this.state.domainSelection?.selection,
|
|
161
|
+
],
|
|
162
|
+
},
|
|
163
|
+
}),
|
|
152
164
|
// Similar to the curve layer, we want the selection to be rendered *over* the curve and trajectory layer. A negative offset pulls it towards the camera
|
|
153
|
-
getPolygonOffset: ({ layerIndex }) => [2, layerIndex * -1000],
|
|
154
|
-
|
|
165
|
+
getPolygonOffset: ({ layerIndex }) => [2, layerIndex * -1000],
|
|
166
|
+
getPath: (d, ctx) => {
|
|
155
167
|
if (!this._logCurveIsVisible(d, ctx))
|
|
156
168
|
return [];
|
|
157
|
-
return getSelectionPath(d, this._getFromSourceAccessor(getTrajectoryPath, d, ctx), this._getFromSourceAccessor(getWellMds, d, ctx),
|
|
158
|
-
},
|
|
159
|
-
|
|
169
|
+
return getSelectionPath(d, this._getFromSourceAccessor(getTrajectoryPath, d, ctx), this._getFromSourceAccessor(getWellMds, d, ctx), this.props.activeLog?.logRun, this.state.domainSelection?.well, this.state.domainSelection?.selection);
|
|
170
|
+
},
|
|
171
|
+
getColor: (d, ctx) => {
|
|
160
172
|
if (!this._logCurveIsVisible(d, ctx))
|
|
161
173
|
return [];
|
|
162
|
-
return getSelectionColor(d,
|
|
163
|
-
},
|
|
174
|
+
return getSelectionColor(d, this.props.activeLog?.logRun, this.state.domainSelection?.well, this.state.domainSelection?.selection);
|
|
175
|
+
},
|
|
176
|
+
getWidth: this.props.logWidth !== "value"
|
|
164
177
|
? this.props.logWidth
|
|
165
178
|
: (d, ctx) => {
|
|
166
|
-
var _a, _b, _c, _d;
|
|
167
179
|
if (!this._logCurveIsVisible(d, ctx))
|
|
168
180
|
return [];
|
|
169
|
-
return getSelectionWidth(d,
|
|
170
|
-
}
|
|
181
|
+
return getSelectionWidth(d, this.props.activeLog?.logRun, this.props.activeLog?.curveName, this.state.domainSelection?.well, this.state.domainSelection?.selection);
|
|
182
|
+
},
|
|
183
|
+
}),
|
|
171
184
|
];
|
|
172
185
|
}
|
|
173
186
|
}
|
|
174
|
-
LogCurveLayer.layerName = "Log Curve Layer";
|
|
175
187
|
function getLogPath(d, selectedLogRun, wellTrajectory, wellMds) {
|
|
176
188
|
if (!selectedLogRun)
|
|
177
189
|
return [];
|
|
178
|
-
if (!
|
|
190
|
+
if (!wellTrajectory?.length || !wellMds?.length)
|
|
179
191
|
return [];
|
|
180
192
|
const log_xyz = [];
|
|
181
193
|
const log_mds = getLogMd(d, selectedLogRun);
|
|
@@ -221,12 +233,12 @@ function getSelectionMds(d, logRunName, selectedWell, selectedRange) {
|
|
|
221
233
|
}
|
|
222
234
|
}
|
|
223
235
|
function getSelectionPath(d, wellTrajectory, wellMds, logRunName, selectedWell, selectedRange) {
|
|
224
|
-
if (!
|
|
236
|
+
if (!wellTrajectory?.length || !wellMds.length)
|
|
225
237
|
return [];
|
|
226
238
|
return getSelectionMds(d, logRunName, selectedWell, selectedRange).map((md) => getPositionByMD(wellTrajectory, wellMds, md));
|
|
227
239
|
}
|
|
228
240
|
function getSelectionColor(d, logRunName, selectedWell, selectedRange) {
|
|
229
|
-
const [rangeStart, rangeEnd] = selectedRange
|
|
241
|
+
const [rangeStart, rangeEnd] = selectedRange ?? [];
|
|
230
242
|
const swapped = rangeStart !== undefined &&
|
|
231
243
|
rangeStart !== undefined &&
|
|
232
244
|
rangeStart > rangeEnd;
|
|
@@ -252,14 +264,13 @@ function getSelectionWidth(d, logRunName, logCurveName, selectedWell, selectedRa
|
|
|
252
264
|
// The "caps" of the selection is currently a two-point line segment
|
|
253
265
|
const logRowOffset = getLogSegmentIndexForMd(d, selectionMds[1]) - 1;
|
|
254
266
|
return selectionMds.map((md, idx) => {
|
|
255
|
-
var _a;
|
|
256
267
|
let width = 0;
|
|
257
268
|
if (idx > 1 && idx < selectionMds.length - 2) {
|
|
258
269
|
width = getCurveValueAtRow(d, logCurveName, idx + logRowOffset);
|
|
259
270
|
}
|
|
260
271
|
else {
|
|
261
272
|
// Interpolate ends of selection
|
|
262
|
-
width =
|
|
273
|
+
width = getCurveValueAtMd(d, logCurveName, md) ?? 0;
|
|
263
274
|
}
|
|
264
275
|
return Math.max(width, SELECTION_MIN_WIDTH);
|
|
265
276
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logCurveLayer.js","sourceRoot":"","sources":["../../../../src/layers/wells/layers/logCurveLayer.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"logCurveLayer.js","sourceRoot":"","sources":["../../../../src/layers/wells/layers/logCurveLayer.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,8 @@ const DEFAULT_PROPS = {
|
|
|
18
18
|
* that are near each other.
|
|
19
19
|
*/
|
|
20
20
|
export class MergedTextLayer extends TextLayer {
|
|
21
|
+
static defaultProps = DEFAULT_PROPS;
|
|
22
|
+
static layerName = "MergedTextLayer";
|
|
21
23
|
shouldUpdateState(params) {
|
|
22
24
|
if (params.changeFlags.propsOrDataChanged) {
|
|
23
25
|
return true;
|
|
@@ -36,20 +38,27 @@ export class MergedTextLayer extends TextLayer {
|
|
|
36
38
|
}
|
|
37
39
|
}
|
|
38
40
|
getSubLayerProps(sublayerProps) {
|
|
39
|
-
|
|
40
|
-
const
|
|
41
|
-
|
|
41
|
+
const allUpdateTriggers = sublayerProps?.updateTriggers?.["all"] ?? [];
|
|
42
|
+
const newProps = {
|
|
43
|
+
...sublayerProps,
|
|
44
|
+
getColor: _.bind(this.getColor, this),
|
|
45
|
+
getFillColor: _.bind(this.getBackgroundColor, this),
|
|
46
|
+
getLineColor: _.bind(this.getBorderColor, this),
|
|
47
|
+
updateTriggers: {
|
|
48
|
+
...sublayerProps?.updateTriggers,
|
|
49
|
+
all: [
|
|
42
50
|
...allUpdateTriggers,
|
|
43
51
|
this.props.mergeRadius,
|
|
44
52
|
this.props.mergeLabels,
|
|
45
53
|
this.props.getPosition,
|
|
46
|
-
]
|
|
54
|
+
],
|
|
55
|
+
},
|
|
56
|
+
};
|
|
47
57
|
return super.getSubLayerProps(newProps);
|
|
48
58
|
}
|
|
49
59
|
updateLabelPositions() {
|
|
50
|
-
var _a;
|
|
51
60
|
const { data, getText } = this.props;
|
|
52
|
-
let { getPosition } = this.getSubLayerProps(
|
|
61
|
+
let { getPosition } = this.getSubLayerProps({ ...this.props });
|
|
53
62
|
if (_.isUndefined(getPosition)) {
|
|
54
63
|
getPosition = this.props.getPosition;
|
|
55
64
|
}
|
|
@@ -66,7 +75,7 @@ export class MergedTextLayer extends TextLayer {
|
|
|
66
75
|
}
|
|
67
76
|
labelPositions.set(text, position);
|
|
68
77
|
if (positionToText.has(position)) {
|
|
69
|
-
|
|
78
|
+
positionToText.get(position)?.push(text);
|
|
70
79
|
}
|
|
71
80
|
else {
|
|
72
81
|
positionToText.set(position, [text]);
|
|
@@ -97,7 +106,6 @@ export class MergedTextLayer extends TextLayer {
|
|
|
97
106
|
});
|
|
98
107
|
}
|
|
99
108
|
updateLabelClusters() {
|
|
100
|
-
var _a, _b;
|
|
101
109
|
const positions = [...this.state.labelPositions.values()];
|
|
102
110
|
if (positions.length === 0) {
|
|
103
111
|
return;
|
|
@@ -109,7 +117,7 @@ export class MergedTextLayer extends TextLayer {
|
|
|
109
117
|
const visitor = (id) => {
|
|
110
118
|
neighbors.push(id);
|
|
111
119
|
};
|
|
112
|
-
positionTree.rnn(position,
|
|
120
|
+
positionTree.rnn(position, this.props.mergeRadius ?? 10, visitor);
|
|
113
121
|
const text = this.state.positionToText.get(position);
|
|
114
122
|
if (_.isUndefined(text)) {
|
|
115
123
|
continue;
|
|
@@ -120,7 +128,7 @@ export class MergedTextLayer extends TextLayer {
|
|
|
120
128
|
if (_.isUndefined(text)) {
|
|
121
129
|
continue;
|
|
122
130
|
}
|
|
123
|
-
const cluster =
|
|
131
|
+
const cluster = clusters.get(position) ?? [];
|
|
124
132
|
clusters.set(position, [...cluster, ...text]);
|
|
125
133
|
}
|
|
126
134
|
}
|
|
@@ -218,6 +226,4 @@ export class MergedTextLayer extends TextLayer {
|
|
|
218
226
|
return [backgroundColor[0], backgroundColor[1], backgroundColor[2], 0];
|
|
219
227
|
}
|
|
220
228
|
}
|
|
221
|
-
MergedTextLayer.defaultProps = DEFAULT_PROPS;
|
|
222
|
-
MergedTextLayer.layerName = "MergedTextLayer";
|
|
223
229
|
//# sourceMappingURL=mergedTextLayer.js.map
|