@mapcatch/util 2.0.4 → 2.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mapcatch/util",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "main": "./dist/catchUtil.min.esm.js",
   "repository": "",
   "author": "wanyanyan",
@@ -17,6 +17,26 @@
     "src/**/*.js": "yarn lint"
   },
   "dependencies": {
+    "@turf/turf": "^7.1.0",
+    "@xmldom/xmldom": "^0.9.2",
+    "cdt2d": "^1.0.0",
+    "eslint": "8.22.0",
+    "gl-matrix": "^3.4.3",
+    "glsl-float-to-rgba": "^1.0.0",
+    "glsl-rgba-to-float": "^1.0.0",
+    "lodash": "^4.17.21",
+    "mapbox-gl": "^3.6.0",
+    "mathjs": "12.3.0",
+    "moment": "^2.29.4",
+    "pbf": "3.2.1",
+    "proj4": "^2.12.1",
+    "protocol-buffers-schema": "^3.6.0",
+    "regl": "^2.1.0",
+    "satellite-geo-calc": "^0.0.7",
+    "spark-md5": "^3.0.2",
+    "svg-path-commander": "2.0.9",
+    "upng-js": "^2.1.0",
+    "uuid": "^9.0.0"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",

package/src/constants/default_layers.js

@@ -7,7 +7,9 @@ export default [
     opacity: 1,
     class: 'image2d',
     metadata: {
-      folder: 'dom_tiles'
+      folder: 'dom_tiles',
+      show_annotations: true,
+      show_annotation_labels: true
     }
   },
   {
@@ -18,7 +20,11 @@ export default [
     opacity: 1,
     class: 'tmp',
     metadata: {
-      folder: 'tem_tiles'
+      folder: 'tem_tiles',
+      borderStyle: 'transparent',
+      colorType: 'turbo',
+      show_annotations: true,
+      show_annotation_labels: true
     }
   },
   {
@@ -31,7 +37,9 @@ export default [
     metadata: {
       folder: 'dsm_tiles',
       borderStyle: 'transparent',
-      colorType: 'turbo'
+      colorType: 'turbo',
+      show_annotations: true,
+      show_annotation_labels: true
     }
   },
   {
@@ -59,22 +67,24 @@ export default [
     class: 'photos'
   },
   {
-    type: 'bndvi',
-    name: '植被指数（BNDVI）',
+    type: 'ndvi',
+    name: 'NDVI',
     group: 'index',
     visible: true,
     opacity: 1,
-    class: 'bndvi',
+    class: 'ndvi',
     metadata: {
-      folder: 'bndvi_tiles',
+      folder: 'ndvi_tiles',
       borderStyle: 'transparent',
       colorType: 'red-green',
-      bands: ['NIR', 'Blue']
+      bands: ['NIR', 'Red'],
+      show_annotations: true,
+      show_annotation_labels: true
     }
   },
   {
     type: 'gndvi',
-    name: '植被指数（GNDVI）',
+    name: 'GNDVI',
     group: 'index',
     visible: true,
     opacity: 1,
@@ -82,13 +92,15 @@ export default [
     metadata: {
       folder: 'gndvi_tiles',
       borderStyle: 'transparent',
-      colorType: 'red-green',
-      bands: ['NIR', 'Green']
+      colorType: 'glow',
+      bands: ['NIR', 'Green'],
+      show_annotations: true,
+      show_annotation_labels: true
     }
   },
   {
     type: 'lci',
-    name: '植被指数（LCI）',
+    name: 'LCI',
     group: 'index',
     visible: true,
     opacity: 1,
@@ -96,27 +108,15 @@ export default [
     metadata: {
       folder: 'lci_tiles',
       borderStyle: 'transparent',
-      colorType: 'glow',
-      bands: ['NIR', 'RedEdge', 'Red']
-    }
-  },
-  {
-    type: 'mcari',
-    name: '植被指数（MCARI）',
-    group: 'index',
-    visible: true,
-    opacity: 1,
-    class: 'mcari',
-    metadata: {
-      folder: 'mcari_tiles',
-      borderStyle: 'transparent',
       colorType: 'turbo',
-      bands: ['NIR', 'Red', 'Green']
+      bands: ['NIR', 'RedEdge', 'Red'],
+      show_annotations: true,
+      show_annotation_labels: true
     }
   },
   {
     type: 'ndre',
-    name: '植被指数（NDRE）',
+    name: 'NDRE',
     group: 'index',
     visible: true,
     opacity: 1,
@@ -124,78 +124,26 @@ export default [
     metadata: {
       folder: 'ndre_tiles',
       borderStyle: 'transparent',
-      colorType: 'red-green',
-      bands: ['NIR', 'RedEdge']
+      colorType: 'gray',
+      bands: ['NIR', 'RedEdge'],
+      show_annotations: true,
+      show_annotation_labels: true
     }
   },
   {
-    type: 'ndvi',
-    name: '植被指数（NDVI）',
+    type: 'osavi',
+    name: 'OSAVI',
     group: 'index',
     visible: true,
     opacity: 1,
-    class: 'ndvi',
+    class: 'osavi',
     metadata: {
-      folder: 'ndvi_tiles',
+      folder: 'osavi_tiles',
       borderStyle: 'transparent',
       colorType: 'red-green',
-      bands: ['NIR', 'Red']
-    }
-  },
-  {
-    type: 'sipi2',
-    name: '植被指数（SIPI2）',
-    group: 'index',
-    visible: true,
-    opacity: 1,
-    class: 'sipi2',
-    metadata: {
-      folder: 'sipi2_tiles',
-      borderStyle: 'transparent',
-      colorType: 'glow',
-      bands: ['NIR', 'Green']
-    }
-  },
-  {
-    type: 'tgi',
-    name: '植被指数（TGI）',
-    group: 'index',
-    visible: true,
-    opacity: 1,
-    class: 'tgi',
-    metadata: {
-      folder: 'tgi_tiles',
-      borderStyle: 'transparent',
-      colorType: 'turbo',
-      bands: ['Red', 'Green', 'Blue']
-    }
-  },
-  {
-    type: 'vari',
-    name: '植被指数（VARI）',
-    group: 'index',
-    visible: true,
-    opacity: 1,
-    class: 'vari',
-    metadata: {
-      folder: 'vari_tiles',
-      borderStyle: 'transparent',
-      colorType: 'red-green',
-      bands: ['Red', 'Green', 'Blue']
-    }
-  },
-  {
-    type: 'ndmi',
-    name: '植被指数（NDMI）',
-    group: 'index',
-    visible: true,
-    opacity: 1,
-    class: 'ndmi',
-    metadata: {
-      folder: 'ndmi_tiles',
-      borderStyle: 'transparent',
-      colorType: 'glow',
-      bands: ['NIR', 'SWIR_1613', 'Blue']
+      bands: ['NIR', 'Red'],
+      show_annotations: true,
+      show_annotation_labels: true
     }
   }
 ]

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)
+      })
     })
   })
 }