@mapcatch/util 2.0.3 → 2.0.5

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

package/src/util.js

@@ -370,12 +370,20 @@ export function getLineLabelFeature (lineFeature) {
  * @param {*} icons 要添加的图标列表，包含图标的url以及是否作为sdf符号
  */
 export function addIcons2Map (map, icons) {
-  icons.forEach(({url, sdf}) => {
-    map.loadImage(url, (error, image) => {
-      let iconName = url.split('/').pop().split('.')[0]
-      if(map.hasImage(iconName)) return
-      if (error) throw error
-      map.addImage(iconName, image, {sdf})
+  return new Promise((resolve, reject) => {
+    let cnt = icons.length
+    icons.forEach(({url, sdf}) => {
+      map.loadImage(url, (error, image) => {
+        cnt--
+        let iconName = url.split('/').pop().split('.')[0]
+        if(map.hasImage(iconName)) return
+        if (error) {
+          reject(error)
+          return
+        }
+        map.addImage(iconName, image, {sdf})
+        if (cnt <= 0) resolve(true)
+      })
     })
   })
 }