Skip to content

Commit 14eb4d4

Browse files
zhurczhurc
committed
fix WKT格式转换错误
1 parent 0913d67 commit 14eb4d4

File tree

7 files changed

+182
-86
lines changed

7 files changed

+182
-86
lines changed

‎dist/iclient9-leaflet.js‎

Lines changed: 129 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34339,6 +34339,11 @@ var EchartsLayer = exports.EchartsLayer = _leaflet2["default"].Layer.extend({
3433934339
this._ec.setOption(this._echartsOptions);
3434034340
},
3434134341

34342+
onRemove: function onRemove(map) {
34343+
// 销毁echarts实例
34344+
this._ec.dispose();
34345+
},
34346+
3434234347
_initEchartsContainer: function _initEchartsContainer() {
3434334348
var size = this._map.getSize();
3434434349
var _div = document.createElement('div');
@@ -34653,13 +34658,13 @@ var MapVLayer = exports.MapVLayer = _leaflet2["default"].Layer.extend({
3465334658
this.fire("loaded");
3465434659
},
3465534660

34656-
_hide: function _hide() {
34657-
this.canvas.style.display = 'none';
34658-
},
34661+
// _hide: function () {
34662+
// this.canvas.style.display = 'none';
34663+
// },
3465934664

34660-
_show: function _show() {
34661-
this.canvas.style.display = 'block';
34662-
},
34665+
// _show: function () {
34666+
// this.canvas.style.display = 'block';
34667+
// },
3466334668

3466434669
/**
3466534670
* @private
@@ -34669,11 +34674,12 @@ var MapVLayer = exports.MapVLayer = _leaflet2["default"].Layer.extend({
3466934674
*/
3467034675
onRemove: function onRemove(map) {
3467134676
_leaflet2["default"].DomUtil.remove(this.container);
34672-
map.off({
34673-
moveend: this.draw,
34674-
zoomstart: this._hide,
34675-
zoomend: this._show
34676-
}, this);
34677+
// map.off({
34678+
// moveend: this.draw,
34679+
// zoomstart: this._hide,
34680+
// zoomend: this._show
34681+
// }, this);
34682+
this.renderer.unbindEvent();
3467734683
},
3467834684

3467934685
/**
@@ -40805,7 +40811,7 @@ var WKT = function (_Format) {
4080540811
var wktArray = _SuperMap2["default"].String.trim(str).split('|');
4080640812
var components = [];
4080740813
for (var i = 0, len = wktArray.length; i < len; ++i) {
40808-
components.push(WKT.read(wktArray[i]));
40814+
components.push(this.read(wktArray[i]));
4080940815
}
4081040816
return components;
4081140817
}
@@ -86620,9 +86626,9 @@ var MapVRenderer = function (_BaseLayer) {
8662086626
_this.canvasLayer = layer;
8662186627
_this.clickEvent = _this.clickEvent.bind(_this);
8662286628
_this.mousemoveEvent = _this.mousemoveEvent.bind(_this);
86623-
_this.map.on('movestart', _this.moveStartEvent.bind(_this));
86624-
_this.map.on('moveend', _this.moveEndEvent.bind(_this));
86625-
_this.map.on('zoomstart', _this.zoomStartEvent.bind(_this));
86629+
_this._moveStartEvent = _this.moveStartEvent.bind(_this);
86630+
_this._moveEndEvent = _this.moveEndEvent.bind(_this);
86631+
_this._zoomstart = _this.zoomStartEvent.bind(_this);
8662686632
_this.bindEvent();
8662786633
return _this;
8662886634
}
@@ -86673,6 +86679,9 @@ var MapVRenderer = function (_BaseLayer) {
8667386679
map.on('mousemove', this.mousemoveEvent);
8667486680
}
8667586681
}
86682+
this.map.on('movestart', this._moveStartEvent);
86683+
this.map.on('moveend', this._moveEndEvent);
86684+
this.map.on('zoomstart', this._zoomstart);
8667686685
}
8667786686

8667886687
/**
@@ -86694,6 +86703,9 @@ var MapVRenderer = function (_BaseLayer) {
8669486703
map.off('mousemove', this.mousemoveEvent);
8669586704
}
8669686705
}
86706+
this.map.off('movestart', this._moveStartEvent);
86707+
this.map.off('moveend', this._moveEndEvent);
86708+
this.map.off('zoomstart', this._zoomStartEvent);
8669786709
}
8669886710

8669986711
/**
@@ -94657,7 +94669,108 @@ exports.names = ["Van_der_Grinten_I", "VanDerGrinten", "vandg"];
9465794669
/* 471 */
9465894670
/***/ (function(module, exports) {
9465994671

94660-
module.exports = {"_from":"proj4@2.3.15","_id":"proj4@2.3.15","_inBundle":false,"_integrity":"sha1-WtBui8owvg/6OJpJ5FZfUfBtCJ4=","_location":"/proj4","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"proj4@2.3.15","name":"proj4","escapedName":"proj4","rawSpec":"2.3.15","saveSpec":null,"fetchSpec":"2.3.15"},"_requiredBy":["/"],"_resolved":"https://registry.npmjs.org/proj4/-/proj4-2.3.15.tgz","_shasum":"5ad06e8bca30be0ffa389a49e4565f51f06d089e","_spec":"proj4@2.3.15","_where":"G:\\iClient9","author":"","bugs":{"url":"https://github.com/proj4js/proj4js/issues"},"bundleDependencies":false,"contributors":[{"name":"Mike Adair","email":"madair@dmsolutions.ca"},{"name":"Richard Greenwood","email":"rich@greenwoodmap.com"},{"name":"Calvin Metcalf","email":"calvin.metcalf@gmail.com"},{"name":"Richard Marsden","url":"http://www.winwaed.com"},{"name":"T. Mittan"},{"name":"D. Steinwand"},{"name":"S. Nelson"}],"dependencies":{"mgrs":"~0.0.2"},"deprecated":false,"description":"Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.","devDependencies":{"browserify":"~12.0.1","chai":"~1.8.1","curl":"git://github.com/cujojs/curl.git","grunt":"~0.4.2","grunt-browserify":"~4.0.1","grunt-cli":"~0.1.13","grunt-contrib-connect":"~0.6.0","grunt-contrib-jshint":"~0.8.0","grunt-contrib-uglify":"~0.11.1","grunt-mocha-phantomjs":"~0.4.0","istanbul":"~0.2.4","mocha":"~1.17.1","tin":"~0.4.0"},"directories":{"test":"test","doc":"docs"},"homepage":"https://github.com/proj4js/proj4js#readme","jam":{"main":"dist/proj4.js","include":["dist/proj4.js","README.md","AUTHORS","LICENSE.md"]},"license":"MIT","main":"lib/index.js","name":"proj4","repository":{"type":"git","url":"git://github.com/proj4js/proj4js.git"},"scripts":{"test":"./node_modules/istanbul/lib/cli.js test ./node_modules/mocha/bin/_mocha test/test.js"},"version":"2.3.15"}
94672+
module.exports = {
94673+
"_from": "proj4@2.3.15",
94674+
"_id": "proj4@2.3.15",
94675+
"_inBundle": false,
94676+
"_integrity": "sha1-WtBui8owvg/6OJpJ5FZfUfBtCJ4=",
94677+
"_location": "/proj4",
94678+
"_phantomChildren": {},
94679+
"_requested": {
94680+
"type": "version",
94681+
"registry": true,
94682+
"raw": "proj4@2.3.15",
94683+
"name": "proj4",
94684+
"escapedName": "proj4",
94685+
"rawSpec": "2.3.15",
94686+
"saveSpec": null,
94687+
"fetchSpec": "2.3.15"
94688+
},
94689+
"_requiredBy": [
94690+
"/"
94691+
],
94692+
"_resolved": "http://registry.npm.taobao.org/proj4/download/proj4-2.3.15.tgz",
94693+
"_shasum": "5ad06e8bca30be0ffa389a49e4565f51f06d089e",
94694+
"_spec": "proj4@2.3.15",
94695+
"_where": "F:\\dev\\iClient",
94696+
"author": "",
94697+
"bugs": {
94698+
"url": "https://github.com/proj4js/proj4js/issues"
94699+
},
94700+
"bundleDependencies": false,
94701+
"contributors": [
94702+
{
94703+
"name": "Mike Adair",
94704+
"email": "madair@dmsolutions.ca"
94705+
},
94706+
{
94707+
"name": "Richard Greenwood",
94708+
"email": "rich@greenwoodmap.com"
94709+
},
94710+
{
94711+
"name": "Calvin Metcalf",
94712+
"email": "calvin.metcalf@gmail.com"
94713+
},
94714+
{
94715+
"name": "Richard Marsden",
94716+
"url": "http://www.winwaed.com"
94717+
},
94718+
{
94719+
"name": "T. Mittan"
94720+
},
94721+
{
94722+
"name": "D. Steinwand"
94723+
},
94724+
{
94725+
"name": "S. Nelson"
94726+
}
94727+
],
94728+
"dependencies": {
94729+
"mgrs": "~0.0.2"
94730+
},
94731+
"deprecated": false,
94732+
"description": "Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.",
94733+
"devDependencies": {
94734+
"browserify": "~12.0.1",
94735+
"chai": "~1.8.1",
94736+
"curl": "git://github.com/cujojs/curl.git",
94737+
"grunt": "~0.4.2",
94738+
"grunt-browserify": "~4.0.1",
94739+
"grunt-cli": "~0.1.13",
94740+
"grunt-contrib-connect": "~0.6.0",
94741+
"grunt-contrib-jshint": "~0.8.0",
94742+
"grunt-contrib-uglify": "~0.11.1",
94743+
"grunt-mocha-phantomjs": "~0.4.0",
94744+
"istanbul": "~0.2.4",
94745+
"mocha": "~1.17.1",
94746+
"tin": "~0.4.0"
94747+
},
94748+
"directories": {
94749+
"test": "test",
94750+
"doc": "docs"
94751+
},
94752+
"homepage": "https://github.com/proj4js/proj4js#readme",
94753+
"jam": {
94754+
"main": "dist/proj4.js",
94755+
"include": [
94756+
"dist/proj4.js",
94757+
"README.md",
94758+
"AUTHORS",
94759+
"LICENSE.md"
94760+
]
94761+
},
94762+
"license": "MIT",
94763+
"main": "lib/index.js",
94764+
"name": "proj4",
94765+
"repository": {
94766+
"type": "git",
94767+
"url": "git://github.com/proj4js/proj4js.git"
94768+
},
94769+
"scripts": {
94770+
"test": "./node_modules/istanbul/lib/cli.js test ./node_modules/mocha/bin/_mocha test/test.js"
94771+
},
94772+
"version": "2.3.15"
94773+
};
9466194774

9466294775
/***/ }),
9466394776
/* 472 */

‎dist/iclient9-leaflet.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.

‎dist/iclient9-mapboxgl.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33920,7 +33920,7 @@ var WKT = function (_Format) {
3392033920
var wktArray = _SuperMap2.default.String.trim(str).split('|');
3392133921
var components = [];
3392233922
for (var i = 0, len = wktArray.length; i < len; ++i) {
33923-
components.push(WKT.read(wktArray[i]));
33923+
components.push(this.read(wktArray[i]));
3392433924
}
3392533925
return components;
3392633926
}

‎dist/iclient9-mapboxgl.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.

0 commit comments

Comments
 (0)