@webviz/subsurface-viewer 1.11.10 → 1.12.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/components/ColorLegend.d.ts +2 -2
- package/dist/layers/colormap/colormapLayer.d.ts +2 -2
- package/dist/layers/grid3d/grid3dLayer.d.ts +2 -2
- package/dist/layers/grid3d/grid3dLayer.js +11 -26
- package/dist/layers/grid3d/grid3dLayer.js.map +1 -1
- package/dist/layers/grid3d/privateGrid3dLayer.d.ts +2 -2
- package/dist/layers/map/mapLayer.d.ts +2 -2
- package/dist/layers/map/mapLayer.js +3 -3
- package/dist/layers/map/mapLayer.js.map +1 -1
- package/dist/layers/map/privateMapLayer.d.ts +2 -2
- package/dist/layers/utils/colormapTools.d.ts +8 -6
- package/dist/layers/utils/colormapTools.js +1 -1
- package/dist/layers/utils/colormapTools.js.map +1 -1
- package/dist/layers/wells/wellsLayer.d.ts +2 -2
- package/dist/utils/index.d.ts +2 -0
- package/dist/utils/index.js +2 -0
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/serialize.d.ts +8 -14
- package/dist/utils/serialize.js +74 -53
- package/dist/utils/serialize.js.map +1 -1
- package/dist/utils/typedArray.d.ts +2 -2
- package/dist/utils/typedArray.js +4 -7
- package/dist/utils/typedArray.js.map +1 -1
- package/package.json +1 -1
|
@@ -3,12 +3,12 @@ import React from "react";
|
|
|
3
3
|
import type { Color } from "@deck.gl/core";
|
|
4
4
|
import type { colorTablesArray } from "@emerson-eps/color-tables/";
|
|
5
5
|
import type { ExtendedLegendLayer } from "../layers/utils/layerTools";
|
|
6
|
-
import type {
|
|
6
|
+
import type { ColormapFunctionType } from "../layers/utils/colormapTools";
|
|
7
7
|
interface LegendBaseData {
|
|
8
8
|
title: string;
|
|
9
9
|
colorName: string;
|
|
10
10
|
discrete: boolean;
|
|
11
|
-
colorMapFunction?:
|
|
11
|
+
colorMapFunction?: ColormapFunctionType;
|
|
12
12
|
}
|
|
13
13
|
export interface DiscreteLegendDataType extends LegendBaseData {
|
|
14
14
|
metadata: Record<string, [Color, number]>;
|
|
@@ -4,12 +4,12 @@ import type { BitmapLayerPickingInfo, BitmapLayerProps } from "@deck.gl/layers";
|
|
|
4
4
|
import { BitmapLayer } from "@deck.gl/layers";
|
|
5
5
|
import type { Model } from "@luma.gl/engine";
|
|
6
6
|
import type { LayerPickInfo, ReportBoundingBoxAction, TypeAndNameLayerProps } from "../utils/layerTools";
|
|
7
|
-
import { type
|
|
7
|
+
import { type ColormapFunctionType } from "../utils/colormapTools";
|
|
8
8
|
import { type ValueDecoder } from "../utils/propertyMapTools";
|
|
9
9
|
import type { ContinuousLegendDataType } from "../../components/ColorLegend";
|
|
10
10
|
export interface ColormapLayerProps extends BitmapLayerProps, TypeAndNameLayerProps {
|
|
11
11
|
colorMapName: string;
|
|
12
|
-
colorMapFunction?:
|
|
12
|
+
colorMapFunction?: ColormapFunctionType;
|
|
13
13
|
valueRange: [number, number];
|
|
14
14
|
colorMapRange: [number, number];
|
|
15
15
|
valueDecoder: ValueDecoder;
|
|
@@ -4,7 +4,7 @@ import { CompositeLayer } from "@deck.gl/core";
|
|
|
4
4
|
import type { Material } from "../gpglLayers/typeDefs";
|
|
5
5
|
import PrivateLayer from "./privateGrid3dLayer";
|
|
6
6
|
import type { ExtendedLayerProps, ReportBoundingBoxAction } from "../utils/layerTools";
|
|
7
|
-
import type {
|
|
7
|
+
import type { ColormapFunctionType } from "../utils/colormapTools";
|
|
8
8
|
export type WebWorkerParams = {
|
|
9
9
|
points: Float32Array;
|
|
10
10
|
polys: Uint32Array;
|
|
@@ -92,7 +92,7 @@ export interface Grid3DLayerProps extends ExtendedLayerProps {
|
|
|
92
92
|
* E.g. [255, 0, 0] for constant red cells.
|
|
93
93
|
* Can be defined as Uint8Array containing [R, G, B] triplets in [0, 255] range each.
|
|
94
94
|
*/
|
|
95
|
-
colorMapFunction?:
|
|
95
|
+
colorMapFunction?: ColormapFunctionType | Uint8Array;
|
|
96
96
|
/**
|
|
97
97
|
* Value in propertiesData indicating that the property is undefined.
|
|
98
98
|
* When propertiesData is Uint16Array the value is index in discretePropertyValueNames if provided.
|
|
@@ -9,12 +9,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
};
|
|
10
10
|
import { isEqual } from "lodash";
|
|
11
11
|
import { CompositeLayer } from "@deck.gl/core";
|
|
12
|
-
import { JSONLoader, load } from "@loaders.gl/core";
|
|
13
12
|
import workerpool from "workerpool";
|
|
14
13
|
import PrivateLayer from "./privateGrid3dLayer";
|
|
15
14
|
import { makeFullMesh } from "./webworker";
|
|
16
15
|
import config from "../../SubsurfaceConfig.json";
|
|
17
|
-
import { findConfig } from "../../utils
|
|
16
|
+
import { findConfig, loadDataArray } from "../../utils";
|
|
18
17
|
// init workerpool
|
|
19
18
|
const workerPoolConfig = findConfig(config, "config/workerpool", "config/layer/Grid3DLayer/workerpool");
|
|
20
19
|
const pool = workerpool.pool(Object.assign({
|
|
@@ -46,27 +45,9 @@ function GetBBox(points) {
|
|
|
46
45
|
}
|
|
47
46
|
function loadData(data, type) {
|
|
48
47
|
return __awaiter(this, void 0, void 0, function* () {
|
|
49
|
-
|
|
50
|
-
if (
|
|
51
|
-
return
|
|
52
|
-
}
|
|
53
|
-
if (Array.isArray(data)) {
|
|
54
|
-
return new type(data);
|
|
55
|
-
}
|
|
56
|
-
if (typeof data === "string") {
|
|
57
|
-
const extension = (_a = data.split(".").pop()) === null || _a === void 0 ? void 0 : _a.toLowerCase();
|
|
58
|
-
// Data is a file name with .json extension
|
|
59
|
-
if (extension === "json") {
|
|
60
|
-
const stringData = yield load(data, JSONLoader);
|
|
61
|
-
return new type(stringData);
|
|
62
|
-
}
|
|
63
|
-
// It is assumed that the data is a file containing raw array of bytes.
|
|
64
|
-
const response = yield fetch(data);
|
|
65
|
-
if (response.ok) {
|
|
66
|
-
const blob = yield response.blob();
|
|
67
|
-
const buffer = yield blob.arrayBuffer();
|
|
68
|
-
return new type(buffer);
|
|
69
|
-
}
|
|
48
|
+
const result = yield loadDataArray(data, type);
|
|
49
|
+
if (result !== null) {
|
|
50
|
+
return result;
|
|
70
51
|
}
|
|
71
52
|
return Promise.reject("Grid3DLayer: Unsupported type of input data");
|
|
72
53
|
});
|
|
@@ -74,9 +55,13 @@ function loadData(data, type) {
|
|
|
74
55
|
function loadPropertiesData(propertiesData) {
|
|
75
56
|
return __awaiter(this, void 0, void 0, function* () {
|
|
76
57
|
const isPropertiesDiscrete = propertiesData instanceof Uint16Array;
|
|
77
|
-
|
|
78
|
-
? yield
|
|
79
|
-
: yield
|
|
58
|
+
const result = isPropertiesDiscrete
|
|
59
|
+
? yield loadDataArray(propertiesData, Uint16Array)
|
|
60
|
+
: yield loadDataArray(propertiesData, Float32Array);
|
|
61
|
+
if (result !== null) {
|
|
62
|
+
return result;
|
|
63
|
+
}
|
|
64
|
+
return Promise.reject("Grid3DLayer: Unsupported type of input data");
|
|
80
65
|
});
|
|
81
66
|
}
|
|
82
67
|
function load_data(pointsData, polysData, propertiesData, loadProperties) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grid3dLayer.js","sourceRoot":"","sources":["../../../src/layers/grid3d/grid3dLayer.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAIjC,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"grid3dLayer.js","sourceRoot":"","sources":["../../../src/layers/grid3d/grid3dLayer.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { Layer } from "@deck.gl/core";
|
|
|
3
3
|
import type { UniformValue } from "@luma.gl/core";
|
|
4
4
|
import { Model } from "@luma.gl/engine";
|
|
5
5
|
import type { DeckGLLayerContext, ExtendedLayerProps, LayerPickInfo } from "../utils/layerTools";
|
|
6
|
-
import { type
|
|
6
|
+
import { type ColormapFunctionType } from "../utils/colormapTools";
|
|
7
7
|
import { TGrid3DColoringMode, type IDiscretePropertyValueName } from "./grid3dLayer";
|
|
8
8
|
import type { MeshType, MeshTypeLines } from "./typeDefs";
|
|
9
9
|
export interface PrivateLayerProps extends ExtendedLayerProps {
|
|
@@ -14,7 +14,7 @@ export interface PrivateLayerProps extends ExtendedLayerProps {
|
|
|
14
14
|
colormapClampColor: Color | undefined | boolean;
|
|
15
15
|
undefinedPropertyValue: number;
|
|
16
16
|
undefinedPropertyColor: [number, number, number];
|
|
17
|
-
colormapFunction?:
|
|
17
|
+
colormapFunction?: ColormapFunctionType;
|
|
18
18
|
coloringMode: TGrid3DColoringMode.Property;
|
|
19
19
|
gridLines: boolean;
|
|
20
20
|
propertyValueRange: [number, number];
|
|
@@ -2,7 +2,7 @@ import type React from "react";
|
|
|
2
2
|
import type { Color, CompositeLayerProps, Layer, Material, UpdateParameters } from "@deck.gl/core";
|
|
3
3
|
import { CompositeLayer } from "@deck.gl/core";
|
|
4
4
|
import type { ReportBoundingBoxAction, ExtendedLayerProps } from "../utils/layerTools";
|
|
5
|
-
import type {
|
|
5
|
+
import type { ColormapFunctionType } from "../utils/colormapTools";
|
|
6
6
|
import PrivateMapLayer from "./privateMapLayer";
|
|
7
7
|
type Frame = {
|
|
8
8
|
/** mesh origin
|
|
@@ -89,7 +89,7 @@ export interface MapLayerProps extends ExtendedLayerProps {
|
|
|
89
89
|
* May also be set as constant color:
|
|
90
90
|
* E.g. [255, 0, 0] for constant red surface.
|
|
91
91
|
*/
|
|
92
|
-
colorMapFunction?:
|
|
92
|
+
colorMapFunction?: ColormapFunctionType;
|
|
93
93
|
/** Surface material properties.
|
|
94
94
|
* material: true = default material, coloring depends on surface orientation and lighting.
|
|
95
95
|
* false = no material, coloring is independent on surface orientation and lighting.
|
|
@@ -12,7 +12,7 @@ import { CompositeLayer } from "@deck.gl/core";
|
|
|
12
12
|
import { getModelMatrix } from "../utils/layerTools";
|
|
13
13
|
import config from "../../SubsurfaceConfig.json";
|
|
14
14
|
import { findConfig } from "../../utils/configTools";
|
|
15
|
-
import {
|
|
15
|
+
import { loadDataArray } from "../../utils/serialize";
|
|
16
16
|
import PrivateMapLayer from "./privateMapLayer";
|
|
17
17
|
import { rotate } from "./utils";
|
|
18
18
|
import { makeFullMesh } from "./webworker";
|
|
@@ -38,8 +38,8 @@ function loadMeshAndProperties(meshData, propertiesData) {
|
|
|
38
38
|
return __awaiter(this, void 0, void 0, function* () {
|
|
39
39
|
// Keep
|
|
40
40
|
//const t0 = performance.now();
|
|
41
|
-
const mesh = yield
|
|
42
|
-
const properties = yield
|
|
41
|
+
const mesh = yield loadDataArray(meshData, Float32Array);
|
|
42
|
+
const properties = yield loadDataArray(propertiesData, Float32Array);
|
|
43
43
|
// if (!isMesh && !isProperties) {
|
|
44
44
|
// console.error("Error. One or both of texture and mesh must be given!");
|
|
45
45
|
// }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapLayer.js","sourceRoot":"","sources":["../../../src/layers/map/mapLayer.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAUjC,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAO/C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,MAAM,MAAM,6BAA6B,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"mapLayer.js","sourceRoot":"","sources":["../../../src/layers/map/mapLayer.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAUjC,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAO/C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,MAAM,MAAM,6BAA6B,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,UAAU,MAAM,YAAY,CAAC;AAEpC,kBAAkB;AAClB,MAAM,gBAAgB,GAAG,UAAU,CAC/B,MAAM,EACN,mBAAmB,EACnB,kCAAkC,CACrC,CAAC;AAEF,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,eACrB;IACC,UAAU,EAAE,EAAE;IACd,UAAU,EAAE,KAAK;CACpB,EACE,gBAAgB,EACrB,CAAC;AAEH,SAAS,iBAAiB;IACtB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;IAC3B,IAAI,KAAK,CAAC,WAAW,KAAK,CAAC,IAAI,KAAK,CAAC,YAAY,KAAK,CAAC,EAAE,CAAC;QACtD,IAAI,CAAC,SAAS,EAAE,CAAC;IACrB,CAAC;AACL,CAAC;AAkCD;;;;GAIG;AACH,SAAe,qBAAqB,CAChC,QAA0C,EAC1C,cAAgD;;QAEhD,OAAO;QACP,+BAA+B;QAE/B,MAAM,IAAI,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QACzD,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;QAErE,kCAAkC;QAClC,8EAA8E;QAC9E,IAAI;QAEJ,aAAa;QACb,gCAAgC;QAChC,qEAAqE;QAErE,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC;IAC3C,CAAC;CAAA;AAwGD,MAAM,YAAY,GAAG;IACjB,QAAQ,EAAE,UAAU;IACpB,IAAI,EAAE,KAAK;IACX,EAAE,EAAE,qBAAqB;IACzB,QAAQ,EAAE,IAAI;IACd,OAAO,EAAE,IAAI;IACb,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE;IACnE,aAAa,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;IAChC,QAAQ,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC;IACtB,sDAAsD;IACtD,eAAe,EAAE,IAAI;IACrB,SAAS,EAAE,KAAK;IAChB,aAAa,EAAE,IAAI;IACnB,QAAQ,EAAE,IAAI;IACd,SAAS,EAAE,IAAI;IACf,oBAAoB,EAAE,IAAI;CAC7B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,QAEnB,SAAQ,cAAoD;IAC1D,IAAI,QAAQ;;QACR,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACtC,MAAM,QAAQ,GACV,KAAK,CAAC,QAAQ;YACd,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,2EAA2E;YACnG,SAAS,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAE/C,MAAM,UAAU,GACZ,MAAC,MAAA,IAAI,CAAC,KAAK,0CAAG,mBAAmB,CAAa,mCAAI,KAAK,CAAC;QAC5D,OAAO,QAAQ,IAAI,UAAU,CAAC;IAClC,CAAC;IAED,WAAW,CAAC,iBAA0B;;QAClC,IAAI,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,KAAK,WAAW,EAAE,CAAC;YAC5C,OAAO,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;QAC5D,CAAC;QAED,IAAI,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,KAAK,WAAW,EAAE,CAAC;YAClD,OAAO,CAAC,IAAI,CAAC,qDAAqD,CAAC,CAAC;QACxE,CAAC;QAED,MAAM,QAAQ,GAAG,MAAA,IAAI,CAAC,KAAK,CAAC,QAAQ,mCAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;QAC3D,MAAM,cAAc,GAChB,MAAA,IAAI,CAAC,KAAK,CAAC,cAAc,mCAAI,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC;QAE1D,MAAM,CAAC,GAAG,qBAAqB,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QAE1D,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,cAAc,CAAC,EAAE,EAAE;YAClC,iEAAiE;YACjE,mDAAmD;YAEnD,MAAM,eAAe,GAAG,IAAI,CAAC,kBAAkB,CAC3C,QAAQ,EACR,cAAc,CACjB,CAAC;YACF,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,EAAE,IAAI,EAAE,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,CAC5D,CAAC,CAAC,EAAE,EAAE;;gBACF,MAAM,CACF,SAAS,EACT,OAAO,EACP,eAAe,EACf,gBAAgB,EAChB,WAAW,EACX,eAAe,EACf,kBAAkB,EACrB,GAAG,CAAC,CAAC;gBAEN,IAAI,CAAC,QAAQ,iCACN,IAAI,CAAC,KAAK,KACb,SAAS;oBACT,OAAO;oBACP,eAAe;oBACf,gBAAgB;oBAChB,WAAW;oBACX,kBAAkB,EAClB,iBAAiB,EAAE,IAAI,IACzB,CAAC;gBAEH,IACI,OAAO,IAAI,CAAC,KAAK,CAAC,iBAAiB,KAAK,WAAW;oBACnD,iBAAiB,EACnB,CAAC;oBACC,MAAM,IAAI,GAAG,MAAA,MAAA,MAAA,IAAI,CAAC,KAAK,CAAC,KAAK,0CAAE,SAAS,0CAAG,CAAC,CAAC,mCAAI,CAAC,CAAC;oBACnD,MAAM,IAAI,GAAG,MAAA,MAAA,MAAA,IAAI,CAAC,KAAK,CAAC,KAAK,0CAAE,SAAS,0CAAG,CAAC,CAAC,mCAAI,CAAC,CAAC;oBAEnD,MAAM,QAAQ,GAAG,MAAA,MAAA,MAAA,IAAI,CAAC,KAAK,CAAC,KAAK,0CAAE,KAAK,0CAAG,CAAC,CAAC,mCAAI,CAAC,CAAC,CAAC,iCAAiC;oBACrF,MAAM,QAAQ,GAAG,MAAA,MAAA,MAAA,IAAI,CAAC,KAAK,CAAC,KAAK,0CAAE,KAAK,0CAAG,CAAC,CAAC,mCAAI,CAAC,CAAC;oBAEnD,MAAM,IAAI,GAAG,MAAA,MAAA,MAAA,IAAI,CAAC,KAAK,CAAC,KAAK,0CAAE,MAAM,0CAAG,CAAC,CAAC,mCAAI,CAAC,CAAC;oBAChD,MAAM,IAAI,GAAG,MAAA,MAAA,MAAA,IAAI,CAAC,KAAK,CAAC,KAAK,0CAAE,MAAM,0CAAG,CAAC,CAAC,mCAAI,CAAC,CAAC;oBAChD,MAAM,IAAI,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;oBACjC,MAAM,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;oBAC1C,MAAM,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;oBAC1C,MAAM,IAAI,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;oBAEjC,wDAAwD;oBACxD,MAAM,MAAM,GACR,MAAA,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,mCACzB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC;oBAC5B,MAAM,MAAM,GAAG,MAAA,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,mCAAI,CAAC,CAAC;oBAC5C,MAAM,MAAM,GAAG,CAAC,MAAM,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC;oBAElD,2CAA2C;oBAC3C,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,MAAM,CACnB,IAAI,EACJ,IAAI,EACJ,MAAM,CAAC,CAAC,CAAC,EACT,MAAM,CAAC,CAAC,CAAC,EACT,MAAM,CACT,CAAC,CAAC,sBAAsB;oBACzB,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,MAAM,CACnB,IAAI,EACJ,IAAI,EACJ,MAAM,CAAC,CAAC,CAAC,EACT,MAAM,CAAC,CAAC,CAAC,EACT,MAAM,CACT,CAAC,CAAC,sBAAsB;oBACzB,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,MAAM,CACnB,IAAI,EACJ,IAAI,EACJ,MAAM,CAAC,CAAC,CAAC,EACT,MAAM,CAAC,CAAC,CAAC,EACT,MAAM,CACT,CAAC,CAAC,sBAAsB;oBACzB,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,MAAM,CACnB,IAAI,EACJ,IAAI,EACJ,MAAM,CAAC,CAAC,CAAC,EACT,MAAM,CAAC,CAAC,CAAC,EACT,MAAM,CACT,CAAC,CAAC,sBAAsB;oBAEzB,+BAA+B;oBAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;oBACvC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;oBACvC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;oBACvC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;oBAEvC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC;wBACzB,gBAAgB,EAAE;4BACd,KAAK;4BACL,KAAK;4BACL,IAAI;4BACJ,KAAK;4BACL,KAAK;4BACL,IAAI;yBACP;qBACJ,CAAC,CAAC;gBACP,CAAC;gBACD,iBAAiB,EAAE,CAAC;YACxB,CAAC,CACJ,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;IAED,eAAe;QACX,IAAI,CAAC,QAAQ,iCACN,IAAI,CAAC,KAAK,KACb,iBAAiB,EAAE,KAAK,IAC1B,CAAC;QAEH,MAAM,iBAAiB,GAAG,IAAI,CAAC;QAC/B,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;IACxC,CAAC;IAED,WAAW,CAAC,EACR,KAAK,EACL,QAAQ,GAQX;QACG,MAAM,YAAY,GACd,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC;YACzC,CAAC,OAAO,CAAC,KAAK,CAAC,aAAa,EAAE,QAAQ,CAAC,aAAa,CAAC;YACrD,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC;YAC3C,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,EAAE,QAAQ,CAAC,cAAc,CAAC;YACvD,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC;YACrC,CAAC,OAAO,CACJ,KAAK,CAAC,oBAAoB,EAC1B,QAAQ,CAAC,oBAAoB,CAChC;YACD,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;QAElD,IAAI,YAAY,EAAE,CAAC;YACf,IAAI,CAAC,QAAQ,iCACN,IAAI,CAAC,KAAK,KACb,iBAAiB,EAAE,KAAK,IAC1B,CAAC;YACH,MAAM,iBAAiB,GAAG,KAAK,CAAC;YAChC,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;QACxC,CAAC;IACL,CAAC;IAED,YAAY;;QACR,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvC,kCAAkC;YAClC,OAAO,EAAE,CAAC;QACd,CAAC;QAED,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC;QAC7C,MAAM,MAAM,GAAG,MAAA,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,mCAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAEzD,MAAM,mBAAmB,GAAG,cAAc,CACtC,MAAA,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,mCAAI,CAAC,EAC5B,MAAM,CAAC,CAAC,CAAC,EACT,MAAM,CAAC,CAAC,CAAC,CACZ,CAAC;QAEF,MAAM,MAAM,GACR,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,KAAK,WAAW;YACtC,IAAI,CAAC,KAAK,CAAC,OAAO,KAAK,EAAE,CAAC;YAC9B,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,KAAK,WAAW;gBACvC,IAAI,CAAC,KAAK,CAAC,QAAQ,KAAK,EAAE,CAAC,CAAC;QAEpC,MAAM,aAAa,GACf,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,KAAK,WAAW;YAC7C,IAAI,CAAC,KAAK,CAAC,WAAW,KAAK,IAAI,CAAC;QAEpC,IAAI,aAAa,EAAE,CAAC;YAChB,mBAAmB,CAAC,aAAa,CAC7B,IAAI,CAAC,KAAK,CAAC,WAAsB,CACpC,CAAC;QACN,CAAC;QAED,MAAM,cAAc,GAAY,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,KAAK,KAAK,CAAC,CAAC;QACjE,MAAM,KAAK,GAAG,IAAI,eAAe,CAC7B,IAAI,CAAC,gBAAgB,CAAC;YAClB,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC;YAClC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;YAC9B,eAAe,EAAE,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC;YAC9C,gBAAgB,EAAE,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC;YAChD,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC;YACtC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;YAC7B,WAAW,EAAE,mBAAmB;YAChC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;YAC7B,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS;YAC/B,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe;YAC7D,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY;YACrC,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa;YACvC,kBAAkB,EAAE,IAAI,CAAC,KAAK,CAAC,kBAAkB;YACjD,gBAAgB,EAAE,IAAI,CAAC,KAAK,CAAC,gBAAgB;YAC7C,kBAAkB,EAAE,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC;YACpD,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;YAC7B,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa;YACvC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS;YAC/B,oBAAoB,EAAE,IAAI,CAAC,KAAK,CAAC,oBAAoB;YACrD,cAAc;SACjB,CAAC,CACL,CAAC;QACF,OAAO,CAAC,KAAK,CAAC,CAAC;IACnB,CAAC;IAEO,kBAAkB,CACtB,QAA6B,EAC7B,cAAmC;QAEnC,IAAI,CAAC,QAAQ,IAAI,CAAC,cAAc,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CACX,uDAAuD,CAC1D,CAAC;QACN,CAAC;QAED,MAAM,MAAM,GAAW;YACnB,QAAQ;YACR,cAAc;YACd,CAAC,CAAC,QAAQ;YACV,IAAI,CAAC,KAAK,CAAC,KAAK;YAChB,IAAI,CAAC,KAAK,CAAC,aAAa;YACxB,IAAI,CAAC,KAAK,CAAC,SAAS;SACvB,CAAC;QACF,MAAM,cAAc,GAAG;YACnB,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM;YAChB,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,MAAM;SACzB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAkB,CAAC;QAE5C,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5B,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC;QACtC,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,CAAC;IACtB,CAAC;CACJ;AAED,QAAQ,CAAC,SAAS,GAAG,UAAU,CAAC;AAChC,QAAQ,CAAC,YAAY,GAAG,YAAY,CAAC"}
|
|
@@ -3,7 +3,7 @@ import { Layer } from "@deck.gl/core";
|
|
|
3
3
|
import type { Device, UniformValue } from "@luma.gl/core";
|
|
4
4
|
import { Model } from "@luma.gl/engine";
|
|
5
5
|
import type { DeckGLLayerContext, ExtendedLayerProps, LayerPickInfo } from "../utils/layerTools";
|
|
6
|
-
import { type
|
|
6
|
+
import { type ColormapFunctionType } from "../utils/colormapTools";
|
|
7
7
|
export interface PrivateMapLayerProps extends ExtendedLayerProps {
|
|
8
8
|
positions: Float32Array;
|
|
9
9
|
normals: Float32Array;
|
|
@@ -17,7 +17,7 @@ export interface PrivateMapLayerProps extends ExtendedLayerProps {
|
|
|
17
17
|
colormapName: string;
|
|
18
18
|
colormapRange: [number, number];
|
|
19
19
|
colormapClampColor: Color | undefined | boolean;
|
|
20
|
-
colormapFunction?:
|
|
20
|
+
colormapFunction?: ColormapFunctionType;
|
|
21
21
|
propertyValueRange: [number, number];
|
|
22
22
|
smoothShading: boolean;
|
|
23
23
|
depthTest: boolean;
|
|
@@ -2,9 +2,11 @@ import type { Texture } from "@luma.gl/core";
|
|
|
2
2
|
import type { colorTablesArray, createColorMapFunction as createColormapFunction } from "@emerson-eps/color-tables/";
|
|
3
3
|
import type { DeckGLLayerContext } from "./layerTools";
|
|
4
4
|
/** Type of functions returning a color from a value in the [0,1] range. */
|
|
5
|
-
export type
|
|
6
|
-
/** @deprecated Use
|
|
7
|
-
export type colorMapFunctionType =
|
|
5
|
+
export type ColormapFunctionType = ReturnType<typeof createColormapFunction>;
|
|
6
|
+
/** @deprecated Use ColormapFunctionType instead. */
|
|
7
|
+
export type colorMapFunctionType = ColormapFunctionType;
|
|
8
|
+
/** @deprecated Use ColormapFunctionType instead. */
|
|
9
|
+
export type ColorMapFunctionType = ColormapFunctionType;
|
|
8
10
|
export interface IColormapHints {
|
|
9
11
|
discreteData: boolean;
|
|
10
12
|
colormapSize: number;
|
|
@@ -26,15 +28,15 @@ export interface ColorTableProps {
|
|
|
26
28
|
export interface ColorTableDef extends ColorTableProps {
|
|
27
29
|
colorTables: colorTablesArray;
|
|
28
30
|
}
|
|
29
|
-
export type ColormapProps =
|
|
31
|
+
export type ColormapProps = ColormapFunctionType | Uint8Array | ColorTableProps;
|
|
30
32
|
/**
|
|
31
33
|
* Represents the possible types that can be used as colormap properties.
|
|
32
34
|
*
|
|
33
|
-
* - `
|
|
35
|
+
* - `ColormapFunctionType`: A function converting a value to a color.
|
|
34
36
|
* - `Uint8Array`: A typed array containing color data.
|
|
35
37
|
* - `ColorTableDef`: An object representing a color table.
|
|
36
38
|
*/
|
|
37
|
-
export type TColormapDef =
|
|
39
|
+
export type TColormapDef = ColormapFunctionType | Uint8Array | ColorTableDef;
|
|
38
40
|
/**
|
|
39
41
|
* Creates an array of colors as RGB triplets in range [0, 1] using the colormap definition.
|
|
40
42
|
* @param colormapDef Definition of the colormap.
|
|
@@ -9,7 +9,7 @@ import { createDefaultContinuousColorScale } from "@emerson-eps/color-tables/dis
|
|
|
9
9
|
*/
|
|
10
10
|
export function getImageData(colormapDef, colormapSize = 256, discreteColormapFunction = false) {
|
|
11
11
|
if (colormapDef instanceof Uint8Array) {
|
|
12
|
-
// If
|
|
12
|
+
// If colormapProps is a Uint8Array, return it directly
|
|
13
13
|
return colormapDef;
|
|
14
14
|
}
|
|
15
15
|
const isFunctionDefined = colormapDef !== undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"colormapTools.js","sourceRoot":"","sources":["../../../src/layers/utils/colormapTools.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,iCAAiC,EAAE,MAAM,qEAAqE,CAAC;
|
|
1
|
+
{"version":3,"file":"colormapTools.js","sourceRoot":"","sources":["../../../src/layers/utils/colormapTools.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { CompositeLayer } from "@deck.gl/core";
|
|
|
4
4
|
import type { BinaryFeatureCollection } from "@loaders.gl/schema";
|
|
5
5
|
import type { Feature } from "geojson";
|
|
6
6
|
import type { ReportBoundingBoxAction, ExtendedLayerProps } from "../utils/layerTools";
|
|
7
|
-
import type {
|
|
7
|
+
import type { ColormapFunctionType } from "../utils/colormapTools";
|
|
8
8
|
import type { ContinuousLegendDataType, DiscreteLegendDataType } from "../../components/ColorLegend";
|
|
9
9
|
import type { WellLabelLayerProps } from "./layers/wellLabelLayer";
|
|
10
10
|
import { WellLabelLayer } from "./layers/wellLabelLayer";
|
|
@@ -48,7 +48,7 @@ export interface WellsLayerProps extends ExtendedLayerProps {
|
|
|
48
48
|
*/
|
|
49
49
|
refine: boolean | number;
|
|
50
50
|
wellHeadStyle: WellHeadStyleAccessor;
|
|
51
|
-
colorMappingFunction:
|
|
51
|
+
colorMappingFunction: ColormapFunctionType;
|
|
52
52
|
lineStyle: LineStyleAccessor;
|
|
53
53
|
/**
|
|
54
54
|
* @deprecated use wellLabel instead
|
package/dist/utils/index.d.ts
CHANGED
|
@@ -4,5 +4,7 @@ export type { Point3D } from "./Point3D";
|
|
|
4
4
|
export { add as addPoints3D } from "./Point3D";
|
|
5
5
|
export type { TypedArray, TypedFloatArray, TypedIntArray } from "./typedArray";
|
|
6
6
|
export { isNumberArray, isTypedArray, toTypedArray } from "./typedArray";
|
|
7
|
+
export { loadDataArray } from "./serialize";
|
|
7
8
|
export { proportionalZoom, scaleZoom } from "./camera";
|
|
9
|
+
export { findConfig } from "./configTools";
|
|
8
10
|
export { useScaleFactor } from "./event";
|
package/dist/utils/index.js
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
export { add as addPoints3D } from "./Point3D";
|
|
2
2
|
export { isNumberArray, isTypedArray, toTypedArray } from "./typedArray";
|
|
3
|
+
export { loadDataArray } from "./serialize";
|
|
3
4
|
export { proportionalZoom, scaleZoom } from "./camera";
|
|
5
|
+
export { findConfig } from "./configTools";
|
|
4
6
|
export { useScaleFactor } from "./event";
|
|
5
7
|
//# sourceMappingURL=index.js.map
|
package/dist/utils/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,GAAG,IAAI,WAAW,EAAE,MAAM,WAAW,CAAC;AAG/C,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEzE,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAEvD,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,GAAG,IAAI,WAAW,EAAE,MAAM,WAAW,CAAC;AAG/C,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEzE,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAEvD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC"}
|
|
@@ -1,20 +1,14 @@
|
|
|
1
|
+
import type { TConstructor, TypedArray } from "./typedArray";
|
|
1
2
|
/**
|
|
2
|
-
* Loads data
|
|
3
|
-
*
|
|
4
|
-
*
|
|
3
|
+
* Loads data as a typed array from a string (URL), number array, or any typed array.
|
|
4
|
+
* If the input is a URL, it loads the data from the URL. Supports binary float32 files,
|
|
5
|
+
* PNG images (with absolute float values) and json files storing number arrays.
|
|
5
6
|
*
|
|
6
|
-
* @param
|
|
7
|
-
* @
|
|
7
|
+
* @param data - The data to load (string URL, base 64 encoded string, number[], or any typed array like Float32Array)
|
|
8
|
+
* @param type - The targeted TypedArray type (e.g., any typed array like Float32Array)
|
|
9
|
+
* @returns A Promise resolving to the targeted TypedArray or null if input is invalid
|
|
8
10
|
*/
|
|
9
|
-
export declare function
|
|
10
|
-
/**
|
|
11
|
-
* Loads data as a Float32Array from a string (URL), number array, or Float32Array.
|
|
12
|
-
* If the input is a URL, it loads the data from the URL. If it's an array, it converts it.
|
|
13
|
-
*
|
|
14
|
-
* @param data - The data to load (string URL, number[], or Float32Array)
|
|
15
|
-
* @returns A Promise resolving to a Float32Array or null if input is invalid
|
|
16
|
-
*/
|
|
17
|
-
export declare function loadFloat32Data(data: string | number[] | Float32Array): Promise<Float32Array | null>;
|
|
11
|
+
export declare function loadDataArray<T extends TypedArray>(data: string | number[] | TypedArray, type: TConstructor<T>): Promise<T | null>;
|
|
18
12
|
/**
|
|
19
13
|
* For debugging: triggers a download of a Float32Array as a binary file named 'propertiesData.bin'.
|
|
20
14
|
*
|
package/dist/utils/serialize.js
CHANGED
|
@@ -8,76 +8,97 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
10
|
import * as png from "@vivaxy/png";
|
|
11
|
+
import { JSONLoader, load } from "@loaders.gl/core";
|
|
12
|
+
import { toTypedArray } from "./typedArray";
|
|
13
|
+
function safeFetch(url) {
|
|
14
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
15
|
+
try {
|
|
16
|
+
return yield fetch(url);
|
|
17
|
+
}
|
|
18
|
+
catch (error) {
|
|
19
|
+
console.error(`Failed to fetch ${url}:`, error);
|
|
20
|
+
return new Response(null, { status: 500 });
|
|
21
|
+
}
|
|
22
|
+
});
|
|
23
|
+
}
|
|
11
24
|
/**
|
|
12
|
-
* Loads
|
|
13
|
-
* and
|
|
14
|
-
*
|
|
25
|
+
* Loads PNG image data (with absolute float values) from a Response object
|
|
26
|
+
* and decodes it into a typed array of the specified type.
|
|
27
|
+
*
|
|
28
|
+
* This function reads the response as a Blob, decodes the PNG image data, and converts the pixel data
|
|
29
|
+
* into a typed array (e.g., Float32Array, Uint8Array) using the provided constructor.
|
|
15
30
|
*
|
|
16
|
-
* @
|
|
17
|
-
* @
|
|
31
|
+
* @template T - The type of TypedArray to return (e.g., Float32Array, Uint8Array).
|
|
32
|
+
* @param response - The Response object containing the PNG image data.
|
|
33
|
+
* @param type - The constructor for the desired TypedArray type.
|
|
34
|
+
* @returns A promise that resolves to a typed array containing the decoded image data, or null if decoding fails.
|
|
18
35
|
*/
|
|
19
|
-
|
|
36
|
+
function loadPngData(response, type) {
|
|
20
37
|
return __awaiter(this, void 0, void 0, function* () {
|
|
21
|
-
|
|
22
|
-
const response = yield fetch(url);
|
|
23
|
-
if (!response.ok) {
|
|
24
|
-
console.error("Could not load ", url);
|
|
25
|
-
}
|
|
38
|
+
// Load as PNG with absolute float values.
|
|
26
39
|
const blob = yield response.blob();
|
|
27
|
-
const
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
const
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
resolve(floatArray);
|
|
46
|
-
};
|
|
47
|
-
});
|
|
48
|
-
}
|
|
49
|
-
else {
|
|
50
|
-
// Load as binary array of floats.
|
|
51
|
-
const buffer = yield blob.arrayBuffer();
|
|
52
|
-
res = new Float32Array(buffer);
|
|
53
|
-
}
|
|
54
|
-
return res;
|
|
40
|
+
const result = yield new Promise((resolve) => {
|
|
41
|
+
const fileReader = new FileReader();
|
|
42
|
+
fileReader.readAsArrayBuffer(blob);
|
|
43
|
+
fileReader.onload = () => {
|
|
44
|
+
const arrayBuffer = fileReader.result;
|
|
45
|
+
const imgData = png.decode(arrayBuffer);
|
|
46
|
+
const data = imgData.data; // array of ints (pixel data)
|
|
47
|
+
const n = data.length;
|
|
48
|
+
const buffer = new ArrayBuffer(n);
|
|
49
|
+
const view = new DataView(buffer);
|
|
50
|
+
for (let i = 0; i < n; i++) {
|
|
51
|
+
view.setUint8(i, data[i]);
|
|
52
|
+
}
|
|
53
|
+
const floatArray = new type(buffer);
|
|
54
|
+
resolve(floatArray);
|
|
55
|
+
};
|
|
56
|
+
});
|
|
57
|
+
return result;
|
|
55
58
|
});
|
|
56
59
|
}
|
|
60
|
+
function isPngData(headers) {
|
|
61
|
+
const contentType = headers.get("content-type");
|
|
62
|
+
return contentType === "image/png";
|
|
63
|
+
}
|
|
57
64
|
/**
|
|
58
|
-
* Loads data as a
|
|
59
|
-
* If the input is a URL, it loads the data from the URL.
|
|
65
|
+
* Loads data as a typed array from a string (URL), number array, or any typed array.
|
|
66
|
+
* If the input is a URL, it loads the data from the URL. Supports binary float32 files,
|
|
67
|
+
* PNG images (with absolute float values) and json files storing number arrays.
|
|
60
68
|
*
|
|
61
|
-
* @param data - The data to load (string URL, number[], or Float32Array)
|
|
62
|
-
* @
|
|
69
|
+
* @param data - The data to load (string URL, base 64 encoded string, number[], or any typed array like Float32Array)
|
|
70
|
+
* @param type - The targeted TypedArray type (e.g., any typed array like Float32Array)
|
|
71
|
+
* @returns A Promise resolving to the targeted TypedArray or null if input is invalid
|
|
63
72
|
*/
|
|
64
|
-
export function
|
|
73
|
+
export function loadDataArray(data, type) {
|
|
65
74
|
return __awaiter(this, void 0, void 0, function* () {
|
|
75
|
+
var _a;
|
|
66
76
|
if (!data) {
|
|
67
77
|
return null;
|
|
68
78
|
}
|
|
69
|
-
if (
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
79
|
+
if (typeof data === "string") {
|
|
80
|
+
const extension = (_a = data.split(".").pop()) === null || _a === void 0 ? void 0 : _a.toLowerCase();
|
|
81
|
+
// Data is a file name with .json extension
|
|
82
|
+
if (extension === "json") {
|
|
83
|
+
const stringData = yield load(data, JSONLoader);
|
|
84
|
+
return new type(stringData);
|
|
85
|
+
}
|
|
86
|
+
// It is assumed that the data is a file containing raw array of bytes.
|
|
87
|
+
const response = yield safeFetch(data);
|
|
88
|
+
if (!response.ok) {
|
|
89
|
+
return null;
|
|
90
|
+
}
|
|
91
|
+
if (isPngData(response.headers)) {
|
|
92
|
+
return yield loadPngData(response, type);
|
|
93
|
+
}
|
|
94
|
+
const blob = yield response.blob();
|
|
95
|
+
const buffer = yield blob.arrayBuffer();
|
|
96
|
+
return new type(buffer);
|
|
76
97
|
}
|
|
77
98
|
else {
|
|
78
|
-
|
|
79
|
-
return yield loadURLData(data);
|
|
99
|
+
return toTypedArray(data, type);
|
|
80
100
|
}
|
|
101
|
+
return Promise.reject("loadDataArray: unsupported type of input data");
|
|
81
102
|
});
|
|
82
103
|
}
|
|
83
104
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serialize.js","sourceRoot":"","sources":["../../src/utils/serialize.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AAEnC
|
|
1
|
+
{"version":3,"file":"serialize.js","sourceRoot":"","sources":["../../src/utils/serialize.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,8 +37,8 @@ export type TConstructor<T> = new (...args: any) => T;
|
|
|
37
37
|
* Converts a number[] or TypedArray to a specific TypedArray type.
|
|
38
38
|
* If the input is already of the correct type, it is returned as-is.
|
|
39
39
|
*
|
|
40
|
-
* @param constructor - The TypedArray constructor (e.g., Float32Array)
|
|
41
40
|
* @param data - The input data (number[] or TypedArray)
|
|
41
|
+
* @param type - The targeted TypedArray (e.g., Float32Array)
|
|
42
42
|
* @returns The data as the specified TypedArray type
|
|
43
43
|
*/
|
|
44
|
-
export declare function toTypedArray<T extends TypedArray>(
|
|
44
|
+
export declare function toTypedArray<T extends TypedArray>(data: TypedArray | number[], type: TConstructor<T>): T;
|
package/dist/utils/typedArray.js
CHANGED
|
@@ -26,17 +26,14 @@ export function isNumberArray(value) {
|
|
|
26
26
|
* Converts a number[] or TypedArray to a specific TypedArray type.
|
|
27
27
|
* If the input is already of the correct type, it is returned as-is.
|
|
28
28
|
*
|
|
29
|
-
* @param constructor - The TypedArray constructor (e.g., Float32Array)
|
|
30
29
|
* @param data - The input data (number[] or TypedArray)
|
|
30
|
+
* @param type - The targeted TypedArray (e.g., Float32Array)
|
|
31
31
|
* @returns The data as the specified TypedArray type
|
|
32
32
|
*/
|
|
33
|
-
export function toTypedArray(
|
|
34
|
-
if (
|
|
33
|
+
export function toTypedArray(data, type) {
|
|
34
|
+
if (data instanceof type) {
|
|
35
35
|
return data;
|
|
36
36
|
}
|
|
37
|
-
|
|
38
|
-
return data;
|
|
39
|
-
}
|
|
40
|
-
return new constructor(data);
|
|
37
|
+
return new type(data);
|
|
41
38
|
}
|
|
42
39
|
//# sourceMappingURL=typedArray.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typedArray.js","sourceRoot":"","sources":["../../src/utils/typedArray.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAwBH;;GAEG;AACH,MAAM,UAAU,YAAY,CAAC,KAAc;IACvC,OAAO,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,YAAY,QAAQ,CAAC,CAAC;AACrE,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,aAAa,CAAC,KAAc;IACxC,OAAO,CACH,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QACpB,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,CACvD,CAAC;AACN,CAAC;AAQD;;;;;;;GAOG;AACH,MAAM,UAAU,YAAY,CACxB,
|
|
1
|
+
{"version":3,"file":"typedArray.js","sourceRoot":"","sources":["../../src/utils/typedArray.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAwBH;;GAEG;AACH,MAAM,UAAU,YAAY,CAAC,KAAc;IACvC,OAAO,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,YAAY,QAAQ,CAAC,CAAC;AACrE,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,aAAa,CAAC,KAAc;IACxC,OAAO,CACH,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QACpB,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,CACvD,CAAC;AACN,CAAC;AAQD;;;;;;;GAOG;AACH,MAAM,UAAU,YAAY,CACxB,IAA2B,EAC3B,IAAqB;IAErB,IAAI,IAAI,YAAY,IAAI,EAAE,CAAC;QACvB,OAAO,IAAS,CAAC;IACrB,CAAC;IACD,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC"}
|