Skip to content

Commit 42ad1aa

Browse files
committed
release 3.5.0
1 parent 3b955ba commit 42ad1aa

File tree

10 files changed

+46344
-36856
lines changed

10 files changed

+46344
-36856
lines changed

dist/echarts.common.js

Lines changed: 7770 additions & 5237 deletions
Large diffs are not rendered by default.

dist/echarts.common.min.js

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/echarts.js

Lines changed: 31405 additions & 27203 deletions
Large diffs are not rendered by default.

dist/echarts.min.js

Lines changed: 21 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/echarts.simple.js

Lines changed: 7096 additions & 4367 deletions
Large diffs are not rendered by default.

dist/echarts.simple.min.js

Lines changed: 10 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/extension/bmap.js

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,20 @@ return /******/ (function(modules) { // webpackBootstrap
103103
this._mapOffset = [0, 0];
104104

105105
this._api = api;
106+
107+
this._projection = new BMap.MercatorProjection();
106108
}
107109

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

112+
BMapCoordSys.prototype.setZoom = function (zoom) {
113+
this._zoom = zoom;
114+
};
115+
116+
BMapCoordSys.prototype.setCenter = function (center) {
117+
this._center = this._projection.lngLatToPoint(new BMap.Point(center[0], center[1]));
118+
};
119+
110120
BMapCoordSys.prototype.setMapOffset = function (mapOffset) {
111121
this._mapOffset = mapOffset;
112122
};
@@ -117,7 +127,16 @@ return /******/ (function(modules) { // webpackBootstrap
117127

118128
BMapCoordSys.prototype.dataToPoint = function (data) {
119129
var point = new BMap.Point(data[0], data[1]);
120-
// TODO pointToOverlayPixel is toooooooo slow, cache the transform
130+
// TODO mercator projection is toooooooo slow
131+
// var mercatorPoint = this._projection.lngLatToPoint(point);
132+
133+
// var width = this._api.getZr().getWidth();
134+
// var height = this._api.getZr().getHeight();
135+
// var divider = Math.pow(2, 18 - 10);
136+
// return [
137+
// Math.round((mercatorPoint.x - this._center.x) / divider + width / 2),
138+
// Math.round((this._center.y - mercatorPoint.y) / divider + height / 2)
139+
// ];
121140
var px = this._bmap.pointToOverlayPixel(point);
122141
var mapOffset = this._mapOffset;
123142
return [px.x - mapOffset[0], px.y - mapOffset[1]];
@@ -217,6 +236,9 @@ return /******/ (function(modules) { // webpackBootstrap
217236

218237
bmapCoordSys = new BMapCoordSys(bmap, api);
219238
bmapCoordSys.setMapOffset(bmapModel.__mapOffset || [0, 0]);
239+
bmapCoordSys.setZoom(zoom);
240+
bmapCoordSys.setCenter(center);
241+
220242
bmapModel.coordinateSystem = bmapCoordSys;
221243
});
222244

dist/extension/bmap.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "echarts",
3-
"version": "3.4.0",
3+
"version": "3.5.0",
44
"description": "A powerful charting and visualization library for browser",
55
"keywords": [
66
"visualization",
@@ -35,7 +35,7 @@
3535
"prepublish": "node build/amd2common.js"
3636
},
3737
"dependencies": {
38-
"zrender": "^3.3.0"
38+
"zrender": "^3.4.0"
3939
},
4040
"devDependencies": {
4141
"coordtransform": "^2.0.2",
@@ -45,6 +45,6 @@
4545
"fs-extra": "^0.26.5",
4646
"glob": "^7.0.0",
4747
"webpack": "^1.12.13",
48-
"zrender": "^3.2.2"
48+
"zrender": "^3.4.0"
4949
}
5050
}

src/echarts.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1508,9 +1508,9 @@ define(function (require) {
15081508
/**
15091509
* @type {number}
15101510
*/
1511-
version: '3.4.0',
1511+
version: '3.5.0',
15121512
dependencies: {
1513-
zrender: '3.3.0'
1513+
zrender: '3.4.0'
15141514
}
15151515
};
15161516

0 commit comments

Comments
 (0)