echarts-amap - npm Package Compare versions

Comparing version 1.0.0-rc.1 to 1.0.0-rc.3

dist/echarts-amap.min.js

@@ -1,1 +0,2 @@
-!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e(require("echarts")):"function"==typeof define&&define.amd?define(["echarts"],e):"object"==typeof exports?exports.amap=e(require("echarts")):(t.echarts=t.echarts||{},t.echarts.amap=e(t.echarts))}(this,function(t){return function(t){function e(n){if(o[n])return o[n].exports;var a=o[n]={i:n,l:!1,exports:{}};return t[n].call(a.exports,a,a.exports,e),a.l=!0,a.exports}var o={};return e.m=t,e.c=o,e.i=function(t){return t},e.d=function(t,o,n){e.o(t,o)||Object.defineProperty(t,o,{configurable:!1,enumerable:!0,get:n})},e.n=function(t){var o=t&&t.__esModule?function(){return t.default}:function(){return t};return e.d(o,"a",o),o},e.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},e.p="",e(e.s=4)}([function(e,o){e.exports=t},function(t,e,o){function n(t,e){this._amap=t,this.dimensions=["lng","lat"],this._mapOffset=[0,0],this._api=e}var a=o(0);n.prototype.dimensions=["lng","lat"],n.prototype.setZoom=function(t){this._zoom=t},n.prototype.setCenter=function(t){this._center=this._amap.lnglatToPixel(t)},n.prototype.setMapOffset=function(t){this._mapOffset=t},n.prototype.getAMap=function(){return this._amap},n.prototype.dataToPoint=function(t){var e=new AMap.LngLat(t[0],t[1]),o=this._amap.lngLatToContainer(e),n=this._mapOffset;return[o.x-n[0],o.y-n[1]]},n.prototype.pointToData=function(t){var e=this._mapOffset,t=this._amap.containerToLngLat({x:t[0]+e[0],y:t[1]+e[1]});return[t.lng,t.lat]},n.prototype.getViewRect=function(){var t=this._api;return new a.graphic.BoundingRect(0,0,t.getWidth(),t.getHeight())},n.prototype.getRoamTransform=function(){return a.matrix.create()};n.dimensions=n.prototype.dimensions,n.create=function(t,e){var o,a=e.getDom();t.eachComponent("amap",function(t){var r=e.getZr().painter.getViewportRoot();if("undefined"==typeof AMap)throw new Error("AMap api is not loaded");if(o)throw new Error("Only one amap component can exist");if(!t.__amap){var p=a.querySelector(".ec-extension-amap");p&&(r.style.left="0px",r.style.top="0px",a.removeChild(p)),p=document.createElement("div"),p.style.cssText="width:100%;height:100%",p.classList.add("ec-extension-amap"),a.appendChild(p);var i=t.__amap=new AMap.Map(p);new AMap.CustomLayer(r).setMap(i)}var i=t.__amap,s=t.get("center"),c=t.get("zoom");if(s&&c){var m=new AMap.LngLat(s[0],s[1]);i.setZoomAndCenter(c,m)}var f=t.get("mapStyle");f&&i.setMapStyle(f),o=new n(i,e),o.setMapOffset(t.__mapOffset||[0,0]),o.setZoom(c),o.setCenter(s),t.coordinateSystem=o}),t.eachSeries(function(t){"amap"===t.get("coordinateSystem")&&(t.coordinateSystem=o)})},t.exports=n},function(t,e,o){function n(t,e){return t&&e&&t[0]===e[0]&&t[1]===e[1]}t.exports=o(0).extendComponentModel({type:"amap",getAMap:function(){return this.__amap},setCenterAndZoom:function(t,e){this.option.center=t,this.option.zoom=e},centerOrZoomChanged:function(t,e){var o=this.option;return!(n(t,o.center)&&e===o.zoom)},defaultOption:{center:[116.397475,39.908695],zoom:4,mapStyle:void 0,roam:!1}})},function(t,e,o){t.exports=o(0).extendComponentView({type:"amap",render:function(t,e,o){function n(){a||o.dispatchAction({type:"amapRoam"})}var a=!0,r=t.getAMap(),p=o.getZr().painter.getViewportRoot(),i=t.coordinateSystem,s=function(e,n){if(!a){var r=p.parentNode.parentNode.parentNode,s=[-parseInt(r.style.left,10)||0,-parseInt(r.style.top,10)||0];p.style.left=s[0]+"px",p.style.top=s[1]+"px",i.setMapOffset(s),t.__mapOffset=s,o.dispatchAction({type:"amapRoam"})}};r.off("movestart",this._oldMoveHandler),r.off("zoomend",this._oldZoomEndHandler),r.off("moveend",this._oldZoomEndHandler),r.off("complete",n),r.on("movestart",s),r.on("zoomend",n),r.on("moveend",n),r.on("complete",n),this._oldMoveHandler=s,this._oldZoomEndHandler=n,a=!1}})},function(t,e,o){o(0).registerCoordinateSystem("amap",o(1)),o(2),o(3),o(0).registerAction({type:"amapRoam",event:"amapRoam",update:"updateLayout"},function(t,e){e.eachComponent("amap",function(t){var e=t.getAMap(),o=e.getCenter();t.setCenterAndZoom([o.lng,o.lat],e.getZoom())})}),t.exports={version:"1.0.0-rc1"}}])});
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t(require("echarts")):"function"==typeof define&&define.amd?define(["echarts"],t):"object"==typeof exports?exports.amap=t(require("echarts")):(e.echarts=e.echarts||{},e.echarts.amap=t(e.echarts))}(this,function(e){return function(e){function t(n){if(o[n])return o[n].exports;var a=o[n]={i:n,l:!1,exports:{}};return e[n].call(a.exports,a,a.exports,t),a.l=!0,a.exports}var o={};return t.m=e,t.c=o,t.i=function(e){return e},t.d=function(e,o,n){t.o(e,o)||Object.defineProperty(e,o,{configurable:!1,enumerable:!0,get:n})},t.n=function(e){var o=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(o,"a",o),o},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=4)}([function(t,o){t.exports=e},function(e,t,o){function n(e,t){this._amap=e,this.dimensions=["lng","lat"],this._mapOffset=[0,0],this._api=t}var a=o(0);n.prototype.dimensions=["lng","lat"],n.prototype.setZoom=function(e){this._zoom=e},n.prototype.setCenter=function(e){this._center=this._amap.lnglatToPixel(e)},n.prototype.setMapOffset=function(e){this._mapOffset=e},n.prototype.getAMap=function(){return this._amap},n.prototype.dataToPoint=function(e){var t=new AMap.LngLat(e[0],e[1]),o=this._amap.lngLatToContainer(t),n=this._mapOffset;return[o.x-n[0],o.y-n[1]]},n.prototype.pointToData=function(e){var t=this._mapOffset,e=this._amap.containerToLngLat({x:e[0]+t[0],y:e[1]+t[1]});return[e.lng,e.lat]},n.prototype.getViewRect=function(){var e=this._api;return new a.graphic.BoundingRect(0,0,e.getWidth(),e.getHeight())},n.prototype.getRoamTransform=function(){return a.matrix.create()};n.dimensions=n.prototype.dimensions,n.create=function(e,t){var o,a=t.getDom();e.eachComponent("amap",function(e){var r=t.getZr().painter.getViewportRoot();if("undefined"==typeof AMap)throw new Error("AMap api is not loaded");if(o)throw new Error("Only one amap component can exist");if(!e.__amap){var i=a.querySelector(".ec-extension-amap");i&&(r.style.left="0px",r.style.top="0px",a.removeChild(i)),i=document.createElement("div"),i.style.cssText="width:100%;height:100%",i.classList.add("ec-extension-amap"),a.appendChild(i);var p=e.get()||{},s=e.__amap=new AMap.Map(i,p),c=e.__layer=new AMap.CustomLayer(r);c.setMap(s)}var s=e.getAMap(),c=e.getLayer();c.hide();var f=s.getZoom(),m=s.getCenter();o=new n(s,t),o.setMapOffset(e.__mapOffset||[0,0]),o.setZoom(f),o.setCenter([m.lng,m.lat]),e.coordinateSystem=o,c.show()}),e.eachSeries(function(e){"amap"===e.get("coordinateSystem")&&(e.coordinateSystem=o)})},e.exports=n},function(e,t,o){function n(e,t){return e&&t&&e[0]===t[0]&&e[1]===t[1]}e.exports=o(0).extendComponentModel({type:"amap",getAMap:function(){return this.__amap},getLayer:function(){return this.__layer},setCenterAndZoom:function(e,t){this.option.center=e,this.option.zoom=t},centerOrZoomChanged:function(e,t){var o=this.option;return!(n(e,o.center)&&t===o.zoom)},defaultOption:{center:[116.397475,39.908695],zoom:4}})},function(e,t,o){function n(e,t,o){var n,a,r,i;return i=function(){n=!1,a&&(r.apply(o,a),a=!1)},r=function(){n?a=arguments:(e.apply(o,arguments),setTimeout(i,t),n=!0)}}e.exports=o(0).extendComponentView({type:"amap",render:function(e,t,o){function a(){i||o.dispatchAction({type:"amapRoam"})}function r(e){o.getZr().resize(),f.call(this,e)}var i=!0,p=e.getAMap(),s=o.getZr().painter.getViewportRoot(),c=e.coordinateSystem,f=function(t){if(!i){var n=s.parentNode.parentNode.parentNode,a=[-parseInt(n.style.left,10)||0,-parseInt(n.style.top,10)||0];s.style.left=a[0]+"px",s.style.top=a[1]+"px",c.setMapOffset(a),e.__mapOffset=a,o.dispatchAction({type:"amapRoam"})}},m=n(r,300,map);p.off("movestart",this._oldMoveHandler),p.off("zoomend",this._oldZoomEndHandler),p.off("moveend",this._oldZoomEndHandler),p.off("complete",this._oldZoomEndHandler),e.get("resizeEnable")&&p.off("resize",this._oldResizeHandler),p.on("movestart",f),p.on("zoomend",a),p.on("moveend",a),p.on("complete",a),e.get("resizeEnable")&&p.on("resize",m),this._oldMoveHandler=f,this._oldZoomEndHandler=a,this._oldResizeHandler=m,i=!1}})},function(e,t,o){o(0).registerCoordinateSystem("amap",o(1)),o(2),o(3),o(0).registerAction({type:"amapRoam",event:"amapRoam",update:"updateLayout"},function(e,t){t.eachComponent("amap",function(e){var t=e.getAMap(),o=t.getCenter();e.setCenterAndZoom([o.lng,o.lat],t.getZoom())})}),e.exports={version:"1.0.0-rc.3"}}])});
+//# sourceMappingURL=echarts-amap.min.js.map

