Skip to content

Commit

Permalink
release 3.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
100pah committed Mar 24, 2017
1 parent 3b955ba commit 42ad1aa
Show file tree
Hide file tree
Showing 10 changed files with 46,344 additions and 36,856 deletions.
13,007 changes: 7,770 additions & 5,237 deletions dist/echarts.common.js

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions dist/echarts.common.min.js

Large diffs are not rendered by default.

58,608 changes: 31,405 additions & 27,203 deletions dist/echarts.js

Large diffs are not rendered by default.

41 changes: 21 additions & 20 deletions dist/echarts.min.js

Large diffs are not rendered by default.

11,463 changes: 7,096 additions & 4,367 deletions dist/echarts.simple.js

Large diffs are not rendered by default.

19 changes: 10 additions & 9 deletions dist/echarts.simple.min.js

Large diffs are not rendered by default.

24 changes: 23 additions & 1 deletion dist/extension/bmap.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,20 @@ return /******/ (function(modules) { // webpackBootstrap
this._mapOffset = [0, 0];

this._api = api;

this._projection = new BMap.MercatorProjection();
}

BMapCoordSys.prototype.dimensions = ['lng', 'lat'];

BMapCoordSys.prototype.setZoom = function (zoom) {
this._zoom = zoom;
};

BMapCoordSys.prototype.setCenter = function (center) {
this._center = this._projection.lngLatToPoint(new BMap.Point(center[0], center[1]));
};

BMapCoordSys.prototype.setMapOffset = function (mapOffset) {
this._mapOffset = mapOffset;
};
Expand All @@ -117,7 +127,16 @@ return /******/ (function(modules) { // webpackBootstrap

BMapCoordSys.prototype.dataToPoint = function (data) {
var point = new BMap.Point(data[0], data[1]);
// TODO pointToOverlayPixel is toooooooo slow, cache the transform
// TODO mercator projection is toooooooo slow
// var mercatorPoint = this._projection.lngLatToPoint(point);

// var width = this._api.getZr().getWidth();
// var height = this._api.getZr().getHeight();
// var divider = Math.pow(2, 18 - 10);
// return [
// Math.round((mercatorPoint.x - this._center.x) / divider + width / 2),
// Math.round((this._center.y - mercatorPoint.y) / divider + height / 2)
// ];
var px = this._bmap.pointToOverlayPixel(point);
var mapOffset = this._mapOffset;
return [px.x - mapOffset[0], px.y - mapOffset[1]];
Expand Down Expand Up @@ -217,6 +236,9 @@ return /******/ (function(modules) { // webpackBootstrap

bmapCoordSys = new BMapCoordSys(bmap, api);
bmapCoordSys.setMapOffset(bmapModel.__mapOffset || [0, 0]);
bmapCoordSys.setZoom(zoom);
bmapCoordSys.setCenter(center);

bmapModel.coordinateSystem = bmapCoordSys;
});

Expand Down
2 changes: 1 addition & 1 deletion dist/extension/bmap.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "echarts",
"version": "3.4.0",
"version": "3.5.0",
"description": "A powerful charting and visualization library for browser",
"keywords": [
"visualization",
Expand Down Expand Up @@ -35,7 +35,7 @@
"prepublish": "node build/amd2common.js"
},
"dependencies": {
"zrender": "^3.3.0"
"zrender": "^3.4.0"
},
"devDependencies": {
"coordtransform": "^2.0.2",
Expand All @@ -45,6 +45,6 @@
"fs-extra": "^0.26.5",
"glob": "^7.0.0",
"webpack": "^1.12.13",
"zrender": "^3.2.2"
"zrender": "^3.4.0"
}
}
4 changes: 2 additions & 2 deletions src/echarts.js
Original file line number Diff line number Diff line change
Expand Up @@ -1508,9 +1508,9 @@ define(function (require) {
/**
* @type {number}
*/
version: '3.4.0',
version: '3.5.0',
dependencies: {
zrender: '3.3.0'
zrender: '3.4.0'
}
};

Expand Down

0 comments on commit 42ad1aa

Please sign in to comment.