@naivemap/mapbox-gl-echarts-layer 0.1.2 → 0.1.4

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2022 Naive Map
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2022 Naive Map
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,17 +1,17 @@
-# mapbox-gl-echarts-layer
-
-[全国主要城市空气质量 - 百度地图](https://huanglii.github.io/mapbox-gl-js-cookbook/example/echarts-scatter.html)
-
-```bash
-npm i @naivemap/mapbox-gl-echarts-layer
-```
-
-```js
-import EchartsLayer from '@naivemap/mapbox-gl-echarts-layer'
-
-// echart option
-const option = {...}
-const layer = new EchartsLayer('layer-id', option)
-
-map.addLayer(layer)
-```
+# mapbox-gl-echarts-layer
+
+[全国主要城市空气质量 - 百度地图](https://huanglii.github.io/mapbox-gl-js-cookbook/example/echarts-scatter.html)
+
+```bash
+npm i @naivemap/mapbox-gl-echarts-layer
+```
+
+```js
+import EchartsLayer from '@naivemap/mapbox-gl-echarts-layer'
+
+// echart option
+const option = {...}
+const layer = new EchartsLayer('layer-id', option)
+
+map.addLayer(layer)
+```

package/dist/mapbox-gl-echarts-layer.es.js

@@ -25,13 +25,13 @@ class CoordinateSystem {
   }
 }
 class EchartsLayer {
-  constructor(id, ecOptions) {
+  constructor(id, ecOption) {
     this._registered = false;
     this.id = id;
     this.type = "custom";
     this.renderingMode = "2d";
     this._coordSystemName = COORDINATE_SYSTEM_NAME;
-    this._ecOptions = ecOptions;
+    this._ecOption = ecOption;
   }
   onAdd(map) {
     this._map = map;
@@ -53,7 +53,7 @@ class EchartsLayer {
     if (!this._ec) {
       this._ec = echarts.init(this._container);
       this._prepareECharts();
-      this._ec.setOption(this._ecOptions);
+      this._ec.setOption(this._ecOption);
     } else {
       if (this._map.isMoving()) {
         this._ec.clear();
@@ -62,7 +62,7 @@ class EchartsLayer {
           width: this._map.getCanvas().width,
           height: this._map.getCanvas().height
         });
-        this._ec.setOption(this._ecOptions);
+        this._ec.setOption(this._ecOption);
       }
     }
   }
@@ -72,7 +72,7 @@ class EchartsLayer {
       echarts.registerCoordinateSystem(this._coordSystemName, coordinateSystem);
       this._registered = true;
     }
-    const series = this._ecOptions.series;
+    const series = this._ecOption.series;
     if (series) {
       for (let i = series.length - 1; i >= 0; i--) {
         series[i]["coordinateSystem"] = this._coordSystemName;

package/dist/mapbox-gl-echarts-layer.umd.js

@@ -1 +1 @@
-(function(n,r){typeof exports=="object"&&typeof module!="undefined"?module.exports=r(require("echarts")):typeof define=="function"&&define.amd?define(["echarts"],r):(n=typeof globalThis!="undefined"?globalThis:n||self,n.EchartsLayer=r(n.echarts))})(this,function(n){"use strict";function r(i){if(i&&i.__esModule)return i;var e={__proto__:null,[Symbol.toStringTag]:"Module"};return i&&Object.keys(i).forEach(function(t){if(t!=="default"){var s=Object.getOwnPropertyDescriptor(i,t);Object.defineProperty(e,t,s.get?s:{enumerable:!0,get:function(){return i[t]}})}}),e.default=i,Object.freeze(e)}var o=r(n);const h="mapboxgl-echarts";class a{constructor(e){this.dimensions=["x","y"],this._mapOffset=[0,0],this.map=e}create(e){e.eachSeries(t=>{t.get("coordinateSystem")===h&&(t.coordinateSystem=new a(this.map))})}dataToPoint(e){const t=this.map.project(e),s=this._mapOffset;return[t.x-s[0],t.y-s[1]]}pointToData(e){const t=this._mapOffset,s=this.map.unproject([e[0]+t[0],e[1]+t[1]]);return[s.lng,s.lat]}}class c{constructor(e,t){this._registered=!1,this.id=e,this.type="custom",this.renderingMode="2d",this._coordSystemName=h,this._ecOptions=t}onAdd(e){this._map=e,this._createLayerContainer()}onRemove(){this._ec.dispose(),this._removeLayerContainer()}setOption(e){this._ec&&this._ec.setOption(e)}render(){this._container||this._createLayerContainer(),this._ec?this._map.isMoving()?this._ec.clear():(this._ec.resize({width:this._map.getCanvas().width,height:this._map.getCanvas().height}),this._ec.setOption(this._ecOptions)):(this._ec=o.init(this._container),this._prepareECharts(),this._ec.setOption(this._ecOptions))}_prepareECharts(){if(!this._registered){const t=new a(this._map);o.registerCoordinateSystem(this._coordSystemName,t),this._registered=!0}const e=this._ecOptions.series;if(e)for(let t=e.length-1;t>=0;t--)e[t].coordinateSystem=this._coordSystemName}_createLayerContainer(){const e=this._map.getCanvasContainer();this._container=document.createElement("div"),this._container.style.width=this._map.getCanvas().style.width,this._container.style.height=this._map.getCanvas().style.height,e.appendChild(this._container)}_removeLayerContainer(){var e;this._container&&((e=this._container.parentNode)==null||e.removeChild(this._container))}}return c});
+(function(n,r){typeof exports=="object"&&typeof module!="undefined"?module.exports=r(require("echarts")):typeof define=="function"&&define.amd?define(["echarts"],r):(n=typeof globalThis!="undefined"?globalThis:n||self,n.EchartsLayer=r(n.echarts))})(this,function(n){"use strict";function r(i){if(i&&i.__esModule)return i;var e={__proto__:null,[Symbol.toStringTag]:"Module"};return i&&Object.keys(i).forEach(function(t){if(t!=="default"){var s=Object.getOwnPropertyDescriptor(i,t);Object.defineProperty(e,t,s.get?s:{enumerable:!0,get:function(){return i[t]}})}}),e.default=i,Object.freeze(e)}var o=r(n);const h="mapboxgl-echarts";class a{constructor(e){this.dimensions=["x","y"],this._mapOffset=[0,0],this.map=e}create(e){e.eachSeries(t=>{t.get("coordinateSystem")===h&&(t.coordinateSystem=new a(this.map))})}dataToPoint(e){const t=this.map.project(e),s=this._mapOffset;return[t.x-s[0],t.y-s[1]]}pointToData(e){const t=this._mapOffset,s=this.map.unproject([e[0]+t[0],e[1]+t[1]]);return[s.lng,s.lat]}}class c{constructor(e,t){this._registered=!1,this.id=e,this.type="custom",this.renderingMode="2d",this._coordSystemName=h,this._ecOption=t}onAdd(e){this._map=e,this._createLayerContainer()}onRemove(){this._ec.dispose(),this._removeLayerContainer()}setOption(e){this._ec&&this._ec.setOption(e)}render(){this._container||this._createLayerContainer(),this._ec?this._map.isMoving()?this._ec.clear():(this._ec.resize({width:this._map.getCanvas().width,height:this._map.getCanvas().height}),this._ec.setOption(this._ecOption)):(this._ec=o.init(this._container),this._prepareECharts(),this._ec.setOption(this._ecOption))}_prepareECharts(){if(!this._registered){const t=new a(this._map);o.registerCoordinateSystem(this._coordSystemName,t),this._registered=!0}const e=this._ecOption.series;if(e)for(let t=e.length-1;t>=0;t--)e[t].coordinateSystem=this._coordSystemName}_createLayerContainer(){const e=this._map.getCanvasContainer();this._container=document.createElement("div"),this._container.style.width=this._map.getCanvas().style.width,this._container.style.height=this._map.getCanvas().style.height,e.appendChild(this._container)}_removeLayerContainer(){var e;this._container&&((e=this._container.parentNode)==null||e.removeChild(this._container))}}return c});

package/package.json

@@ -1,41 +1,46 @@
-{
-  "name": "@naivemap/mapbox-gl-echarts-layer",
-  "version": "0.1.2",
-  "description": "mapbox-gl-echarts-layer",
-  "files": [
-    "dist"
-  ],
-  "types": "./dist/mapbox-gl-echarts-layer.d.ts",
-  "main": "./dist/mapbox-gl-echarts-layer.umd.js",
-  "module": "./dist/mapbox-gl-echarts-layer.es.js",
-  "exports": {
-    ".": {
-      "import": "./dist/mapbox-gl-echarts-layer.es.js",
-      "require": "./dist/mapbox-gl-echarts-layer.umd.js"
-    }
-  },
-  "scripts": {
-    "dev": "vite",
-    "lint": "eslint src --fix --ext .ts,.tsx,.vue,.js,.jsx",
-    "prettier": "prettier --write .",
-    "build": "vite build"
-  },
-  "repository": "https://github.com/naivemap/mapbox-gl-echarts-layer",
-  "keywords": ["mapbox-gl", "echarts"],
-  "license": "MIT",
-  "dependencies": {
-    "echarts": "^5.3.0"
-  },
-  "devDependencies": {
-    "@types/mapbox-gl": "^2.6.1",
-    "@types/node": "^17.0.15",
-    "@typescript-eslint/eslint-plugin": "^5.10.2",
-    "@typescript-eslint/parser": "^5.10.2",
-    "eslint": "^8.8.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "prettier": "^2.5.1",
-    "typescript": "^4.5.5",
-    "vite": "^2.7.13"
-  }
-}
+{
+  "name": "@naivemap/mapbox-gl-echarts-layer",
+  "version": "0.1.4",
+  "description": "mapbox-gl-echarts-layer",
+  "files": [
+    "dist",
+    "types"
+  ],
+  "types": "./types/index.d.ts",
+  "main": "./dist/mapbox-gl-echarts-layer.umd.js",
+  "module": "./dist/mapbox-gl-echarts-layer.es.js",
+  "exports": {
+    ".": {
+      "import": "./dist/mapbox-gl-echarts-layer.es.js",
+      "require": "./dist/mapbox-gl-echarts-layer.umd.js"
+    }
+  },
+  "scripts": {
+    "dev": "vite",
+    "lint": "eslint src --fix --ext .ts,.tsx,.vue,.js,.jsx",
+    "prettier": "prettier --write .",
+    "build": "vite build"
+  },
+  "repository": "https://github.com/naivemap/mapbox-gl-echarts-layer",
+  "keywords": [
+    "mapbox-gl",
+    "echarts"
+  ],
+  "license": "MIT",
+  "peerDependencies": {
+    "echarts": "^5.3.0"
+  },
+  "devDependencies": {
+    "@types/mapbox-gl": "^2.6.1",
+    "@types/node": "^17.0.15",
+    "@typescript-eslint/eslint-plugin": "^5.10.2",
+    "@typescript-eslint/parser": "^5.10.2",
+    "echarts": "^5.3.0",
+    "eslint": "^8.8.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "prettier": "^2.5.1",
+    "typescript": "^4.5.5",
+    "vite": "^2.7.13"
+  }
+}

package/types/index.d.ts

@@ -0,0 +1,37 @@
+/// <reference types="mapbox-gl" />
+import * as echarts from 'echarts'
+import {
+  EffectScatterSeriesOption,
+  LegendComponentOption,
+  LinesSeriesOption,
+  ScatterSeriesOption,
+  TitleComponentOption,
+  TooltipComponentOption,
+} from 'echarts'
+export declare type ECOption = echarts.ComposeOption<
+  | TitleComponentOption
+  | TooltipComponentOption
+  | LegendComponentOption
+  | LinesSeriesOption
+  | ScatterSeriesOption
+  | EffectScatterSeriesOption
+>
+export default class EchartsLayer implements mapboxgl.CustomLayerInterface {
+  id: string
+  type: 'custom'
+  renderingMode: '2d'
+  private _container
+  private _map
+  private _ec
+  private _coordSystemName
+  private _registered
+  private _ecOption
+  constructor(id: string, ecOption: ECOption)
+  onAdd(map: mapboxgl.Map): void
+  onRemove(): void
+  setOption(option: ECOption): void
+  render(): void
+  private _prepareECharts
+  private _createLayerContainer
+  private _removeLayerContainer
+}