index.js

@@ -1,1 +0,1 @@
-module.exports = require('./src/amap.js')
+module.exports = require('./dist/echarts-amap.min.js')

package.json

 {
   "name": "echarts-amap",
-  "version": "1.0.0-rc.1",
+  "version": "1.0.0-rc.3",
   "description": "\u0016an echarts extension to support AMap(http://lbs.amap.com/)",
   "main": "index.js",
   "scripts": {
+    "dev": "webpack-dev-server --open --hot",
     "build": "webpack -p",
@@ -27,4 +28,5 @@ "test": "echo \"Error: no test specified\" && exit 1"
   "devDependencies": {
-    "webpack": "^2.2.1"
+    "webpack": "^2.2.1",
+    "webpack-dev-server": "^2.4.1"
   }
 }

README.md

@@ -34,57 +34,45 @@ # ECharts Extension AMap
 
-    <!DOCTYPE html>
-    <html>
-      <head>
-        <meta charset="utf-8">
-        <title>Echarts plugin to support AMap</title>
-      </head>
-      <style media="screen">
-        html,body,#map {
-          margin:0;
-          padding: 0;
-          height: 100%;
-        }
-      </style>
-      <body>
-        <div id="map"></div>
+    <!-- external dependencies -->
+    <script src="http://webapi.amap.com/maps?v=1.3&key=YOUR_AMAP_API_KEY&plugin=AMap.CustomLayer"></script>
+    <script src="http://cdn.bootcss.com/echarts/3.4.0/echarts.min.js"></script>
 
