Skip to content

Commit 3f719fe

Browse files
wuzhuorui5wuzhuorui5
committed
fixed Route遗留的相关问题 & 增加UT reviewBy zhurc
1 parent e463dc1 commit 3f719fe

File tree

13 files changed

+371
-149
lines changed

13 files changed

+371
-149
lines changed

‎dist/iclient-classic.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7751,7 +7751,7 @@ var TokenServiceParameter = function () {
77517751

77527752

77537753
/**
7754-
* @member SuperMap.TokenServiceParameter.prototype.referer -{string}
7754+
* @member SuperMap.TokenServiceParameter.prototype.ip -{string}
77557755
* @description clientType=Referer 时，必选。如果按照指定 URL 的方式申请令牌，则传递相应的 URL。
77567756
*/
77577757

‎dist/iclient9-leaflet.js‎

Lines changed: 38 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -9116,7 +9116,7 @@ var Collection = _SuperMap2["default"].Geometry.Collection;
91169116
* @class SuperMap.Route
91179117
* @classdesc
91189118
* 路由对象类。路由对象为一系列有序的带有属性值 M 的 x，y 坐标对，其中 M 值为该结点的距离属性（到已知点的距离）。
9119-
* @param points - {Array} 形成路由对象的线数组。
9119+
* @param points - {{Array<SuperMap.Geometry>}} 形成路由对象的线数组。
91209120
* @param options - {Object} 可选参数。如:</br>
91219121
* id - {number}路由对象在数据库中的id。</br>
91229122
* length - {number}路由对象的长度。</br>
@@ -9130,47 +9130,31 @@ var Route = function (_Collection) {
91309130
_inherits(Route, _Collection);
91319131

91329132
/**
9133-
* @member SuperMap.Route.prototype.components -{Array<SuperMap.Geometry>}
9134-
* @description 存储几何对象的数组。
9133+
* @member SuperMap.Route.prototype.type -{string}
9134+
* @description 服务端几何对象类型。
91359135
*/
91369136

91379137

91389138
/**
9139-
* @member SuperMap.Route.prototype.points -{Array<Object>}
9140-
* @description 路由对象的所有路由点。
9141-
* @example
9142-
* (start code)
9143-
* [
9144-
* {
9145-
* "measure": 0,
9146-
* "y": -4377.027184298267,
9147-
* "x": 4020.0045221720466
9148-
* },
9149-
* {
9150-
* "measure": 37.33288381391519,
9151-
* "y": -4381.569363260499,
9152-
* "x": 4057.0600591960642
9153-
* }
9154-
* ]
9155-
* (end)
9139+
* @member SuperMap.Route.prototype.parts -{Array<number>}
9140+
* @description 服务端几何对象中各个子对象所包含的节点个数。
91569141
*/
91579142

91589143

91599144
/**
9160-
* @member SuperMap.Route.prototype.minM -{number}
9161-
* @description 最小线性度量值，即所有结点到起始点的量算距离中最小值。
9145+
* @member SuperMap.Route.prototype.maxM -{number}
9146+
* @description 最大线性度量值，即所有结点到起始点的量算距离中最大值。
91629147
*/
91639148

91649149

91659150
/**
9166-
* @member SuperMap.Route.prototype.length -{number}
9167-
* @description 路由对象的长度。
9168-
* 单位与数据集的单位相同。
9151+
* @member SuperMap.Route.prototype.style -{string}
91699152
*/
91709153

91719154

91729155
/**
9173-
* @member SuperMap.Route.prototype.center -{number}
9156+
* @member SuperMap.Route.prototype.id -{number}
9157+
* @description 路由对象在数据库中的id。
91749158
*/
91759159
function Route(points, options) {
91769160
_classCallCheck(this, Route);
@@ -9186,7 +9170,6 @@ var Route = function (_Collection) {
91869170
_this.parts = null;
91879171
_this.points = null;
91889172
_this.type = null;
9189-
_this.components = null;
91909173
_this.componentTypes = ["SuperMap.Geometry.LinearRing", "SuperMap.Geometry.LineString"];
91919174
_this.CLASS_NAME = "SuperMap.Route";
91929175

@@ -9209,31 +9192,41 @@ var Route = function (_Collection) {
92099192

92109193

92119194
/**
9212-
* @member SuperMap.Route.prototype.type -{string}
9213-
* @description 服务端几何对象类型。
9214-
*/
9215-
9216-
9217-
/**
9218-
* @member SuperMap.Route.prototype.parts -{Array<number>}
9219-
* @description 服务端几何对象中各个子对象所包含的节点个数。
9195+
* @member SuperMap.Route.prototype.points -{Array<Object>}
9196+
* @description 路由对象的所有路由点。
9197+
* @example
9198+
* (start code)
9199+
* [
9200+
* {
9201+
* "measure": 0,
9202+
* "y": -4377.027184298267,
9203+
* "x": 4020.0045221720466
9204+
* },
9205+
* {
9206+
* "measure": 37.33288381391519,
9207+
* "y": -4381.569363260499,
9208+
* "x": 4057.0600591960642
9209+
* }
9210+
* ]
9211+
* (end)
92209212
*/
92219213

92229214

92239215
/**
9224-
* @member SuperMap.Route.prototype.maxM -{number}
9225-
* @description 最大线性度量值，即所有结点到起始点的量算距离中最大值。
9216+
* @member SuperMap.Route.prototype.minM -{number}
9217+
* @description 最小线性度量值，即所有结点到起始点的量算距离中最小值。
92269218
*/
92279219

92289220

92299221
/**
9230-
* @member SuperMap.Route.prototype.style -{string}
9222+
* @member SuperMap.Route.prototype.length -{number}
9223+
* @description 路由对象的长度。
9224+
* 单位与数据集的单位相同。
92319225
*/
92329226

92339227

92349228
/**
9235-
* @member SuperMap.Route.prototype.id -{number}
9236-
* @description 路由对象在数据库中的id。
9229+
* @member SuperMap.Route.prototype.center -{number}
92379230
*/
92389231

92399232

@@ -9301,9 +9294,9 @@ var Route = function (_Collection) {
93019294
me.minM = null;
93029295
me.type = null;
93039296
me.parts = null;
9304-
this.components.length = 0;
9305-
this.components = null;
9306-
this.componentTypes = null;
9297+
me.components.length = 0;
9298+
me.components = null;
9299+
me.componentTypes = null;
93079300
}
93089301

93099302
/**
@@ -51324,7 +51317,7 @@ var TokenServiceParameter = function () {
5132451317

5132551318

5132651319
/**
51327-
* @member SuperMap.TokenServiceParameter.prototype.referer -{string}
51320+
* @member SuperMap.TokenServiceParameter.prototype.ip -{string}
5132851321
* @description clientType=Referer 时，必选。如果按照指定 URL 的方式申请令牌，则传递相应的 URL。
5132951322
*/
5133051323

@@ -62658,7 +62651,7 @@ eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a
6265862651
/* 385 */
6265962652
/***/ (function(module, exports) {
6266062653

62661-
module.exports = {"_args":[[{"raw":"proj4@2.3.15","scope":null,"escapedName":"proj4","name":"proj4","rawSpec":"2.3.15","spec":"2.3.15","type":"version"},"E:\\git\\iClient9"]],"_from":"proj4@2.3.15","_id":"proj4@2.3.15","_inCache":true,"_location":"/proj4","_nodeVersion":"6.1.0","_npmOperationalInternal":{"host":"packages-12-west.internal.npmjs.com","tmp":"tmp/proj4-2.3.15.tgz_1471808262546_0.6752060337457806"},"_npmUser":{"name":"ahocevar","email":"andreas.hocevar@gmail.com"},"_npmVersion":"3.8.6","_phantomChildren":{},"_requested":{"raw":"proj4@2.3.15","scope":null,"escapedName":"proj4","name":"proj4","rawSpec":"2.3.15","spec":"2.3.15","type":"version"},"_requiredBy":["/"],"_resolved":"https://registry.npmjs.org/proj4/-/proj4-2.3.15.tgz","_shasum":"5ad06e8bca30be0ffa389a49e4565f51f06d089e","_shrinkwrap":null,"_spec":"proj4@2.3.15","_where":"E:\\git\\iClient9","author":"","bugs":{"url":"https://github.com/proj4js/proj4js/issues"},"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"},"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"},"dist":{"shasum":"5ad06e8bca30be0ffa389a49e4565f51f06d089e","tarball":"https://registry.npmjs.org/proj4/-/proj4-2.3.15.tgz"},"gitHead":"9fa5249c1f4183d5ddee3c4793dfd7b9f29f1886","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","maintainers":[{"name":"cwmma","email":"calvin.metcalf@gmail.com"},{"name":"ahocevar","email":"andreas.hocevar@gmail.com"}],"name":"proj4","optionalDependencies":{},"readme":"ERROR: No README data found!","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"}
62654+
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"}
6266262655

6266362656
/***/ }),
6266462657
/* 386 */

‎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: 37 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -7075,7 +7075,7 @@ var Collection = _SuperMap2.default.Geometry.Collection;
70757075
* @class SuperMap.Route
70767076
* @classdesc
70777077
* 路由对象类。路由对象为一系列有序的带有属性值 M 的 x，y 坐标对，其中 M 值为该结点的距离属性（到已知点的距离）。
7078-
* @param points - {Array} 形成路由对象的线数组。
7078+
* @param points - {{Array<SuperMap.Geometry>}} 形成路由对象的线数组。
70797079
* @param options - {Object} 可选参数。如:</br>
70807080
* id - {number}路由对象在数据库中的id。</br>
70817081
* length - {number}路由对象的长度。</br>
@@ -7089,47 +7089,31 @@ var Route = function (_Collection) {
70897089
_inherits(Route, _Collection);
70907090

70917091
/**
7092-
* @member SuperMap.Route.prototype.components -{Array<SuperMap.Geometry>}
7093-
* @description 存储几何对象的数组。
7092+
* @member SuperMap.Route.prototype.type -{string}
7093+
* @description 服务端几何对象类型。
70947094
*/
70957095

70967096

70977097
/**
7098-
* @member SuperMap.Route.prototype.points -{Array<Object>}
7099-
* @description 路由对象的所有路由点。
7100-
* @example
7101-
* (start code)
7102-
* [
7103-
* {
7104-
* "measure": 0,
7105-
* "y": -4377.027184298267,
7106-
* "x": 4020.0045221720466
7107-
* },
7108-
* {
7109-
* "measure": 37.33288381391519,
7110-
* "y": -4381.569363260499,
7111-
* "x": 4057.0600591960642
7112-
* }
7113-
* ]
7114-
* (end)
7098+
* @member SuperMap.Route.prototype.parts -{Array<number>}
7099+
* @description 服务端几何对象中各个子对象所包含的节点个数。
71157100
*/
71167101

71177102

71187103
/**
7119-
* @member SuperMap.Route.prototype.minM -{number}
7120-
* @description 最小线性度量值，即所有结点到起始点的量算距离中最小值。
7104+
* @member SuperMap.Route.prototype.maxM -{number}
7105+
* @description 最大线性度量值，即所有结点到起始点的量算距离中最大值。
71217106
*/
71227107

71237108

71247109
/**
7125-
* @member SuperMap.Route.prototype.length -{number}
7126-
* @description 路由对象的长度。
7127-
* 单位与数据集的单位相同。
7110+
* @member SuperMap.Route.prototype.style -{string}
71287111
*/
71297112

71307113

71317114
/**
7132-
* @member SuperMap.Route.prototype.center -{number}
7115+
* @member SuperMap.Route.prototype.id -{number}
7116+
* @description 路由对象在数据库中的id。
71337117
*/
71347118
function Route(points, options) {
71357119
_classCallCheck(this, Route);
@@ -7145,7 +7129,6 @@ var Route = function (_Collection) {
71457129
_this.parts = null;
71467130
_this.points = null;
71477131
_this.type = null;
7148-
_this.components = null;
71497132
_this.componentTypes = ["SuperMap.Geometry.LinearRing", "SuperMap.Geometry.LineString"];
71507133
_this.CLASS_NAME = "SuperMap.Route";
71517134

@@ -7168,31 +7151,41 @@ var Route = function (_Collection) {
71687151

71697152

71707153
/**
7171-
* @member SuperMap.Route.prototype.type -{string}
7172-
* @description 服务端几何对象类型。
7173-
*/
7174-
7175-
7176-
/**
7177-
* @member SuperMap.Route.prototype.parts -{Array<number>}
7178-
* @description 服务端几何对象中各个子对象所包含的节点个数。
7154+
* @member SuperMap.Route.prototype.points -{Array<Object>}
7155+
* @description 路由对象的所有路由点。
7156+
* @example
7157+
* (start code)
7158+
* [
7159+
* {
7160+
* "measure": 0,
7161+
* "y": -4377.027184298267,
7162+
* "x": 4020.0045221720466
7163+
* },
7164+
* {
7165+
* "measure": 37.33288381391519,
7166+
* "y": -4381.569363260499,
7167+
* "x": 4057.0600591960642
7168+
* }
7169+
* ]
7170+
* (end)
71797171
*/
71807172

71817173

71827174
/**
7183-
* @member SuperMap.Route.prototype.maxM -{number}
7184-
* @description 最大线性度量值，即所有结点到起始点的量算距离中最大值。
7175+
* @member SuperMap.Route.prototype.minM -{number}
7176+
* @description 最小线性度量值，即所有结点到起始点的量算距离中最小值。
71857177
*/
71867178

71877179

71887180
/**
7189-
* @member SuperMap.Route.prototype.style -{string}
7181+
* @member SuperMap.Route.prototype.length -{number}
7182+
* @description 路由对象的长度。
7183+
* 单位与数据集的单位相同。
71907184
*/
71917185

71927186

71937187
/**
7194-
* @member SuperMap.Route.prototype.id -{number}
7195-
* @description 路由对象在数据库中的id。
7188+
* @member SuperMap.Route.prototype.center -{number}
71967189
*/
71977190

71987191

@@ -7260,9 +7253,9 @@ var Route = function (_Collection) {
72607253
me.minM = null;
72617254
me.type = null;
72627255
me.parts = null;
7263-
this.components.length = 0;
7264-
this.components = null;
7265-
this.componentTypes = null;
7256+
me.components.length = 0;
7257+
me.components = null;
7258+
me.componentTypes = null;
72667259
}
72677260

72687261
/**
@@ -37744,7 +37737,7 @@ var TokenServiceParameter = function () {
3774437737

3774537738

3774637739
/**
37747-
* @member SuperMap.TokenServiceParameter.prototype.referer -{string}
37740+
* @member SuperMap.TokenServiceParameter.prototype.ip -{string}
3774837741
* @description clientType=Referer 时，必选。如果按照指定 URL 的方式申请令牌，则传递相应的 URL。
3774937742
*/
3775037743

‎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)