mirage2d 1.1.68 → 1.1.69

package/dist/base/baseOptionType.d.ts

@@ -1,6 +1,5 @@
-import { Style, Icon } from 'ol/style';
+import { Style } from 'ol/style';
 import { Coordinate } from "ol/coordinate";
-import FillPattern from "ol-ext/style/FillPattern";
 import { crsType, featuretype } from "../Enum/typeEnum";
 export interface IContextmenu {
     classname?: string;
@@ -138,19 +137,19 @@ export interface IClusterImageLayerOption extends IGraphicLayerOption {
     animationDuration?: number;
     maxResolution?: number;
 }
-interface ITextOption {
+export interface ITextOption {
     font?: string;
     text?: string;
-    fill?: IFilleOption;
+    fill?: IFillOption;
     stroke?: IStrokeOption;
-    backgroundFill?: IFilleOption;
+    backgroundFill?: IFillOption;
     backgroundStroke?: IStrokeOption;
     padding?: Array<number>;
     offsetX?: number;
     offsetY?: number;
     textBaseline?: string;
 }
-interface IStrokeOption {
+export interface IStrokeOption {
     color?: string;
     width?: number;
     lineDash?: Array<number>;
@@ -165,11 +164,11 @@ interface IStrokeOption {
     scale?: number;
     ratio?: number;
 }
-interface IFilleOption {
+export interface IFillOption {
     color?: string;
-    image?: Icon | undefined;
+    image?: string;
     opacity?: number;
-    pattern?: FillPattern | string | undefined;
+    pattern?: string | undefined;
     patternColor?: string;
     offset?: number;
     size?: number;
@@ -180,6 +179,7 @@ interface IFilleOption {
 }
 export interface IGraphicOption {
     lnglat?: Array<number> | Coordinate[][] | any;
+    graphicType: string;
     dataWkID?: crsType | string;
     attribute?: any;
     popupInfo?: any;
@@ -192,19 +192,25 @@ export interface IGraphicOption {
     };
     style?: any;
 }
-export interface IPointStyle {
+export interface IImageStyle {
+    scale?: number;
+    radius?: number;
+    fill?: IFillOption;
+    stroke?: IStrokeOption;
+}
+export interface ILabelStyle {
     text?: ITextOption;
-    image?: {
-        radius?: number;
-        scale?: number;
-        fill?: IFilleOption;
-        stroke?: IStrokeOption;
-    };
+    image?: IImageStyle;
     zIndex?: number;
 }
 export interface ILabelOption extends IGraphicOption {
     style: IPointStyle;
 }
+export interface IPointStyle {
+    text?: ITextOption;
+    image?: IImageStyle;
+    zIndex?: number;
+}
 export interface IPointOption extends IGraphicOption {
     style: IPointStyle;
 }
@@ -223,19 +229,20 @@ export interface IPolylineStyle {
 export interface IPolylineOption extends IGraphicOption {
     style: IPolylineStyle;
 }
+export interface IPolygonStyle {
+    text?: ITextOption;
+    stroke?: IStrokeOption;
+    fill?: IFillOption;
+    zIndex?: number;
+}
 export interface IPolygonOption extends IGraphicOption {
-    style: {
-        text?: ITextOption;
-        stroke?: IStrokeOption;
-        fill?: IFilleOption;
-        zIndex?: number;
-    };
+    style: IPolygonStyle;
 }
 export interface ICurveGraphicOption extends IGraphicOption {
     style: {
         text?: ITextOption;
         stroke?: IStrokeOption;
-        fill?: IFilleOption;
+        fill?: IFillOption;
         zIndex?: number;
         radius?: number;
         startAngle?: number;
@@ -275,4 +282,3 @@ export interface IPathLayerOption extends IGraphicLayerOption {
         pointDistance: number;
     };
 }
-export {};

package/dist/graphic/Curve.d.ts

@@ -1,10 +1,8 @@
-import { Geometry } from 'ol/geom';
 import { baseGraphic } from "./baseGraphic";
 import { ICurveGraphicOption } from "../base/baseOptionType";
-import { Coordinate } from 'ol/coordinate';
 export declare class CurveGraphic extends baseGraphic {
     constructor(options: ICurveGraphicOption);
     setAngle(startAngle: number, stopAngle: number): void;
-    getCoordinates(): Coordinate[][];
-    createRegularPolygonCurve(origin: Coordinate, radius: number, startAngle: number, stopAngle: number, rotation: number): Geometry;
+    setCoordinates(coordinates: Array<number>, dataWkID?: string): void;
+    private createRegularPolygonCurve;
 }

package/dist/graphic/Line.d.ts

@@ -1,25 +1,19 @@
 import { baseGraphic } from "./baseGraphic";
-import { IGraphicOption, IPolylineStyle } from "../base/baseOptionType";
+import { IPolylineOption } from "../base/baseOptionType";
 export declare class LineGraphic extends baseGraphic {
-    constructor(options: IGraphicOption);
-    private chaikin_copy;
-    private chaikin_smooth;
-    /**
-     * 平滑方法
-     * @param coordinate 坐标
-     * @param param 参数
-     * @returns {*}
-     */
-    private smoothFunc;
-    /**
-         * 平滑曲线
-         * @param param 越大越平滑
-         */
-    setSmooth(param?: number): void;
-    setLineColor(rgba: string): void;
-    setLineWidth(width: number): void;
-    setLineDash(lineDash: Array<number>): void;
-    setLineStyle(lineStyleOption: IPolylineStyle): void;
-    getCoordinates(): import("ol/coordinate").Coordinate[];
+    constructor(options: IPolylineOption);
+    getGraphicJson(projection?: string): {
+        type: string;
+        lnglat: any;
+        dataWkID: string;
+        style: {
+            stroke: any;
+            text: any;
+        };
+        attribute: {
+            [x: string]: any;
+        };
+    };
+    setCoordinates(coordinates: Array<number>, dataWkID?: string): void;
     lineStyle(): any[];
 }

package/dist/graphic/Polygon.d.ts

@@ -1,7 +1,9 @@
 import { baseGraphic } from "./baseGraphic";
-import { IPolygonOption } from "../base/baseOptionType";
+import { IPolygonOption, IPolygonStyle } from "../base/baseOptionType";
+import { crsType } from "../Enum/typeEnum";
 export declare class PolygonGraphic extends baseGraphic {
     constructor(options: IPolygonOption);
-    getCoordinates(): import("ol/coordinate").Coordinate[][];
+    setPolygonStyle(polygonStyleOption: IPolygonStyle): void;
+    setCoordinates(coordinates: Array<number>, dataWkID?: crsType): void;
     setGeometryFromExtent(extent: any): void;
 }

package/dist/graphic/baseGraphic.d.ts

@@ -1,5 +1,5 @@
 import Feature from "ol/Feature";
-import { IFeatureAttribute, IGraphicLayerOption, IGraphicOption, ITooltipInfo } from "../base/baseOptionType";
+import { IFeatureAttribute, IFillOption, IGraphicLayerOption, IGraphicOption, IImageStyle, IStrokeOption, ITextOption, ITooltipInfo } from "../base/baseOptionType";
 import { proj } from "../proj4/proj";
 export declare class baseGraphic extends Feature {
     protected option: IGraphicOption;
@@ -18,4 +18,125 @@ export declare class baseGraphic extends Feature {
     openPopup(popupInfo?: Array<ITooltipInfo> | string, popupOption?: IGraphicLayerOption["popupOption"]): void;
     closePopup(): void;
     openTooltip(tooltipInfo: string, tooltipOption?: IGraphicLayerOption["popupOption"]): void;
+    private chaikin_copy;
+    private chaikin_smooth_line;
+    private chaikin_smooth_polygon;
+    /**
+     * 平滑方法
+     * @param coordinate 坐标
+     * @param param 参数
+     * @returns {*}
+     */
+    smoothFunc(coordinate: any[], param?: number, isLine?: boolean): any;
+    /**
+    * 平滑曲线
+    * @param param 越大越平滑
+    */
+    setSmooth(param?: number, isLine?: boolean): void;
+    /**
+     * 设置图形文字样式
+     * @param ITextOption
+     * @example
+     * setTextStyle({
+            font: "14px Microsoft YaHei",
+            text: "示例",
+            fill: {
+                color: "#8B4513", //"rgba(255, 255, 255, 1)",
+            },
+            stroke: {
+                color: "rgba(255, 255, 255,1)", //"#fff",
+                width: 2, //2,
+            },
+            backgroundFill: {
+                color: "rgba(255, 255, 255, 0.0)", //"rgba(255, 255, 255, 1)",
+            },
+            backgroundStroke: {
+                color: "rgba(0, 0, 0, 0.0)", //"#fff",
+                width: 2,
+            },
+            padding: [3, 3, 3, 3],
+            offsetX: 0,
+            offsetY: -10,
+            textBaseline: "bottom",
+    })
+    */
+    setTextStyle(textStyleOption: ITextOption): void;
+    setTrianglePointStyle(ImageStyleOption: IImageStyle): void;
+    setCirclePointStyle(ImageStyleOption: IImageStyle): void;
+    /**
+    * 设置边框简单模式样式
+    * @param IStrokeOption
+    * @example
+    * setStrokeSimpleStyle({
+        color: "rgba(255, 255, 255,1)", //"#fff",
+        width: 2, //2,
+        lineDash：[10,10] 或null
+        })
+    */
+    setStrokeSimpleStyle(strokeStyleOption: IStrokeOption): void;
+    /**
+    * 设置边框图案填充模式样式，pattern与image 二选一，不用的需undefined，同时配置优先pattern
+    * @param IStrokeOption
+    * @example
+    * setStrokePatternStyle({
+            pattern: undefined,图案Enum：mirage2d.DataType.featureStyleType.caps
+            // image: undefined,
+            color: "rgba(255, 255, 0,1)",//背景色
+            width: 2,
+            lineDash: null,
+            ratio: 1,
+            patternColor: "rgba(0, 0, 0,1)",//图案颜色
+            offset: 0,
+            scale: 1,
+            size: 5,
+            spacing: 10,
+            angle: 0
+    })
+    */
+    setStrokePatternStyle(strokeStyleOption: IStrokeOption): void;
+    /**
+       * 设置填充简单模式样式 ,从图片模式转到普通模式时，需注意等图片加载完成后才可设置
+       * @param ITextOption
+       * @example
+       * setFillColor("rgba(255, 255, 255,1)")//"#fff"
+      */
+    setFillColor(color: string): void;
+    /**
+     * 设置多边形图案填充模式样式，pattern与image 二选一，不用的需undefined，同时配置优先pattern
+     * @param fillStyleOption
+     * @example
+     * setFillPatternStyle({
+                pattern: undefined,图案Enum：mirage2d.DataType.featureStyleType.caps
+                // image: undefined,
+                patternColor: "rgba(0, 0, 0,1)",//图案颜色
+                fill: "rgba(255, 255, 0,1)",//背景色
+                width: 2,
+                lineDash: null,
+                ratio: 1,
+                offset: 0,
+                scale: 1,
+                size: 5,
+                spacing: 10,
+                angle: 0
+                })
+    */
+    setFillPatternStyle(fillStyleOption: IFillOption): void;
+    /**
+     * 设置多边形图片填充模式样式，初始设置时当pattern==null或undefined 且image有值才能生效
+     * @param fillStyleOption
+     * @example
+     * setFillImageStyle(imageurl)
+    */
+    setFillImageStyle(imageUrl: string): void;
+    setZIndex(zindex: number): void;
+    getCoordinates(projection?: string): any;
+    getGraphicJson(projection?: string): {
+        type: string;
+        lnglat: any;
+        dataWkID: string;
+        style: any;
+        attribute: {
+            [x: string]: any;
+        };
+    };
 }

package/dist/graphic/imagePoint.d.ts

@@ -3,7 +3,7 @@ import { crsType } from "../Enum/typeEnum";
 import { IimagePointOption } from "../base/baseOptionType";
 export declare class ImagePointGraphic extends baseGraphic {
     constructor(options: IimagePointOption);
-    getCoordinates(): import("ol/coordinate").Coordinate;
+    setPointIconStyle(imageOption: any): void;
     setCoordinates(lng: number, lat: number, dataWkID?: crsType): void;
     setRotation(angle: number): void;
 }

package/dist/graphic/label.d.ts

@@ -1,25 +1,7 @@
 import { baseGraphic } from "./baseGraphic";
 import { crsType } from "../Enum/typeEnum";
-import { ILabelOption, IPointStyle } from "../base/baseOptionType";
+import { ILabelOption } from "../base/baseOptionType";
 export declare class LabelGraphic extends baseGraphic {
     constructor(options: ILabelOption);
-    setLabelFont(font: string): void;
-    setLabelColor(rgba: string): void;
-    setLabelBackgroundFill(color: string): void;
-    setLabelBackgroundStroke(width: number, color: string): void;
-    setLabeloffsetXY(x: number, y: number): void;
-    setLabelPadding(padding: Array<number>): void;
-    setLabelTextBaseline(textBaseline: string): void;
-    setLabelImage(opt: {
-        scale?: number;
-        rotation?: number;
-        line?: {
-            lineColor: string;
-            lineWidth: number;
-        };
-        fillColor?: string;
-    }): void;
-    setLabelStyle(pointStyle: IPointStyle): void;
-    getCoordinates(): import("ol/coordinate").Coordinate;
     setCoordinates(lng: number, lat: number, dataWkID?: crsType): void;
 }

package/dist/graphic/point.d.ts

@@ -3,6 +3,5 @@ import { crsType } from "../Enum/typeEnum";
 import { IPointOption } from "../base/baseOptionType";
 export declare class PointGraphic extends baseGraphic {
     constructor(options: IPointOption);
-    getCoordinates(): import("ol/coordinate").Coordinate;
     setCoordinates(lng: number, lat: number, dataWkID?: crsType): void;
 }