-        <script src="http://webapi.amap.com/maps?v=1.3&key=YOUR_AMAP_API_KEY&plugin=AMap.CustomLayer"></script>
-        <script src="http://cdn.bootcss.com/echarts/3.4.0/echarts.min.js"></script>
-        <script src="node_modules/echarts-amap/dist/echarts-amap.min.js"></script>
-        <script type="text/javascript">
-          var echart = echarts.init(document.getElementById('map'))
-          echart.setOption({
-            amap: {
-              center: [116.397475,39.908695],
-              zoom: 5,
-              mapStyle: 'blue_night'
-            },
-            series: [{
-              type: 'effectScatter',
-              coordinateSystem: 'amap',
-              rippleEffect: {
-                brushType: 'stroke'
-              },
-              label: {
-                normal: {
-                  show: true,
-                  position: 'right',
-                  formatter: '{b}'
-                }
-              },
-              symbolSize: 20,
-              itemStyle: {
-                normal: {
-                  color: '#f44336'
-                }
-              },
-              data: [{
-                name: '首都',
-                value: [116.397475,39.908695]
-              }]
-            }]
-          })
-        </script>
-      </body>
-    </html>
+    <!-- import the extension -->
+    <script src="node_modules/echarts-amap/dist/echarts-amap.min.js"></script>
+
+    <script type="text/javascript">
+      var echart = echarts.init(document.getElementById('map'))
+      echart.setOption({
+        // use amap component
+        amap: {
+          center: [116.397475,39.908695],
+          zoom: 5,
+          mapStyle: 'blue_night'
+        },
+        // demo serie showing the capital BEIJING of our PRC :cn:
+        series: [{
+          type: 'effectScatter',
+          coordinateSystem: 'amap',
+          rippleEffect: {
+            brushType: 'stroke'
+          },
+          label: {
+            normal: {
+              show: true,
+              position: 'right',
+              formatter: '{b}'
+            }
+          },
+          symbolSize: 20,
+          itemStyle: {
+            normal: {
+              color: '#f44336'
+            }
+          },
+          data: [{
+            name: '首都',
+            value: [116.397475,39.908695]
+          }]
+        }]
+      })
+    </script>
   </body>
