@mapcatch/util 2.2.1 → 2.2.2

package/dist/catchUtil.min.esm.js

@@ -10949,46 +10949,28 @@ layerGroups.forEach((e) => {
     enumerable: !0
   });
 });
-const bmap_types = {
+const tk = "faefd6f11b36b9900c352bcceae49b65", resourceTdt = (e) => ({
+  type: "raster",
+  tileSize: 256,
+  tiles: [`https://t0.tianditu.gov.cn/${e}/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=${e.split("_")[0]}&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}&tk=${tk}`],
+  maxzoom: 18,
+  layerType: "bmap"
+}), bmap_types = {
   tdt: [
     {
       type: "image",
       img: "satellite",
       items: [
-        {
-          type: "raster",
-          tileSize: 256,
-          tiles: ["https://t0.tianditu.gov.cn/DataServer?T=img_w&x={x}&y={y}&l={z}&tk=faefd6f11b36b9900c352bcceae49b65"],
-          maxzoom: 18,
-          layerType: "bmap"
-        },
-        {
-          type: "raster",
-          tileSize: 256,
-          tiles: ["https://t0.tianditu.gov.cn/DataServer?T=cia_w&x={x}&y={y}&l={z}&tk=faefd6f11b36b9900c352bcceae49b65"],
-          maxzoom: 18,
-          layerType: "bmap"
-        }
+        resourceTdt("img_w"),
+        resourceTdt("cia_w")
       ]
     },
     {
       type: "vector_standard",
       img: "vector_standard",
       items: [
-        {
-          type: "raster",
-          tileSize: 256,
-          tiles: ["https://t0.tianditu.gov.cn/DataServer?T=vec_w&x={x}&y={y}&l={z}&tk=faefd6f11b36b9900c352bcceae49b65"],
-          maxzoom: 18,
-          layerType: "bmap"
-        },
-        {
-          type: "raster",
-          tileSize: 256,
-          tiles: ["https://t0.tianditu.gov.cn/DataServer?T=cva_w&x={x}&y={y}&l={z}&tk=faefd6f11b36b9900c352bcceae49b65"],
-          maxzoom: 18,
-          layerType: "bmap"
-        }
+        resourceTdt("vec_w"),
+        resourceTdt("cva_w")
       ]
     }
   ],
@@ -62054,13 +62036,13 @@ function endsWith(e, r) {
   return e.indexOf(r, e.length - r.length) !== -1;
 }
 function convertLength(e, r) {
-  return r === "m" ? e : r === "ft" ? e * 3.28084 : e;
+  return r === "m" ? e : r === "ft" ? e * 3.28084 : r === "usft" ? e * 3.280833333 : e;
 }
 function convertArea(e, r) {
-  return r === "m2" ? e : r === "km2" ? e / 1e6 : r === "mu" ? e / 666.6667 : r === "hm2" ? e / 1e4 : e;
+  return r === "m2" ? e : r === "km2" ? e / 1e6 : r === "mu" ? e / 666.6667 : r === "hm2" ? e / 1e4 : r === "ft2" ? e / 10.763910416709722 : r === "usft2" ? e / 10.763867361111112 : e;
 }
 function convertVolume(e, r) {
-  return r === "m3" ? e : r === "yd3" ? e * 1.30795062 : r === "ft3" ? e * 35.3146667 : r === "usft3" ? e * 35.3147248 : e;
+  return r === "m3" ? e : r === "yd3" ? e * 1.30795062 : r === "ft3" ? e * 35.31466672148859 : r === "usft3" ? e * 35.31472482766484 : e;
 }
 let clickPoint = null;
 function _addEventListener(e, r, s) {
@@ -85415,9 +85397,15 @@ function getCameras(e) {
     {
       title: "P2",
       key: "p2"
+    },
+    {
+      title: "K4",
+      key: "k4"
     }
   ];
   return r.forEach((H) => {
+    H.camera_model = H?.camera_model ?? 0;
+    let x = H.camera_model ? m.toSpliced(7, 2) : m.toSpliced(9);
     u.push({
       cameraId: H.id,
       forms: [
@@ -85438,8 +85426,8 @@ function getCameras(e) {
           value: `${H.width} \xD7 ${H.height}`
         }
       ],
-      calibrationCols: m,
-      calibrationData: getCameraCalibrationData(H.id, r, s, m)
+      calibrationCols: x,
+      calibrationData: getCameraCalibrationData(H.id, r, s, x)
     });
   }), u;
 }
@@ -85447,6 +85435,7 @@ function getCameraCalibrationData(e, r, s, u) {
   let m = [i18n.t("report.before_calib"), i18n.t("report.after_calib"), i18n.t("report.diff_val")].map((o) => ({ name: o })), H = s.find((o) => o.id === e), x = r.find((o) => o.id === e);
   if (!H || !x)
     return m;
+  H.parameters.length > x.parameters.length && H.parameters.splice(1, 1);
   for (let o = 0; o < u.length - 1; o++) {
     let F = o > 5 ? 6 : 4;
     m[0][u[o + 1].key] = _$1.round(H.parameters[o], F), m[1][u[o + 1].key] = _$1.round(x.parameters[o], F), m[2][u[o + 1].key] = _$1.round(x.parameters[o] - H.parameters[o], F);