@fleet-frontend/mower-maps 0.2.5-beta.17 → 0.2.5-beta.18

package/dist/index.esm.js

@@ -30175,7 +30175,7 @@ MowerMapRenderer.displayName = 'MowerMapRenderer';
 
 // 默认配置
 const defaultMapConfig = DEFAULT_STYLES;
-const BoundarySvgRender = React__default.memo(({ mapJson, unStructMapData, id, maxWidth = 300, mapConfig, sn }) => {
+const BoundarySvgRender = React__default.memo(({ mapJson, unStructMapData, id, maxWidth = 300, maxHeight, boundaryPadding = 50, mapConfig, sn }) => {
     // 合并配置
     const mergedMapConfig = useMemo(() => {
         return merge$1(defaultMapConfig, mapConfig);
@@ -30221,7 +30221,7 @@ const BoundarySvgRender = React__default.memo(({ mapJson, unStructMapData, id, m
             maxY = Math.max(maxY, point[1]);
         });
         // 添加边距
-        const padding = 50;
+        const padding = boundaryPadding;
         const width = maxX - minX + padding * 2;
         const height = maxY - minY + padding * 2;
         return {
@@ -30230,7 +30230,7 @@ const BoundarySvgRender = React__default.memo(({ mapJson, unStructMapData, id, m
             width,
             height,
         };
-    }, [boundaryInfo]);
+    }, [boundaryInfo, boundaryPadding]);
     const commonValue = useMemo(() => {
         return {
             sn,
@@ -30238,17 +30238,31 @@ const BoundarySvgRender = React__default.memo(({ mapJson, unStructMapData, id, m
         };
     }, [sn, boundaryViewBox]);
     const style = useMemo(() => {
-        if (boundaryViewBox?.width > boundaryViewBox?.height) {
+        if (!maxHeight) {
+            if (boundaryViewBox?.width > boundaryViewBox?.height) {
+                return {
+                    width: maxWidth,
+                    height: maxWidth * (boundaryViewBox.height / boundaryViewBox.width),
+                };
+            }
+            return {
+                width: maxWidth * (boundaryViewBox.width / boundaryViewBox.height),
+                height: maxWidth,
+            };
+        }
+        const ratio = maxWidth / maxHeight;
+        const boundaryRatio = boundaryViewBox.width / boundaryViewBox.height;
+        if (ratio > boundaryRatio) {
             return {
-                width: maxWidth,
-                height: maxWidth * (boundaryViewBox.height / boundaryViewBox.width),
+                width: Math.floor(maxHeight * boundaryRatio),
+                height: maxHeight,
             };
         }
         return {
-            width: maxWidth * (boundaryViewBox.width / boundaryViewBox.height),
-            height: maxWidth,
+            width: maxWidth,
+            height: Math.floor(maxWidth / boundaryRatio),
         };
-    }, [boundaryViewBox, maxWidth]);
+    }, [boundaryViewBox, maxWidth, maxHeight]);
     return (jsx(CommonContextProvider, { value: commonValue, children: jsx(SvgEditContextProvider, { value: svgEditValue, children: jsxs("div", { style: {
                     position: 'relative',
                     width: style.width,

package/dist/index.js

@@ -30195,7 +30195,7 @@ MowerMapRenderer.displayName = 'MowerMapRenderer';
 
 // 默认配置
 const defaultMapConfig = DEFAULT_STYLES;
-const BoundarySvgRender = React.memo(({ mapJson, unStructMapData, id, maxWidth = 300, mapConfig, sn }) => {
+const BoundarySvgRender = React.memo(({ mapJson, unStructMapData, id, maxWidth = 300, maxHeight, boundaryPadding = 50, mapConfig, sn }) => {
     // 合并配置
     const mergedMapConfig = React.useMemo(() => {
         return merge$1(defaultMapConfig, mapConfig);
@@ -30241,7 +30241,7 @@ const BoundarySvgRender = React.memo(({ mapJson, unStructMapData, id, maxWidth =
             maxY = Math.max(maxY, point[1]);
         });
         // 添加边距
-        const padding = 50;
+        const padding = boundaryPadding;
         const width = maxX - minX + padding * 2;
         const height = maxY - minY + padding * 2;
         return {
@@ -30250,7 +30250,7 @@ const BoundarySvgRender = React.memo(({ mapJson, unStructMapData, id, maxWidth =
             width,
             height,
         };
-    }, [boundaryInfo]);
+    }, [boundaryInfo, boundaryPadding]);
     const commonValue = React.useMemo(() => {
         return {
             sn,
@@ -30258,17 +30258,31 @@ const BoundarySvgRender = React.memo(({ mapJson, unStructMapData, id, maxWidth =
         };
     }, [sn, boundaryViewBox]);
     const style = React.useMemo(() => {
-        if (boundaryViewBox?.width > boundaryViewBox?.height) {
+        if (!maxHeight) {
+            if (boundaryViewBox?.width > boundaryViewBox?.height) {
+                return {
+                    width: maxWidth,
+                    height: maxWidth * (boundaryViewBox.height / boundaryViewBox.width),
+                };
+            }
+            return {
+                width: maxWidth * (boundaryViewBox.width / boundaryViewBox.height),
+                height: maxWidth,
+            };
+        }
+        const ratio = maxWidth / maxHeight;
+        const boundaryRatio = boundaryViewBox.width / boundaryViewBox.height;
+        if (ratio > boundaryRatio) {
             return {
-                width: maxWidth,
-                height: maxWidth * (boundaryViewBox.height / boundaryViewBox.width),
+                width: Math.floor(maxHeight * boundaryRatio),
+                height: maxHeight,
             };
         }
         return {
-            width: maxWidth * (boundaryViewBox.width / boundaryViewBox.height),
-            height: maxWidth,
+            width: maxWidth,
+            height: Math.floor(maxWidth / boundaryRatio),
         };
-    }, [boundaryViewBox, maxWidth]);
+    }, [boundaryViewBox, maxWidth, maxHeight]);
     return (jsxRuntime.jsx(CommonContextProvider, { value: commonValue, children: jsxRuntime.jsx(SvgEditContextProvider, { value: svgEditValue, children: jsxRuntime.jsxs("div", { style: {
                     position: 'relative',
                     width: style.width,

package/dist/render/BoundarySvgRender.d.ts

@@ -6,9 +6,11 @@ interface BoundarySvgRenderProps {
     unStructMapData: UnstructMapData;
     id: number;
     maxWidth?: number;
+    maxHeight?: number;
+    boundaryPadding?: number;
     mapConfig?: MapConfig;
     sn?: string;
 }
-declare const BoundarySvgRender: React.MemoExoticComponent<({ mapJson, unStructMapData, id, maxWidth, mapConfig, sn }: BoundarySvgRenderProps) => import("react/jsx-runtime").JSX.Element>;
+declare const BoundarySvgRender: React.MemoExoticComponent<({ mapJson, unStructMapData, id, maxWidth, maxHeight, boundaryPadding, mapConfig, sn }: BoundarySvgRenderProps) => import("react/jsx-runtime").JSX.Element>;
 export default BoundarySvgRender;
 //# sourceMappingURL=BoundarySvgRender.d.ts.map

package/dist/render/BoundarySvgRender.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BoundarySvgRender.d.ts","sourceRoot":"","sources":["../../src/render/BoundarySvgRender.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAK9C,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAM3C,UAAU,sBAAsB;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,eAAe,EAAE,eAAe,CAAC;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAID,QAAA,MAAM,iBAAiB,wFAC6C,sBAAsB,6CA8HzF,CAAC;AAEF,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"BoundarySvgRender.d.ts","sourceRoot":"","sources":["../../src/render/BoundarySvgRender.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAK9C,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAM3C,UAAU,sBAAsB;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,eAAe,EAAE,eAAe,CAAC;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAID,QAAA,MAAM,iBAAiB,oHAC8E,sBAAsB,6CA4I1H,CAAC;AAEF,eAAe,iBAAiB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fleet-frontend/mower-maps",
-  "version": "0.2.5-beta.17",
+  "version": "0.2.5-beta.18",
   "type": "module",
   "description": "a mower maps in google maps",
   "main": "dist/index.js",