@gisatcz/deckgl-geolib 1.11.2-dev.0 → 1.12.0-dev.0

package/dist/cjs/index.js

@@ -14766,6 +14766,7 @@ const DefaultGeoImageOptions = {
     colorClasses: null,
     alpha: 100,
     useChannel: null,
+    useChannelIndex: null,
     noDataValue: undefined,
     numOfChannels: undefined,
     nullColor: [0, 0, 0, 0],
@@ -14804,6 +14805,7 @@ class GeoImage {
     }
     // GetHeightmap uses only "useChannel" and "multiplier" options
     getHeightmap(input, options, meshMaxError) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             let rasters = [];
             let width;
@@ -14821,15 +14823,17 @@ class GeoImage {
                 width = input.width;
                 height = input.height;
             }
+            const optionsLocal = Object.assign({}, options);
             let channel = rasters[0];
-            if (options.useChannel != null) {
-                if (rasters[options.useChannel]) {
-                    channel = rasters[options.useChannel]; // length = 65536
+            (_a = optionsLocal.useChannelIndex) !== null && _a !== void 0 ? _a : (optionsLocal.useChannelIndex = optionsLocal.useChannel == null ? null : optionsLocal.useChannel - 1);
+            if (options.useChannelIndex != null) {
+                if (rasters[optionsLocal.useChannelIndex]) {
+                    channel = rasters[optionsLocal.useChannelIndex];
                 }
             }
             const terrain = new Float32Array((width + 1) * (height + 1));
             const numOfChannels = channel.length / (width * height);
-            let pixel = options.useChannel === null ? 0 : options.useChannel;
+            let pixel = options.useChannelIndex === null ? 0 : options.useChannelIndex;
             for (let i = 0, y = 0; y < height; y++) {
                 for (let x = 0; x < width; x++, i++) {
                     const elevationValue = (options.noDataValue && channel[pixel] === options.noDataValue) ? options.terrainMinValue : channel[pixel] * options.multiplier;
@@ -14900,6 +14904,7 @@ class GeoImage {
         });
     }
     getBitmap(input, options) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             // console.time('bitmap-generated-in');
             // const optionsLocal = { ...options };
@@ -14941,13 +14946,14 @@ class GeoImage {
             optionsLocal.nullColor = this.getColorFromChromaType(optionsLocal.nullColor);
             optionsLocal.clippedColor = this.getColorFromChromaType(optionsLocal.clippedColor);
             optionsLocal.color = this.getColorFromChromaType(optionsLocal.color);
+            (_a = optionsLocal.useChannelIndex) !== null && _a !== void 0 ? _a : (optionsLocal.useChannelIndex = options.useChannel === null ? null : options.useChannel - 1);
             // console.log(rasters[0])
             /* console.log("raster 0 length: " + rasters[0].length)
             console.log("image width: " + width)
             console.log("channels: " + channels)
             console.log("format: " + rasters[0].length / (width * height))
             */
-            if (optionsLocal.useChannel == null) {
+            if (optionsLocal.useChannelIndex == null) {
                 if (channels === 1) {
                     if (rasters[0].length / (width * height) === 1) {
                         const channel = rasters[0];
@@ -15014,10 +15020,10 @@ class GeoImage {
                     }
                 }
             }
-            else if (optionsLocal.useChannel <= optionsLocal.numOfChannels) {
+            else if (optionsLocal.useChannelIndex < optionsLocal.numOfChannels && optionsLocal.useChannelIndex >= 0) {
                 let channel = rasters[0];
-                if (rasters[optionsLocal.useChannel]) {
-                    channel = rasters[optionsLocal.useChannel];
+                if (rasters[optionsLocal.useChannelIndex]) {
+                    channel = rasters[optionsLocal.useChannelIndex];
                 }
                 // AUTO RANGE
                 if (optionsLocal.useAutoRange) {
@@ -15031,8 +15037,8 @@ class GeoImage {
                 });
             }
             else {
-                // if user defined channel does not exist --> return greyscale image
-                console.log('Defined channel does not exist, displaying only grey values');
+                // if user defined channel does not exist
+                console.log(`Defined channel(${options.useChannel}) or channel index(${options.useChannelIndex}) does not exist, choose a different channel or set the useChannel property to null if you want to visualize RGB(A) imagery`);
                 const defaultColorData = this.getDefaultColor(size, optionsLocal.nullColor);
                 defaultColorData.forEach((value, index) => {
                     imageData.data[index] = value;
@@ -15060,7 +15066,8 @@ class GeoImage {
     }
     getColorValue(dataArray, options, arrayLength, numOfChannels = 1) {
         const colorScale = chroma.scale(options.colorScale).domain(options.colorScaleValueRange);
-        let pixel = options.useChannel === null ? 0 : options.useChannel;
+        // channel index is equal to channel number - 1
+        let pixel = options.useChannelIndex === null ? 0 : options.useChannelIndex;
         const colorsArray = new Array(arrayLength);
         // if useColorsBasedOnValues is true
         const dataValues = options.colorsBasedOnValues ? options.colorsBasedOnValues.map(([first]) => first) : undefined;
@@ -15214,8 +15221,8 @@ function getDelatinTileMesh(meshMaxError, width, height, terrain) {
     return { vertices, triangles };
 }
 
-const EARTH_CIRCUMFERENCE = 40075000.0;
-const EARTH_HALF_CIRCUMFERENCE = 20037500.0;
+const EARTH_CIRCUMFERENCE = 2 * Math.PI * 6378137;
+const EARTH_HALF_CIRCUMFERENCE = EARTH_CIRCUMFERENCE / 2;
 const CogTilesGeoImageOptionsDefaults = {
     blurredTexture: true,
 };