mirage2d 1.1.66 → 1.1.68

package/dist/base/baseGraphicLayer.d.ts

@@ -15,6 +15,8 @@ export declare class baseGraphicLayer extends baseLayer {
     option: IGraphicLayerOption;
     constructor(layerid: string, Options?: IGraphicLayerOption);
     initSelect(): void;
+    startMove(): void;
+    endMove(): void;
     startEdit(): void;
     endEdit(): void;
     bindContextmenu(menu: any): void;

package/dist/base/baseOptionType.d.ts

@@ -154,18 +154,20 @@ interface IStrokeOption {
     color?: string;
     width?: number;
     lineDash?: Array<number>;
+    image?: string | undefined;
     opacity?: number;
-    pattern?: FillPattern | string | undefined;
+    pattern?: string | undefined;
     patternColor?: string;
     offset?: number;
     size?: number;
     spacing?: number;
     angle?: number;
     scale?: number;
+    ratio?: number;
 }
 interface IFilleOption {
     color?: string;
-    Image?: Icon | undefined;
+    image?: Icon | undefined;
     opacity?: number;
     pattern?: FillPattern | string | undefined;
     patternColor?: string;
@@ -174,6 +176,7 @@ interface IFilleOption {
     spacing?: number;
     angle?: number;
     scale?: number;
+    ratio?: number;
 }
 export interface IGraphicOption {
     lnglat?: Array<number> | Coordinate[][] | any;
@@ -189,54 +192,47 @@ export interface IGraphicOption {
     };
     style?: any;
 }
-export interface ILabelOption extends IGraphicOption {
-    style?: {
-        text?: ITextOption;
-        image?: {
-            radius?: number;
-            scale?: number;
-            fill?: IFilleOption;
-            stroke?: IStrokeOption;
-        };
-        zIndex?: number;
+export interface IPointStyle {
+    text?: ITextOption;
+    image?: {
+        radius?: number;
+        scale?: number;
+        fill?: IFilleOption;
+        stroke?: IStrokeOption;
     };
+    zIndex?: number;
+}
+export interface ILabelOption extends IGraphicOption {
+    style: IPointStyle;
 }
 export interface IPointOption extends IGraphicOption {
-    style?: {
-        text?: ITextOption;
-        image?: {
-            radius?: number;
-            scale?: number;
-            fill?: IFilleOption;
-            stroke?: IStrokeOption;
-        };
-        zIndex?: number;
-    };
+    style: IPointStyle;
 }
 export interface IimagePointOption extends IGraphicOption {
-    style?: {
+    style: {
         text: ITextOption;
         imageOption: any;
         zIndex?: number;
     };
 }
+export interface IPolylineStyle {
+    text?: ITextOption;
+    stroke?: IStrokeOption;
+    zIndex?: number;
+}
 export interface IPolylineOption extends IGraphicOption {
-    style?: {
-        text?: ITextOption;
-        stroke?: IStrokeOption;
-        zIndex?: number;
-    };
+    style: IPolylineStyle;
 }
 export interface IPolygonOption extends IGraphicOption {
-    style?: {
+    style: {
         text?: ITextOption;
         stroke?: IStrokeOption;
         fill?: IFilleOption;
         zIndex?: number;
     };
 }
-export interface ICurveGraphic extends IGraphicOption {
-    style?: {
+export interface ICurveGraphicOption extends IGraphicOption {
+    style: {
         text?: ITextOption;
         stroke?: IStrokeOption;
         fill?: IFilleOption;

package/dist/config/json/mapConfig.json

@@ -73,7 +73,7 @@
               "type": "tdt",
               "layertype": "img_d",
               "key": ["ad5bee3fe473a639887fa9d57a670c6e"],
-              "url":"//192.168.28.201:9999/map/{z}/{x}/{y}.png"
+              "url":"//192.168.5.212:9295/bjsyx/{z}/{x}/{y}.png"
               
             },
             {
@@ -81,7 +81,7 @@
               "type": "tdt",
               "layertype": "img_z",
               "key": ["ad5bee3fe473a639887fa9d57a670c6e"],
-              "url":"//192.168.28.201:9999/mapzj/{z}/{x}/{y}.png"
+              "url":"//192.168.28.201:9295/bjszj/{z}/{x}/{y}.png"
             }
           ]
         },
@@ -91,10 +91,10 @@
           "name": "离线影像2",
           "type": "xyz",
           "icon": "image/basemaps/gaode_img.png",
-          "url":"//192.168.28.201:9999/map/{z}/{x}/{y}.png",
+          "url":"//192.168.28.201:9888/{z}/{x}/{y}.png",
           "layer": "vec",
-          "show": true,
-          "chinaCRS": "GCJ02"
+          "show": true 
+         
         },
         {
           "id": 2021,
@@ -206,6 +206,33 @@
           "url": "http://map.geoq.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}",
           "chinaCRS": "GCJ02"
         },
+        {
+          "id": 2017,
+          "pid": 10,
+          "name": "谷歌卫星",
+          "icon": "image/basemaps/googleimage.png",
+          "type": "xyz",
+          "url": "https://gac-geo.googlecnapps.cn/maps/vt?lyrs=y&x={x}&y={y}&z={z}"
+           
+        },
+        {
+          "id": 2017,
+          "pid": 10,
+          "name": "谷歌地图",
+          "icon": "image/basemaps/googleimage.png",
+          "type": "xyz",
+          "url": "https://gac-geo.googlecnapps.cn/maps/vt?lyrs=m&x={x}&y={y}&z={z}"
+           
+        },
+        {
+          "id": 2017,
+          "pid": 10,
+          "name": "谷歌地形",
+          "icon": "image/basemaps/googleimage.png",
+          "type": "xyz",
+          "url": "https://gac-geo.googlecnapps.cn/maps/vt?lyrs=p&x={x}&y={y}&z={z}"
+           
+        },
         {
           "id": 2017,
           "pid": 10,
@@ -306,6 +333,5 @@
         { "pid":20,"name": "经纬网", "type": "graticule" }
       ]
     },
-    "appkey":"U2FsdGVkX18tMsBEV5FfQF7ufuq4ZOmVnCreta9VsR86m1UJg6Tscxsi1wdo6GrfHTJzv/2jRln7hUu6i+y9LIKwTjrb9RK9OpHgd0ab9VKj6bgg8CRhdDxknzWMEb8UpPcn1zOmFT0xmdDId/CTX56jVlZP1+BgZKMFi/2RZAoTJhpv6+wd/IOL3YrU2OLXpaohhRLstmhGh6UGPxLuwycG1u4AmPhDpD5ggQQxOYhgbl1xHBKl8oq3l1WFKyds+rvmw/RvLyigb3ugllFKfUCQTX1Qkh5qMB5a6GtstXRt6XnYz3j6fs0LvmbX4316I5Pn9XWsE2oyxdpx0qpySp+fHtUpLv/2+eKADevxHmkIej4lMh0x/K+y213T5IXIXerwAlUXccXg8beQzc7aNkyWvod2LKa7pt/1LoncmapjWezo05TOlZ0o3KHSTJWffdrxn064FvvNXar1wsHqoKhoImtoI1cMA6uYrZME7zDHKTqQBQj0gz2N4niOvhpC87H86gt6SlIEpnfsodY7Ej1AHIQIXWJgA4DOCIORVt15er4zSMyCj0J6G1tTrHi/FkNxm8O7WQLOT3/NmiDhD3aIFfccm7hjmB9icgFI5yJ1t+++fGORjDpLeWfygINI33z5NOdfk6a1MFf4vuti5dbcfNMLVG0IrSVYZqVZdw4YG6zqTCVgyQ=="
+    "appkey":"U2FsdGVkX18U4oqomCgBLQJGYX67uC4rmckZk//SZ+tTM2wLvyvRC2L8L0Yu+MCo+DwHa7m0avqHcSkIxh8aUBV8+Mj/W2hilkSEusbxqfzbMwSg8cgNjPwoDSzGEJsdpsVXhnuUDy/v0DdpywGbQxZij8IVzaOOYW8f3c4kgsYlgPhbuyXY/ymOGB/euBiEY929AjY3CJe3+jiso1FKQaXeZkK4qDAPapCIhHF6Cwrdi1yHl4bof/Pv1n74AmwnGPwD9LufUh7ZHTATqt0aRrNvzvRHQ8a6vZqpMymUeUFr3WER5IrgjSsVs8bCth4boOF1R3W2lthJMFC23/0mG9aTstTD9BqKI7QlkXV6kBfg93mhxySCPUdUqnQY67xwtWOHvc/NMMkJzxXZrqKNQfh+sHrIjDSIEaAAI9KBMYba6ryWSNnEoEoRDelc//pF34+SGxR/E3nptAefxsLHfYxH6Gq5QTCaFnPmaS6iU5MsJUivR+lmMJb/7ruA7ii+PFI9D/w/nQCaYhrjJYNA4KHyC9fceJ3QgbEnXTwQyxdcFInMjS3vBCyaJoEESRmRl1kW0Q/JySZFlCHVHnTsy8MpjY2A9olR6utwhAW4X6MT0yJKa6qhd5+lXN7RmaJWVuj9vCgSP1WMHMTp4bhpKxqfwAwkCz8pq9fJsilt1TJwD4WVb2FjHQ=="
   }
-  

package/dist/graphic/Curve.d.ts

@@ -1,9 +1,9 @@
 import { Geometry } from 'ol/geom';
 import { baseGraphic } from "./baseGraphic";
-import { ICurveGraphic } from "../base/baseOptionType";
+import { ICurveGraphicOption } from "../base/baseOptionType";
 import { Coordinate } from 'ol/coordinate';
 export declare class CurveGraphic extends baseGraphic {
-    constructor(options: ICurveGraphic);
+    constructor(options: ICurveGraphicOption);
     setAngle(startAngle: number, stopAngle: number): void;
     getCoordinates(): Coordinate[][];
     createRegularPolygonCurve(origin: Coordinate, radius: number, startAngle: number, stopAngle: number, rotation: number): Geometry;

package/dist/graphic/Line.d.ts

@@ -1,7 +1,25 @@
 import { baseGraphic } from "./baseGraphic";
-import { IPolylineOption } from "../base/baseOptionType";
+import { IGraphicOption, IPolylineStyle } from "../base/baseOptionType";
 export declare class LineGraphic extends baseGraphic {
-    constructor(options: IPolylineOption);
+    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[];
     lineStyle(): any[];
 }

package/dist/graphic/baseGraphic.d.ts

@@ -4,7 +4,7 @@ import { proj } from "../proj4/proj";
 export declare class baseGraphic extends Feature {
     protected option: IGraphicOption;
     protected Proj: proj;
-    constructor(options: any);
+    constructor(options: IGraphicOption);
     setAttribute(attribute: IFeatureAttribute | any): void;
     toGeoJSON(): import("geojson").Geometry;
     bindPopup(popupInfo: string, option?: {

package/dist/graphic/label.d.ts

@@ -1,8 +1,25 @@
 import { baseGraphic } from "./baseGraphic";
 import { crsType } from "../Enum/typeEnum";
-import { ILabelOption } from "../base/baseOptionType";
+import { ILabelOption, IPointStyle } 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;
 }