@@ -91,0 +79,0 @@ </html>

src/amap.js

@@ -24,3 +24,3 @@ /**
 module.exports = {
-  version: '1.0.0-rc1'
+  version: process.env.VERSION
 };

src/AMapCoordSys.js

@@ -69,3 +69,3 @@ var echarts = require('echarts');
     }
-    // Overlay = Overlay || createOverlayCtor();
+
     if (amapCoordSys) {
@@ -89,31 +89,23 @@ throw new Error('Only one amap component can exist');
       root.appendChild(amapRoot);
-      var amap = amapModel.__amap = new AMap.Map(amapRoot);
 
-      // var overlay = new Overlay(viewportRoot);
-      // amap.addOverlay(overlay);
-      var layer = new AMap.CustomLayer(viewportRoot);
+      var options = amapModel.get() || {};
+      var amap = amapModel.__amap = new AMap.Map(amapRoot, options);
+
+      var layer = amapModel.__layer = new AMap.CustomLayer(viewportRoot);
       layer.setMap(amap);
     }
-    var amap = amapModel.__amap;
+    var amap = amapModel.getAMap();
+    var layer = amapModel.getLayer();
+    layer.hide();
 
-    // Set amap options
-    // centerAndZoom before layout and render
-    var center = amapModel.get('center');
-    var zoom = amapModel.get('zoom');
-    if (center && zoom) {
-      var pt = new AMap.LngLat(center[0], center[1]);
-      amap.setZoomAndCenter(zoom, pt);
-    }
+    var zoom = amap.getZoom();
+    var center = amap.getCenter();
 
-    var mapStyle = amapModel.get('mapStyle');
-    if (mapStyle) {
-      amap.setMapStyle(mapStyle)
-    }
-
     amapCoordSys = new AMapCoordSys(amap, api);
     amapCoordSys.setMapOffset(amapModel.__mapOffset || [0, 0]);
     amapCoordSys.setZoom(zoom);
-    amapCoordSys.setCenter(center);
+    amapCoordSys.setCenter([center.lng, center.lat]);
 
     amapModel.coordinateSystem = amapCoordSys;
+    layer.show();
   });
@@ -120,0 +112,0 @@

src/AMapModel.js

@@ -13,2 +13,7 @@ function v2Equal(a, b) {
 
+  getLayer: function() {
+    // __layer is injected when creating BMapCoordSys
+    return this.__layer;
+  },
+
   setCenterAndZoom: function (center, zoom) {
@@ -27,6 +32,3 @@ this.option.center = center;
     zoom: 4,
-    // normal, blue_night, light, fresh, dark
-    mapStyle: undefined,
-    roam: false
   }
 });

src/AMapView.js

@@ -0,1 +1,29 @@
+function throttle(fn, time, context) {
+	var lock, args, wrapperFn, later;
+
+	later = function () {
+		// reset lock and call if queued
+		lock = false;
+		if (args) {
+			wrapperFn.apply(context, args);
+			args = false;
+		}
+	};
+
+	wrapperFn = function () {
+		if (lock) {
+			// called too soon, queue to call later
+			args = arguments;
+
+		} else {
+			// call and lock until later
+			fn.apply(context, arguments);
+			setTimeout(later, time);
+			lock = true;
+		}
+	};
+
+	return wrapperFn;
+}
+
 module.exports = require('echarts').extendComponentView({
@@ -10,3 +38,3 @@ type: 'amap',
     var coordSys = aMapModel.coordinateSystem;
-    var moveHandler = function (type, target) {
+    var moveHandler = function (e) {
       if (rendering) {
@@ -40,6 +68,14 @@ return;
 
+    function resizeHandler(e) {
+      api.getZr().resize();
+      moveHandler.call(this, e)
+    }
+
+    var throttledResizeHandler = throttle(resizeHandler, 300, map)
+
     amap.off('movestart', this._oldMoveHandler);
     amap.off('zoomend', this._oldZoomEndHandler);
     amap.off('moveend', this._oldZoomEndHandler);
-    amap.off('complete', zoomEndHandler)
+    amap.off('complete', this._oldZoomEndHandler);
+    aMapModel.get('resizeEnable') && amap.off('resize', this._oldResizeHandler);
 
@@ -49,6 +85,8 @@ amap.on('movestart', moveHandler);
     amap.on('moveend', zoomEndHandler);
-    amap.on('complete', zoomEndHandler)
+    amap.on('complete', zoomEndHandler);
+    aMapModel.get('resizeEnable') && amap.on('resize', throttledResizeHandler);
 
     this._oldMoveHandler = moveHandler;
     this._oldZoomEndHandler = zoomEndHandler;
+    this._oldResizeHandler = throttledResizeHandler;
 
@@ -55,0 +93,0 @@ // var roam = aMapModel.get('roam');

webpack.config.js

@@ -0,3 +1,6 @@
+var webpack = require('webpack');
+var packagejson = require('./package.json');
 var PROD = process.argv.indexOf('-p') >= 0;
 
+console.log('building package version ' + packagejson.version)
 module.exports = {
@@ -15,3 +18,9 @@ entry: {
     'echarts': 'echarts'
-  }
+  },
+  devtool: PROD ? '#source-map' : '#eval-source-map',
+  plugins: [
+    new webpack.DefinePlugin({
+      'process.env.VERSION': JSON.stringify(packagejson.version)
+    })
+  ]
 };

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Environment variable access

Supply chain risk

Package accesses environment variables, which may be a sign of credential stuffing or data theft.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

49784

increased by187.65%

Number of package files

13

increased by8.33%

Lines of code

280

increased by21.74%

Worsened metrics

Dev dependency count

2

increased by100%

Number of lines in readme file

92

decreased by-11.54%

Number of low supply chain risk alerts

1

increased byInfinity%

No dependency changes