@mapcatch/util 2.0.3 → 2.0.4

package/src/gl-operations/shaders/fragment/single.js

@@ -32,6 +32,9 @@ uniform float deg2rad;
 uniform float azimuth;
 uniform float altitude;
 
+uniform vec4 aboveColor;
+uniform vec4 belowColor;
+
 float getRelativeHeight(vec2 pos, float v, vec4 textureBounds) {
   float pixelFloatValue = getTexelValue(texture, pos, littleEndian);
   float test = step(0.0, pixelFloatValue);
@@ -76,7 +79,9 @@ void main() {
     sentinelColormap,
     scaleLength,
     sentinelLength,
-    littleEndian
+    littleEndian,
+    aboveColor,
+    belowColor
   );
 
   if (enableSimpleHillshade) {

package/src/gl-operations/shaders/util/computeColor.glsl

@@ -19,7 +19,9 @@ vec4 computeColor(
   sampler2D sentinelColormap,
   int scaleLength,
   int sentinelLength,
-  bool littleEndian
+  bool littleEndian,
+  vec4 aboveColor,
+  vec4 belowColor
 ) {
 
   // vertical texture coordinate to find color and offset
@@ -44,16 +46,15 @@ vec4 computeColor(
       }
     }
   }
-
   // Do linear interpolation using the color scale, if defined.
   if (scaleLength > 0) {
     // If value below color scale range, clamp to lowest color stop.
     float scaleOffsetLowest = getTexelValue(scaleColormap, vec2(0.0, offsetRow), littleEndian);
     float scaleOffsetHighest = getTexelValue(scaleColormap, vec2(1.0, offsetRow), littleEndian);
     if (inputVal < scaleOffsetLowest) {
-      return texture2D(scaleColormap, vec2(0.0, colorRow));
+      return belowColor;
     } else if (inputVal > scaleOffsetHighest) {
-      return texture2D(scaleColormap, vec2(1.0, colorRow));
+      return aboveColor;
     } else {
       for (int i = 0; i < SCALE_MAX_LENGTH; ++i) {
         float i_f = float(i);

package/src/measure/index.js

@@ -160,19 +160,14 @@ class Measurement {
 
     while (!triangles.length && projs.length) { // 寻找可成功分解的投影平面
       flatCoordinates = projs.shift()
-      flatCoordinates.pop() // 去掉最后一个重复的点
+      flatCoordinates = this._reduceCoordinates(flatCoordinates)
       let edges = []
       flatCoordinates.forEach((coord, index) => {
-        let edge = null
         if (index === flatCoordinates.length - 1) {
-          edge = [index, 0]
+          edges.push([index, 0])
         } else {
-          edge = [index, index + 1]
+          edges.push([index, index + 1])
         }
-        if (_.isEqual(flatCoordinates[edge[0]], flatCoordinates[edge[1]])) {
-          return
-        }
-        edges.push(edge)
       })
       triangles = cdt2d(flatCoordinates, edges, { exterior: false })
     }
@@ -198,6 +193,17 @@ class Measurement {
     let c = this.getDistance3D([p3, p1])
     return Math.sqrt((a + b + c) * (a + b - c) * (a + c - b) * (b + c - a)) / 4
   }
+
+  _reduceCoordinates (coords) { // 去重
+    for(let i = 0;i < coords.length; i++) {
+      let nextIndex = i === coords.length - 1 ? 0 : (i + 1)
+      if (_.isEqual(coords[i], coords[nextIndex])) {
+        coords.splice(i, 1)
+        i--
+      }
+    }
+    return coords
+  }
 }
 
 export default Measurement

package/src/transform.js

@@ -11,6 +11,9 @@ import { crsList, crsTypes } from './constants'
 export function getWKTString (crs) {
   let {type, epsg_code} = crs
   for(let i = 0;i < crsList.length;i++) {
+    if (!crsTypes[crsList[i].type]) {
+      continue
+    }
     let typeCode = crsTypes[crsList[i].type].code
     if (typeCode !== type) {
       continue