@webviz/subsurface-viewer 0.28.1 → 0.29.0
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 +1 -1
- package/dist/DashSubsurfaceViewer.js.map +1 -1
- package/dist/SubsurfaceViewer.d.ts +11 -1
- package/dist/SubsurfaceViewer.js +0 -9
- package/dist/SubsurfaceViewer.js.map +1 -1
- package/dist/components/ColorLegend.d.ts +1 -1
- package/dist/components/ColorLegend.js.map +1 -1
- package/dist/components/DistanceScale.d.ts +1 -3
- package/dist/components/DistanceScale.js +1 -9
- package/dist/components/DistanceScale.js.map +1 -1
- package/dist/components/Map.d.ts +8 -4
- package/dist/components/Map.js +16 -34
- package/dist/components/Map.js.map +1 -1
- package/dist/extensions/side-projection-extension.d.ts +4 -3
- package/dist/extensions/side-projection-extension.js +7 -6
- package/dist/extensions/side-projection-extension.js.map +1 -1
- package/dist/layers/BoxSelectionLayer/boxSelectionLayer.d.ts +3 -4
- package/dist/layers/BoxSelectionLayer/boxSelectionLayer.js +4 -7
- package/dist/layers/BoxSelectionLayer/boxSelectionLayer.js.map +1 -1
- package/dist/layers/axes/axesLayer.d.ts +3 -3
- package/dist/layers/axes/axesLayer.js +6 -4
- package/dist/layers/axes/axesLayer.js.map +1 -1
- package/dist/layers/axes/boxLayer.d.ts +2 -2
- package/dist/layers/axes/boxLayer.js +5 -8
- package/dist/layers/axes/boxLayer.js.map +1 -1
- package/dist/layers/axes2d/axes2DLayer.d.ts +4 -5
- package/dist/layers/axes2d/axes2DLayer.js +23 -23
- package/dist/layers/axes2d/axes2DLayer.js.map +1 -1
- package/dist/layers/colormap/colormap.fs.glsl.d.ts +1 -1
- package/dist/layers/colormap/colormap.fs.glsl.js +11 -10
- package/dist/layers/colormap/colormap.fs.glsl.js.map +1 -1
- package/dist/layers/colormap/colormapLayer.d.ts +6 -6
- package/dist/layers/colormap/colormapLayer.js +14 -28
- package/dist/layers/colormap/colormapLayer.js.map +1 -1
- package/dist/layers/drawing/drawingLayer.d.ts +3 -3
- package/dist/layers/drawing/drawingLayer.js +8 -7
- package/dist/layers/drawing/drawingLayer.js.map +1 -1
- package/dist/layers/fault_polygons/faultPolygonsLayer.d.ts +3 -3
- package/dist/layers/fault_polygons/faultPolygonsLayer.js +3 -4
- package/dist/layers/fault_polygons/faultPolygonsLayer.js.map +1 -1
- package/dist/layers/grid3d/fragment.fs.glsl.d.ts +1 -1
- package/dist/layers/grid3d/fragment.fs.glsl.js +20 -13
- package/dist/layers/grid3d/fragment.fs.glsl.js.map +1 -1
- package/dist/layers/grid3d/fragment_lines.glsl.d.ts +1 -1
- package/dist/layers/grid3d/fragment_lines.glsl.js +0 -7
- package/dist/layers/grid3d/fragment_lines.glsl.js.map +1 -1
- package/dist/layers/grid3d/grid3dLayer.d.ts +20 -3
- package/dist/layers/grid3d/grid3dLayer.js +20 -2
- package/dist/layers/grid3d/grid3dLayer.js.map +1 -1
- package/dist/layers/grid3d/privateGrid3dLayer.d.ts +12 -4
- package/dist/layers/grid3d/privateGrid3dLayer.js +73 -56
- package/dist/layers/grid3d/privateGrid3dLayer.js.map +1 -1
- package/dist/layers/grid3d/typeDefs.d.ts +4 -2
- package/dist/layers/grid3d/vertex.glsl.d.ts +1 -1
- package/dist/layers/grid3d/vertex.glsl.js +3 -3
- package/dist/layers/grid3d/webworker.js +18 -9
- package/dist/layers/grid3d/webworker.js.map +1 -1
- package/dist/layers/hillshading2d/hillshading2d.fs.glsl.d.ts +1 -1
- package/dist/layers/hillshading2d/hillshading2d.fs.glsl.js +13 -11
- package/dist/layers/hillshading2d/hillshading2d.fs.glsl.js.map +1 -1
- package/dist/layers/hillshading2d/hillshading2dLayer.d.ts +7 -7
- package/dist/layers/hillshading2d/hillshading2dLayer.js +5 -11
- package/dist/layers/hillshading2d/hillshading2dLayer.js.map +1 -1
- package/dist/layers/intersection/unfoldedGeoJsonLayer.d.ts +2 -2
- package/dist/layers/intersection/unfoldedGeoJsonLayer.js +1 -1
- package/dist/layers/intersection/unfoldedGeoJsonLayer.js.map +1 -1
- package/dist/layers/map/fragment.fs.glsl.d.ts +1 -1
- package/dist/layers/map/fragment.fs.glsl.js +13 -19
- package/dist/layers/map/fragment.fs.glsl.js.map +1 -1
- package/dist/layers/map/mapLayer.d.ts +4 -4
- package/dist/layers/map/mapLayer.js +1 -1
- package/dist/layers/map/mapLayer.js.map +1 -1
- package/dist/layers/map/privateMapLayer.d.ts +10 -5
- package/dist/layers/map/privateMapLayer.js +73 -72
- package/dist/layers/map/privateMapLayer.js.map +1 -1
- package/dist/layers/map/webworker.d.ts +1 -1
- package/dist/layers/map/webworker.js +4 -4
- package/dist/layers/map/webworker.js.map +1 -1
- package/dist/layers/northarrow/northArrow3DLayer.d.ts +4 -4
- package/dist/layers/northarrow/northArrow3DLayer.js +7 -10
- package/dist/layers/northarrow/northArrow3DLayer.js.map +1 -1
- package/dist/layers/piechart/fragment.glsl.d.ts +1 -1
- package/dist/layers/piechart/fragment.glsl.js +1 -1
- package/dist/layers/piechart/pieChartLayer.d.ts +3 -4
- package/dist/layers/piechart/pieChartLayer.js +10 -9
- package/dist/layers/piechart/pieChartLayer.js.map +1 -1
- package/dist/layers/points/pointsLayer.d.ts +3 -3
- package/dist/layers/points/pointsLayer.js +1 -1
- package/dist/layers/points/pointsLayer.js.map +1 -1
- package/dist/layers/points/privatePointsLayer.d.ts +4 -13
- package/dist/layers/points/privatePointsLayer.js +5 -5
- package/dist/layers/points/privatePointsLayer.js.map +1 -1
- package/dist/layers/points/vertex.glsl.d.ts +1 -1
- package/dist/layers/points/vertex.glsl.js +14 -13
- package/dist/layers/points/vertex.glsl.js.map +1 -1
- package/dist/layers/polylines/polylinesLayer.d.ts +3 -3
- package/dist/layers/polylines/polylinesLayer.js +5 -3
- package/dist/layers/polylines/polylinesLayer.js.map +1 -1
- package/dist/layers/polylines/privatePolylinesLayer.d.ts +37 -9
- package/dist/layers/polylines/privatePolylinesLayer.js +6 -6
- package/dist/layers/polylines/privatePolylinesLayer.js.map +1 -1
- package/dist/layers/selectable_geojson/selectableGeoJsonLayer.d.ts +2 -2
- package/dist/layers/selectable_geojson/selectableGeoJsonLayer.js +1 -1
- package/dist/layers/selectable_geojson/selectableGeoJsonLayer.js.map +1 -1
- package/dist/layers/shader_modules/localPhongLighting.d.ts +19 -1
- package/dist/layers/triangle/fragment.fs.glsl.d.ts +1 -1
- package/dist/layers/triangle/fragment.fs.glsl.js +4 -3
- package/dist/layers/triangle/fragment.fs.glsl.js.map +1 -1
- package/dist/layers/triangle/fragment_lines.glsl.d.ts +1 -1
- package/dist/layers/triangle/fragment_lines.glsl.js +2 -2
- package/dist/layers/triangle/privateTriangleLayer.d.ts +9 -8
- package/dist/layers/triangle/privateTriangleLayer.js +21 -16
- package/dist/layers/triangle/privateTriangleLayer.js.map +1 -1
- package/dist/layers/triangle/triangleLayer.d.ts +4 -4
- package/dist/layers/triangle/triangleLayer.js +5 -3
- package/dist/layers/triangle/triangleLayer.js.map +1 -1
- package/dist/layers/triangle/webworker.js +2 -2
- package/dist/layers/triangle/webworker.js.map +1 -1
- package/dist/layers/utils/layerTools.d.ts +3 -3
- package/dist/layers/utils/propertyMapTools.d.ts +1 -1
- package/dist/layers/well_markers/fragment.glsl.d.ts +1 -1
- package/dist/layers/well_markers/fragment.glsl.js +4 -3
- package/dist/layers/well_markers/fragment.glsl.js.map +1 -1
- package/dist/layers/well_markers/vertex.glsl.d.ts +1 -1
- package/dist/layers/well_markers/vertex.glsl.js +10 -14
- package/dist/layers/well_markers/vertex.glsl.js.map +1 -1
- package/dist/layers/well_markers/wellMarkersLayer.d.ts +6 -4
- package/dist/layers/well_markers/wellMarkersLayer.js +43 -50
- package/dist/layers/well_markers/wellMarkersLayer.js.map +1 -1
- package/dist/layers/wells/wellsLayer.d.ts +2 -2
- package/dist/layers/wells/wellsLayer.js +4 -4
- package/dist/layers/wells/wellsLayer.js.map +1 -1
- package/dist/utils/configuration.d.ts +0 -616
- package/dist/utils/configuration.js +6 -11
- package/dist/utils/configuration.js.map +1 -1
- package/dist/utils/measurement.d.ts +1 -1
- package/dist/utils/measurement.js +1 -1
- package/dist/utils/measurement.js.map +1 -1
- package/dist/utils/specExtractor.d.ts +1 -1
- package/dist/viewports/intersectionViewport.d.ts +1 -1
- package/dist/viewports/intersectionViewport.js +1 -1
- package/dist/viewports/intersectionViewport.js.map +1 -1
- package/dist/views/intersectionView.d.ts +4 -3
- package/dist/views/intersectionView.js +1 -1
- package/dist/views/intersectionView.js.map +1 -1
- package/package.json +13 -11
- package/dist/layers/points/fragment.glsl.d.ts +0 -2
- package/dist/layers/points/fragment.glsl.js +0 -69
- package/dist/layers/points/fragment.glsl.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"colormapLayer.js","sourceRoot":"","sources":["../../../src/layers/colormap/colormapLayer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"colormapLayer.js","sourceRoot":"","sources":["../../../src/layers/colormap/colormapLayer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
import {
|
|
1
|
+
import type { EditAction, Feature, FeatureCollection } from "@deck.gl-community/editable-layers";
|
|
2
|
+
import type { Color, LayerContext, LayersList, PickingInfo } from "@deck.gl/core";
|
|
3
|
+
import { CompositeLayer } from "@deck.gl/core";
|
|
3
4
|
import type { ExtendedLayerProps, LayerPickInfo } from "../utils/layerTools";
|
|
4
|
-
import type { EditAction, Feature, FeatureCollection } from "@nebula.gl/edit-modes";
|
|
5
5
|
export interface DrawingLayerProps extends ExtendedLayerProps {
|
|
6
6
|
mode: string;
|
|
7
7
|
selectedFeatureIndexes: number[];
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import { EditableGeoJsonLayer } from "@nebula.gl/layers";
|
|
1
|
+
import { DrawLineStringMode, DrawPointMode, DrawPolygonMode, EditableGeoJsonLayer, ImmutableFeatureCollection, ModifyMode, TransformMode, ViewMode, } from "@deck.gl-community/editable-layers";
|
|
2
|
+
import { COORDINATE_SYSTEM, CompositeLayer } from "@deck.gl/core";
|
|
4
3
|
import { area, length } from "../../utils/measurement";
|
|
5
4
|
// Custom drawing mode that deletes the selected GeoJson feature when releasing the Delete key.
|
|
6
5
|
class CustomModifyMode extends ModifyMode {
|
|
@@ -106,14 +105,15 @@ export default class DrawingLayer extends CompositeLayer {
|
|
|
106
105
|
// For now, use `any` for the picking types because this function should
|
|
107
106
|
// recieve PickInfo<FeatureCollection>, but it recieves PickInfo<Feature>.
|
|
108
107
|
getPickingInfo({ info }) {
|
|
108
|
+
var _a, _b;
|
|
109
109
|
if (!info.object)
|
|
110
110
|
return info;
|
|
111
111
|
const feature = info.object;
|
|
112
112
|
let measurement;
|
|
113
|
-
if (feature.geometry.type === "LineString") {
|
|
113
|
+
if (((_a = feature.geometry) === null || _a === void 0 ? void 0 : _a.type) === "LineString") {
|
|
114
114
|
measurement = length(feature);
|
|
115
115
|
}
|
|
116
|
-
else if (feature.geometry.type === "Polygon") {
|
|
116
|
+
else if (((_b = feature.geometry) === null || _b === void 0 ? void 0 : _b.type) === "Polygon") {
|
|
117
117
|
measurement = area(feature);
|
|
118
118
|
}
|
|
119
119
|
else
|
|
@@ -164,7 +164,9 @@ export default class DrawingLayer extends CompositeLayer {
|
|
|
164
164
|
// Return the line color based on the selection status.
|
|
165
165
|
// The same can be done for other features (polygons, points etc).
|
|
166
166
|
_getLineColor(feature) {
|
|
167
|
-
const
|
|
167
|
+
const selectedFeatureIndexes = this.state["selectedFeatureIndexes"];
|
|
168
|
+
const data = this.state["data"];
|
|
169
|
+
const is_feature_selected = selectedFeatureIndexes.some((i) => data.features[i] === feature);
|
|
168
170
|
if (is_feature_selected) {
|
|
169
171
|
return SELECTED_LINE_COLOR;
|
|
170
172
|
}
|
|
@@ -192,7 +194,6 @@ export default class DrawingLayer extends CompositeLayer {
|
|
|
192
194
|
},
|
|
193
195
|
},
|
|
194
196
|
});
|
|
195
|
-
// @ts-expect-error: EditableGeoJsonLayer from nebula.gl has no typing
|
|
196
197
|
return [new EditableGeoJsonLayer(sub_layer_props)];
|
|
197
198
|
}
|
|
198
199
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drawingLayer.js","sourceRoot":"","sources":["../../../src/layers/drawing/drawingLayer.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"drawingLayer.js","sourceRoot":"","sources":["../../../src/layers/drawing/drawingLayer.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { CompositeLayer } from "@deck.gl/core
|
|
2
|
-
import type { GeoJsonLayerProps } from "@deck.gl/layers
|
|
3
|
-
import { GeoJsonLayer } from "@deck.gl/layers
|
|
1
|
+
import { CompositeLayer } from "@deck.gl/core";
|
|
2
|
+
import type { GeoJsonLayerProps } from "@deck.gl/layers";
|
|
3
|
+
import { GeoJsonLayer } from "@deck.gl/layers";
|
|
4
4
|
import type { Feature } from "geojson";
|
|
5
5
|
export interface FaultPolygonsLayerProps extends GeoJsonLayerProps {
|
|
6
6
|
depthTest: boolean;
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import { COORDINATE_SYSTEM, CompositeLayer } from "@deck.gl/core
|
|
2
|
-
import { GeoJsonLayer } from "@deck.gl/layers
|
|
3
|
-
import GL from "@luma.gl/constants";
|
|
1
|
+
import { COORDINATE_SYSTEM, CompositeLayer } from "@deck.gl/core";
|
|
2
|
+
import { GeoJsonLayer } from "@deck.gl/layers";
|
|
4
3
|
const getColor = (d) => {
|
|
5
4
|
var _a, _b, _c, _d;
|
|
6
5
|
const c = (_a = d === null || d === void 0 ? void 0 : d.properties) === null || _a === void 0 ? void 0 : _a["color"];
|
|
@@ -32,7 +31,7 @@ export default class FaultPolygonsLayer extends CompositeLayer {
|
|
|
32
31
|
getLineColor: (d) => { var _a, _b; return (_b = (_a = d === null || d === void 0 ? void 0 : d.properties) === null || _a === void 0 ? void 0 : _a["color"]) !== null && _b !== void 0 ? _b : [0, 0, 0, 255]; },
|
|
33
32
|
getFillColor: getColor,
|
|
34
33
|
parameters: {
|
|
35
|
-
|
|
34
|
+
depthTest: this.props.depthTest,
|
|
36
35
|
},
|
|
37
36
|
}));
|
|
38
37
|
return [layer];
|
|
@@ -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,
|
|
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,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,UAAU,0CAAG,OAAO,CAAC,CAAC;IAC1C,MAAM,CAAC,GAAG,MAAA,CAAC,CAAC,CAAC,CAAC,mCAAI,CAAC,CAAC;IACpB,MAAM,CAAC,GAAG,MAAA,CAAC,CAAC,CAAC,CAAC,mCAAI,CAAC,CAAC;IACpB,MAAM,CAAC,GAAG,MAAA,CAAC,CAAC,CAAC,CAAC,mCAAI,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,eACzB,OAAA,MAAA,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,UAAU,0CAAG,OAAO,CAAC,mCAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAA,EAAA;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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const fsShader = "#version 300 es\n#define SHADER_NAME grid3d-fragment-shader\n\nprecision highp float;\n\nin vec3 cameraPosition;\nin vec4 position_commonspace;\nflat in float property;\nin float property_interpolated;\n\nflat in vec3 normal;\nflat in int vertexIndex;\n\nuniform sampler2D colormap;\n\nuniform float valueRangeMin;\nuniform float valueRangeMax;\nuniform float colorMapRangeMin;\nuniform float colorMapRangeMax;\n\nuniform bool
|
|
1
|
+
declare const fsShader = "#version 300 es\n#define SHADER_NAME grid3d-fragment-shader\n\nprecision highp float;\n\nin vec3 cameraPosition;\nin vec4 position_commonspace;\nflat in float property;\nin float property_interpolated;\n\nflat in vec3 normal;\nflat in int vertexIndex;\n\nout vec4 fragColor;\n\nuniform sampler2D colormap;\n\nuniform float valueRangeMin;\nuniform float valueRangeMax;\nuniform float colorMapRangeMin;\nuniform float colorMapRangeMax;\n\nuniform bool isColoringDiscrete;\nuniform float colorMapSize;\nuniform lowp int coloringMode;\n\nuniform vec3 colorMapClampColor;\nuniform vec3 undefinedPropertyColor;\nuniform bool isClampColor;\nuniform bool isColorMapClampColorTransparent;\n\nvec4 getContinuousPropertyColor (float propertyValue) {\n \n vec4 color = vec4(1.0, 1.0, 1.0, 1.0);\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 }\n else {\n // Use min/max color to clamp.\n x = clamp (x, 0.0, 1.0); \n color = texture(colormap, vec2(x, 0.5));\n }\n }\n else {\n color = texture(colormap, vec2(x, 0.5));\n }\n return color;\n}\n\n// Calculate color from propertyValue using discrete colormap.\nvec4 getDiscretePropertyColor (float propertyValue) {\n\n vec4 color = vec4(1.0, 1.0, 1.0, 1.0);\n float tolerance = (1.0 / colorMapSize) * 0.5;\n\n if (propertyValue < colorMapRangeMin - tolerance || propertyValue > colorMapRangeMax + tolerance) {\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 }\n else {\n // Use min/max color to clamp.\n float p = clamp (propertyValue, colorMapRangeMin, colorMapRangeMax);\n float x = p / colorMapSize;\n color = texture(colormap, vec2(x, 0.5));\n }\n }\n else {\n float x = propertyValue / colorMapSize;\n color = texture(colormap, vec2(x + tolerance, 0.5));\n }\n return color;\n}\n\nvec4 getPropertyColor (float propertyValue) {\n if(isColoringDiscrete) {\n return getDiscretePropertyColor (propertyValue);\n }\n return getContinuousPropertyColor (propertyValue);\n}\n\nvoid main(void) {\n\n if (picking.isActive > 0.5 && !(picking.isAttribute > 0.5)) {\n fragColor = encodeVertexIndexToRGB(vertexIndex); \n return;\n }\n\n if (coloringMode == 0 && isnan(property)) {\n fragColor = vec4(undefinedPropertyColor.rgb, 1.0); \n return;\n } \n \n // Property values other than X,Y or Z are passed as \"flat\" i.e. constant over faces.\n float propertyValue = coloringMode == 0 ? property : property_interpolated;\n propertyValue = clamp(propertyValue, valueRangeMin, valueRangeMax);\n\n vec4 color = getPropertyColor(propertyValue);\n\n // Use two sided phong lighting. This has no effect if \"material\" property is not set.\n vec3 lightColor = getPhongLightColor(color.rgb, cameraPosition, position_commonspace.xyz, normal);\n fragColor = vec4(lightColor, 1.0);\n DECKGL_FILTER_COLOR(fragColor, geometry);\n}\n";
|
|
2
2
|
export default fsShader;
|
|
@@ -11,6 +11,8 @@ in float property_interpolated;
|
|
|
11
11
|
flat in vec3 normal;
|
|
12
12
|
flat in int vertexIndex;
|
|
13
13
|
|
|
14
|
+
out vec4 fragColor;
|
|
15
|
+
|
|
14
16
|
uniform sampler2D colormap;
|
|
15
17
|
|
|
16
18
|
uniform float valueRangeMin;
|
|
@@ -18,18 +20,18 @@ uniform float valueRangeMax;
|
|
|
18
20
|
uniform float colorMapRangeMin;
|
|
19
21
|
uniform float colorMapRangeMax;
|
|
20
22
|
|
|
21
|
-
uniform bool
|
|
23
|
+
uniform bool isColoringDiscrete;
|
|
22
24
|
uniform float colorMapSize;
|
|
23
25
|
uniform lowp int coloringMode;
|
|
24
26
|
|
|
25
27
|
uniform vec3 colorMapClampColor;
|
|
28
|
+
uniform vec3 undefinedPropertyColor;
|
|
26
29
|
uniform bool isClampColor;
|
|
27
30
|
uniform bool isColorMapClampColorTransparent;
|
|
28
31
|
|
|
29
32
|
vec4 getContinuousPropertyColor (float propertyValue) {
|
|
30
|
-
|
|
33
|
+
|
|
31
34
|
vec4 color = vec4(1.0, 1.0, 1.0, 1.0);
|
|
32
|
-
|
|
33
35
|
float x = (propertyValue - colorMapRangeMin) / (colorMapRangeMax - colorMapRangeMin);
|
|
34
36
|
if (x < 0.0 || x > 1.0) {
|
|
35
37
|
// Out of range. Use clampcolor.
|
|
@@ -43,11 +45,11 @@ vec4 getContinuousPropertyColor (float propertyValue) {
|
|
|
43
45
|
else {
|
|
44
46
|
// Use min/max color to clamp.
|
|
45
47
|
x = clamp (x, 0.0, 1.0);
|
|
46
|
-
color =
|
|
48
|
+
color = texture(colormap, vec2(x, 0.5));
|
|
47
49
|
}
|
|
48
50
|
}
|
|
49
51
|
else {
|
|
50
|
-
color =
|
|
52
|
+
color = texture(colormap, vec2(x, 0.5));
|
|
51
53
|
}
|
|
52
54
|
return color;
|
|
53
55
|
}
|
|
@@ -71,12 +73,12 @@ vec4 getDiscretePropertyColor (float propertyValue) {
|
|
|
71
73
|
// Use min/max color to clamp.
|
|
72
74
|
float p = clamp (propertyValue, colorMapRangeMin, colorMapRangeMax);
|
|
73
75
|
float x = p / colorMapSize;
|
|
74
|
-
color =
|
|
76
|
+
color = texture(colormap, vec2(x, 0.5));
|
|
75
77
|
}
|
|
76
78
|
}
|
|
77
79
|
else {
|
|
78
80
|
float x = propertyValue / colorMapSize;
|
|
79
|
-
color =
|
|
81
|
+
color = texture(colormap, vec2(x + tolerance, 0.5));
|
|
80
82
|
}
|
|
81
83
|
return color;
|
|
82
84
|
}
|
|
@@ -90,21 +92,26 @@ vec4 getPropertyColor (float propertyValue) {
|
|
|
90
92
|
|
|
91
93
|
void main(void) {
|
|
92
94
|
|
|
93
|
-
if (
|
|
94
|
-
|
|
95
|
+
if (picking.isActive > 0.5 && !(picking.isAttribute > 0.5)) {
|
|
96
|
+
fragColor = encodeVertexIndexToRGB(vertexIndex);
|
|
95
97
|
return;
|
|
96
98
|
}
|
|
97
|
-
|
|
99
|
+
|
|
100
|
+
if (coloringMode == 0 && isnan(property)) {
|
|
101
|
+
fragColor = vec4(undefinedPropertyColor.rgb, 1.0);
|
|
102
|
+
return;
|
|
103
|
+
}
|
|
104
|
+
|
|
98
105
|
// Property values other than X,Y or Z are passed as "flat" i.e. constant over faces.
|
|
99
106
|
float propertyValue = coloringMode == 0 ? property : property_interpolated;
|
|
100
107
|
propertyValue = clamp(propertyValue, valueRangeMin, valueRangeMax);
|
|
101
108
|
|
|
102
109
|
vec4 color = getPropertyColor(propertyValue);
|
|
103
|
-
|
|
110
|
+
|
|
104
111
|
// Use two sided phong lighting. This has no effect if "material" property is not set.
|
|
105
112
|
vec3 lightColor = getPhongLightColor(color.rgb, cameraPosition, position_commonspace.xyz, normal);
|
|
106
|
-
|
|
107
|
-
DECKGL_FILTER_COLOR(
|
|
113
|
+
fragColor = vec4(lightColor, 1.0);
|
|
114
|
+
DECKGL_FILTER_COLOR(fragColor, geometry);
|
|
108
115
|
}
|
|
109
116
|
`;
|
|
110
117
|
export default fsShader;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fragment.fs.glsl.js","sourceRoot":"","sources":["../../../src/layers/grid3d/fragment.fs.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,QAAQ,GAAG
|
|
1
|
+
{"version":3,"file":"fragment.fs.glsl.js","sourceRoot":"","sources":["../../../src/layers/grid3d/fragment.fs.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,QAAQ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmHhB,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/grid3d/fragment_lines.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,cAAc,GAAG
|
|
1
|
+
{"version":3,"file":"fragment_lines.glsl.js","sourceRoot":"","sources":["../../../src/layers/grid3d/fragment_lines.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,cAAc,GAAG;;;;;;;;;;;CAWtB,CAAC;AAEF,eAAe,cAAc,CAAC"}
|
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
import type React from "react";
|
|
2
|
-
import type { Color } from "@deck.gl/core
|
|
3
|
-
import { CompositeLayer } from "@deck.gl/core
|
|
2
|
+
import type { Color } from "@deck.gl/core";
|
|
3
|
+
import { CompositeLayer } from "@deck.gl/core";
|
|
4
4
|
import type { Material } from "./typeDefs";
|
|
5
5
|
import PrivateLayer from "./privateGrid3dLayer";
|
|
6
|
-
import type { ExtendedLayerProps, colorMapFunctionType } from "../utils/layerTools";
|
|
7
6
|
import type { ReportBoundingBoxAction } from "../../components/Map";
|
|
7
|
+
import type { ExtendedLayerProps, colorMapFunctionType } from "../utils/layerTools";
|
|
8
8
|
export type WebWorkerParams = {
|
|
9
9
|
points: Float32Array;
|
|
10
10
|
polys: Uint32Array;
|
|
11
11
|
properties: Float32Array | Uint16Array;
|
|
12
|
+
undefinedValue: number;
|
|
12
13
|
};
|
|
13
14
|
/**
|
|
14
15
|
* Enumerates possible coloring modes of Grid3D Layer.
|
|
@@ -72,6 +73,20 @@ export interface Grid3DLayerProps extends ExtendedLayerProps {
|
|
|
72
73
|
* Can be defined as Uint8Array containing [R, G, B] triplets in [0, 255] range each.
|
|
73
74
|
*/
|
|
74
75
|
colorMapFunction?: colorMapFunctionType | Uint8Array;
|
|
76
|
+
/**
|
|
77
|
+
* Value in propertiesData indicating that the property is undefined.
|
|
78
|
+
* When propertiesData is Uint16Array the value is index in discretePropertyValueNames if provided.
|
|
79
|
+
* By default, it is assumed to be NaN for Float32 properties data and 0xFFFF for UInt16.
|
|
80
|
+
* Note: in case of floating point properties exact comparison is performed so use the same
|
|
81
|
+
* constant value both in propertiesData array and as undefinedPropertyValue.
|
|
82
|
+
*/
|
|
83
|
+
undefinedPropertyValue?: number;
|
|
84
|
+
/**
|
|
85
|
+
* Color for the cells with undefined property value.
|
|
86
|
+
* Is not overridden by and used prior to colorMapFunction.
|
|
87
|
+
* By default, Light gray if not provided.
|
|
88
|
+
*/
|
|
89
|
+
undefinedPropertyColor?: [number, number, number];
|
|
75
90
|
/** Enable lines around cell faces.
|
|
76
91
|
* default: true.
|
|
77
92
|
*/
|
|
@@ -107,4 +122,6 @@ export default class Grid3DLayer extends CompositeLayer<Grid3DLayerProps> {
|
|
|
107
122
|
}): void;
|
|
108
123
|
renderLayers(): [PrivateLayer?];
|
|
109
124
|
private getPropertyValueRange;
|
|
125
|
+
private getUndefinedPropertyValue;
|
|
126
|
+
private getUndefinedPropertyColor;
|
|
110
127
|
}
|
|
@@ -8,8 +8,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
10
|
import { isEqual } from "lodash";
|
|
11
|
-
import { CompositeLayer } from "@deck.gl/core
|
|
12
|
-
import {
|
|
11
|
+
import { CompositeLayer } from "@deck.gl/core";
|
|
12
|
+
import { JSONLoader, load } from "@loaders.gl/core";
|
|
13
13
|
import workerpool from "workerpool";
|
|
14
14
|
import PrivateLayer from "./privateGrid3dLayer";
|
|
15
15
|
import { makeFullMesh } from "./webworker";
|
|
@@ -132,6 +132,7 @@ export default class Grid3DLayer extends CompositeLayer {
|
|
|
132
132
|
points,
|
|
133
133
|
polys,
|
|
134
134
|
properties,
|
|
135
|
+
undefinedValue: this.getUndefinedPropertyValue(),
|
|
135
136
|
};
|
|
136
137
|
pool.exec(makeFullMesh, [{ data: webworkerParams }]).then((e) => {
|
|
137
138
|
var _a;
|
|
@@ -181,6 +182,8 @@ export default class Grid3DLayer extends CompositeLayer {
|
|
|
181
182
|
// isFinishedLoading only in state
|
|
182
183
|
return [];
|
|
183
184
|
}
|
|
185
|
+
const undefinedColor = this.getUndefinedPropertyColor();
|
|
186
|
+
const undefinedValue = this.getUndefinedPropertyValue();
|
|
184
187
|
const layer = new PrivateLayer(this.getSubLayerProps({
|
|
185
188
|
mesh: this.state["mesh"],
|
|
186
189
|
meshLines: this.state["mesh_lines"],
|
|
@@ -188,6 +191,8 @@ export default class Grid3DLayer extends CompositeLayer {
|
|
|
188
191
|
colorMapName: this.props.colorMapName,
|
|
189
192
|
colorMapRange: this.props.colorMapRange,
|
|
190
193
|
colorMapClampColor: this.props.colorMapClampColor,
|
|
194
|
+
undefinedPropertyValue: undefinedValue,
|
|
195
|
+
undefinedPropertyColor: undefinedColor,
|
|
191
196
|
colorMapFunction: this.props.colorMapFunction,
|
|
192
197
|
coloringMode: this.props.coloringMode,
|
|
193
198
|
gridLines: this.props.gridLines,
|
|
@@ -213,6 +218,19 @@ export default class Grid3DLayer extends CompositeLayer {
|
|
|
213
218
|
return this.state["propertyValueRange"];
|
|
214
219
|
}
|
|
215
220
|
}
|
|
221
|
+
getUndefinedPropertyValue() {
|
|
222
|
+
if (typeof this.props.undefinedPropertyValue === "number") {
|
|
223
|
+
return this.props.undefinedPropertyValue;
|
|
224
|
+
}
|
|
225
|
+
if (this.props.propertiesData instanceof Uint16Array) {
|
|
226
|
+
return 0xffff;
|
|
227
|
+
}
|
|
228
|
+
return Number.NaN;
|
|
229
|
+
}
|
|
230
|
+
getUndefinedPropertyColor() {
|
|
231
|
+
var _a;
|
|
232
|
+
return (_a = this.props.undefinedPropertyColor) !== null && _a !== void 0 ? _a : [0.8, 0.8, 0.8];
|
|
233
|
+
}
|
|
216
234
|
}
|
|
217
235
|
Grid3DLayer.layerName = "Grid3DLayer";
|
|
218
236
|
Grid3DLayer.defaultProps = defaultProps;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grid3dLayer.js","sourceRoot":"","sources":["../../../src/layers/grid3d/grid3dLayer.ts"],"names":[],"mappings":";;;;;;;;;
|
|
1
|
+
{"version":3,"file":"grid3dLayer.js","sourceRoot":"","sources":["../../../src/layers/grid3d/grid3dLayer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import type { PickingInfo, UpdateParameters,
|
|
2
|
-
import { Layer } from "@deck.gl/core
|
|
1
|
+
import type { Color, PickingInfo, UpdateParameters, LayerContext } from "@deck.gl/core";
|
|
2
|
+
import { Layer } from "@deck.gl/core";
|
|
3
|
+
import type { UniformValue } from "@luma.gl/core";
|
|
3
4
|
import { Model } from "@luma.gl/engine";
|
|
4
5
|
import type { DeckGLLayerContext } from "../../components/Map";
|
|
5
6
|
import type { ExtendedLayerProps, LayerPickInfo, colorMapFunctionType } from "../utils/layerTools";
|
|
@@ -11,6 +12,8 @@ export interface PrivateLayerProps extends ExtendedLayerProps {
|
|
|
11
12
|
colorMapName: string;
|
|
12
13
|
colorMapRange: [number, number];
|
|
13
14
|
colorMapClampColor: Color | undefined | boolean;
|
|
15
|
+
undefinedPropertyValue: number;
|
|
16
|
+
undefinedPropertyColor: [number, number, number];
|
|
14
17
|
colorMapFunction?: colorMapFunctionType;
|
|
15
18
|
coloringMode: TGrid3DColoringMode.Property;
|
|
16
19
|
gridLines: boolean;
|
|
@@ -24,8 +27,12 @@ export default class PrivateLayer extends Layer<PrivateLayerProps> {
|
|
|
24
27
|
initializeState(context: DeckGLLayerContext): void;
|
|
25
28
|
shouldUpdateState({ props, oldProps, context, changeFlags, }: UpdateParameters<this>): boolean;
|
|
26
29
|
updateState({ context }: UpdateParameters<this>): void;
|
|
27
|
-
_getModels(
|
|
28
|
-
draw(args:
|
|
30
|
+
_getModels(context: DeckGLLayerContext): Model[];
|
|
31
|
+
draw(args: {
|
|
32
|
+
moduleParameters?: unknown;
|
|
33
|
+
uniforms: UniformValue;
|
|
34
|
+
context: LayerContext;
|
|
35
|
+
}): void;
|
|
29
36
|
decodePickingColor(): number;
|
|
30
37
|
encodePickingColor(): number[];
|
|
31
38
|
getPickingInfo({ info }: {
|
|
@@ -35,4 +42,5 @@ export default class PrivateLayer extends Layer<PrivateLayerProps> {
|
|
|
35
42
|
private getDefaultImageData;
|
|
36
43
|
private getImageData;
|
|
37
44
|
private getPropertyUniforms;
|
|
45
|
+
private getTexture;
|
|
38
46
|
}
|