my-openlayer 0.1.10 → 0.1.12

package/dist/core/Line.js

@@ -11,8 +11,8 @@ export default class Line {
     }
     addLine(data, options) {
         const layer = new VectorLayer({
-            name: options.type,
-            layerName: options.type,
+            name: options.layerName,
+            layerName: options.layerName,
             source: new VectorSource({
                 features: (new GeoJSON()).readFeatures(data)
             }),
@@ -57,8 +57,8 @@ export default class Line {
                 layerName: 'river',
                 source: vectorSource,
                 style: function (feature) {
-                    feature.set('type', options.type);
-                    feature.set('layerName', options.type);
+                    feature.set('type', options.layerName);
+                    feature.set('layerName', options.layerName);
                     return new Style({
                         stroke: new Stroke({
                             color: options.strokeColor || 'rgb(0,113,255)',

package/dist/core/MapBaseLayers.d.ts

@@ -3,7 +3,6 @@
  */
 import Map from "ol/Map";
 import { Tile as TileLayer } from "ol/layer";
-import { WMTS } from "ol/source";
 import WMTSTileGrid from "ol/tilegrid/WMTS";
 import XYZ from "ol/source/XYZ";
 import { MapLayersOptions, TiandituType, AnnotationLayerOptions } from "../types";
@@ -23,7 +22,7 @@ export default class MapBaseLayers {
         token: string;
         zIndex: number;
         visible: boolean;
-    }): TileLayer<WMTS>;
+    }): TileLayer<XYZ>;
     /**
      * 地图注记
      */

package/dist/core/MapBaseLayers.js

@@ -4,7 +4,7 @@
 import { Tile as TileLayer } from "ol/layer";
 import { get as getProjection } from "ol/proj";
 import { getTopLeft, getWidth } from "ol/extent";
-import { WMTS } from "ol/source";
+// import { WMTS } from "ol/source";
 import WMTSTileGrid from "ol/tilegrid/WMTS";
 import XYZ from "ol/source/XYZ";
 import MapTools from "./MapTools";
@@ -111,14 +111,9 @@ export default class MapBaseLayers {
     //img_c 影像底图 ter_c 地形底图
     static getTiandiTuLayer(options) {
         return new TileLayer({
-            source: new WMTS({
-                url: `https://t{0-7}.tianditu.gov.cn/${options.type}/wmts?tk=${options.token}`,
-                layer: 'img',
-                style: 'default',
-                matrixSet: 'c',
-                format: 'tiles',
-                wrapX: true,
-                tileGrid: this.getTileGrid(19)
+            source: new XYZ({
+                url: `//t{0-7}.tianditu.gov.cn/DataServer?T=${options.type}&tk=${options.token}&x={x}&y={y}&l={z}`,
+                projection: 'EPSG:4326'
             }),
             zIndex: options.zIndex,
             visible: options.visible
@@ -130,7 +125,7 @@ export default class MapBaseLayers {
     static getAnnotationLayer(options) {
         return new TileLayer({
             source: new XYZ({
-                url: `http://t{0-7}.tianditu.gov.cn/DataServer?T=${options.type}&tk=${options.token}&x={x}&y={y}&l={z}`,
+                url: `//t{0-7}.tianditu.gov.cn/DataServer?T=${options.type}&tk=${options.token}&x={x}&y={y}&l={z}`,
                 projection: 'EPSG:4326'
             }),
             zIndex: options.zIndex,

package/dist/core/Point.js

@@ -32,7 +32,7 @@ export default class Point {
                 // clickLocation: options.clickLocation,
                 // all: JSON.stringify(item),
                 rawData: item, //保存原始数据
-                type: options.type,
+                type: options.layerName,
                 geometry: new olPoint([item.lgtd, item.lttd])
             });
             const style = {};
@@ -64,7 +64,7 @@ export default class Point {
             pointFeatureList.push(pointFeature);
         });
         const PointVectorLayer = new VectorLayer({
-            layerName: options.type,
+            layerName: options.layerName,
             source: new VectorSource({
                 features: pointFeatureList
             }),
@@ -91,7 +91,7 @@ export default class Point {
             source: source,
         });
         const clusterLayer = new VectorLayer({
-            layerName: options.type,
+            layerName: options.layerName,
             source: clusterSource,
             style: function (feature) {
                 const name = feature.get('features')[0].get(options.nameKey);

package/dist/core/Polygon.js

@@ -33,7 +33,7 @@ export default class Polygon {
      */
     addBorderPolygon(data, options) {
         options = options ?? {};
-        options.type = options.type ?? 'border';
+        options.layerName = options.layerName ?? 'border';
         options.fillColor = options.fillColor ?? 'rgba(255, 255, 255, 0)';
         this.addPolygon(data, options);
         if (options.mask)
@@ -43,12 +43,12 @@ export default class Polygon {
     //fyBasinJson中的id的key需要跟options中的nameKey一致
     addPolygon(dataJSON, options) {
         options = options ?? {};
-        if (options.type != null) {
-            MapTools.removeLayer(this.map, options.type);
+        if (options.layerName != null) {
+            MapTools.removeLayer(this.map, options.layerName);
         }
         const layer = new VectorLayer({
-            name: options.type,
-            layerName: options.type,
+            name: options.layerName,
+            layerName: options.layerName,
             source: new VectorSource({
                 features: (new GeoJSON()).readFeatures(dataJSON, options.projectionOptOptions ?? {})
             }),

package/dist/types.d.ts

@@ -58,7 +58,7 @@ export interface HeatMapOptions {
     valueKey: string;
 }
 export interface OptionsType {
-    type?: string;
+    layerName?: string;
     nameKey?: string;
     img?: string;
     scale?: number;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "my-openlayer",
   "private": false,
-  "version": "0.1.10",
+  "version": "0.1.12",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",