Skip to content

Commit 8a81cf2

Browse files
songyumengsongyumeng
committed
fix leaflet表面分析里程定点等不可用问题
1 parent c5e9ecf commit 8a81cf2

12 files changed

Lines changed: 17881 additions & 17849 deletions

‎dist/iclient9-leaflet.js‎

Lines changed: 17803 additions & 17785 deletions
Large diffs are not rendered by default.

‎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-openlayers.js‎

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1932,7 +1932,13 @@ var GeoJSON = function (_JSONFormat) {
19321932
* @return {Array} 一个表示一个点的坐标组。
19331933
*/
19341934
'point': function point(_point) {
1935-
return [_point.x, _point.y];
1935+
var p = [_point.x, _point.y];
1936+
for (var name in _point) {
1937+
if (name !== "x" && name !== "y") {
1938+
p.push(_point[name]);
1939+
}
1940+
}
1941+
return p;
19361942
},
19371943

19381944
/**
@@ -2473,7 +2479,8 @@ var GeoJSON = function (_JSONFormat) {
24732479
for (var j = 0; j < geoParts[i]; j++) {
24742480
pointList.push({
24752481
x: parseFloat(geoPoints[pointIndex + j].x),
2476-
y: parseFloat(geoPoints[pointIndex + j].y)
2482+
y: parseFloat(geoPoints[pointIndex + j].y),
2483+
measure: parseFloat(geoPoints[pointIndex + j].measure)
24772484
});
24782485
}
24792486
pointIndex += geoParts[i];
@@ -2691,6 +2698,8 @@ var SpatialAnalystBase = function (_CommonServiceBase) {
26912698
}
26922699
} else if (result.recordset && result.recordset.features) {
26932700
result.recordset.features = JSON.parse(geoJSONFormat.write(result.recordset.features));
2701+
} else if (result.resultGeometry) {
2702+
result.resultGeometry = JSON.parse(geoJSONFormat.write(result.resultGeometry));
26942703
}
26952704

26962705
return result;
@@ -17857,8 +17866,8 @@ var SpatialAnalystService = function (_ServiceBase) {
1785717866
if (params.extractRegion) {
1785817867
params.extractRegion = this.convertGeometry(params.extractRegion);
1785917868
}
17860-
if (params.clipRegion) {
17861-
params.clipRegion = this.convertGeometry(params.clipRegion);
17869+
if (params.extractParameter && params.extractParameter.clipRegion) {
17870+
params.extractParameter.clipRegion = this.convertGeometry(params.extractParameter.clipRegion);
1786217871
}
1786317872
if (params.sourceGeometry) {
1786417873
params.sourceGeometry = this.convertGeometry(params.sourceGeometry);
@@ -24026,6 +24035,9 @@ var DatasetSurfaceAnalystParameters = function (_SurfaceAnalystParame) {
2402624035
tempObj.filterQueryParameter = datasetSurfaceAnalystParameters.filterQueryParameter;
2402724036
}
2402824037
if (name === "extractParameter") {
24038+
if (datasetSurfaceAnalystParameters.extractParameter.clipRegion instanceof _SuperMap2.default.Geometry && datasetSurfaceAnalystParameters.extractParameter.clipRegion.components) {
24039+
datasetSurfaceAnalystParameters.extractParameter.clipRegion = _SuperMap2.default.REST.ServerGeometry.fromGeometry(datasetSurfaceAnalystParameters.extractParameter.clipRegion);
24040+
}
2402924041
tempObj.extractParameter = datasetSurfaceAnalystParameters.extractParameter;
2403024042
} else if (name === "dataset") {} else if (name === "surfaceAnalystMethod") {} else {
2403124043
tempObj[name] = datasetSurfaceAnalystParameters[name];
@@ -37903,18 +37915,6 @@ var RouteCalculateMeasureParameters = function () {
3790337915
if (!options) {
3790437916
return this;
3790537917
}
37906-
var routeFromClient = options.sourceRoute;
37907-
var routeHandle = {};
37908-
if (routeFromClient && routeFromClient instanceof _SuperMap2.default.Geometry && routeFromClient.components) {
37909-
routeHandle.type = routeFromClient.type;
37910-
routeHandle.parts = routeFromClient.parts;
37911-
var parts = [];
37912-
for (var i = 0, len = routeFromClient.components.length; i < len; i++) {
37913-
parts = parts.concat(routeFromClient.components[i].components);
37914-
}
37915-
routeHandle.points = parts;
37916-
options.sourceRoute = routeHandle;
37917-
}
3791837918
_SuperMap2.default.Util.extend(this, options);
3791937919
}
3792037920

@@ -40709,14 +40709,6 @@ var SurfaceAnalystParametersSetting = function () {
4070940709
this.CLASS_NAME = "SuperMap.SurfaceAnalystParametersSetting";
4071040710

4071140711
if (options) {
40712-
var clipRg = options.clipRegion;
40713-
if (clipRg) {
40714-
if (clipRg instanceof _SuperMap2.default.Geometry && clipRg.components) {
40715-
options.clipRegion = _SuperMap2.default.REST.ServerGeometry.fromGeometry(clipRg);
40716-
} else {
40717-
delete options.clipRegion;
40718-
}
40719-
}
4072040712
_SuperMap2.default.Util.extend(this, options);
4072140713
}
4072240714
}
@@ -40910,6 +40902,7 @@ var SurfaceAnalystService = function (_SpatialAnalystBase) {
4091040902
key: 'getJsonParameters',
4091140903
value: function getJsonParameters(params) {
4091240904
var jsonParameters = "";
40905+
var parameterObject = {};
4091340906
var me = this,
4091440907
end;
4091540908
if (params instanceof _DatasetSurfaceAnalystParameters2.default) {
@@ -40920,17 +40913,20 @@ var SurfaceAnalystService = function (_SpatialAnalystBase) {
4092040913
} else {
4092140914
me.url += end === "/" ? "datasets/" + params.dataset + "/" + params.surfaceAnalystMethod.toLowerCase() + ".jsonp?returnContent=true" : "/datasets/" + params.dataset + "/" + params.surfaceAnalystMethod.toLowerCase() + ".jsonp?returnContent=true";
4092240915
}
40916+
_DatasetSurfaceAnalystParameters2.default.toObject(params, parameterObject);
40917+
jsonParameters = _SuperMap2.default.Util.toJSON(parameterObject);
4092340918
} else if (params instanceof _GeometrySurfaceAnalystParameters2.default) {
4092440919
end = me.url.substr(me.url.length - 1, 1);
4092540920
if (me.isInTheSameDomain) {
4092640921
me.url += end === "/" ? "geometry/" + params.surfaceAnalystMethod.toLowerCase() + ".json?returnContent=true" : "/geometry/" + params.surfaceAnalystMethod.toLowerCase() + ".json?returnContent=true";
4092740922
} else {
4092840923
me.url += end === "/" ? "geometry/" + params.surfaceAnalystMethod.toLowerCase() + ".jsonp?returnContent=true" : "/geometry/" + params.surfaceAnalystMethod.toLowerCase() + ".jsonp?returnContent=true";
4092940924
}
40925+
jsonParameters = _SuperMap2.default.Util.toJSON(params);
4093040926
} else {
4093140927
return;
4093240928
}
40933-
jsonParameters = _SuperMap2.default.Util.toJSON(params);
40929+
4093440930
return jsonParameters;
4093540931
}
4093640932
}]);

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

‎src/common/format/GeoJSON.js‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,13 @@ export default class GeoJSON extends JSONFormat {
495495
* @return {Array} 一个表示一个点的坐标组。
496496
*/
497497
'point': function (point) {
498-
return [point.x, point.y];
498+
var p = [point.x, point.y];
499+
for (var name in point) {
500+
if (name !== "x" && name !== "y") {
501+
p.push(point[name]);
502+
}
503+
}
504+
return p;
499505
},
500506

501507
/**
@@ -733,7 +739,8 @@ export default class GeoJSON extends JSONFormat {
733739
for (var j = 0; j < geoParts[i]; j++) {
734740
pointList.push({
735741
x: parseFloat(geoPoints[pointIndex + j].x),
736-
y: parseFloat(geoPoints[pointIndex + j].y)
742+
y: parseFloat(geoPoints[pointIndex + j].y),
743+
measure: parseFloat(geoPoints[pointIndex + j].measure)
737744
});
738745
}
739746
pointIndex += geoParts[i];

‎src/common/iServer/DatasetSurfaceAnalystParameters.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ export default class DatasetSurfaceAnalystParameters extends SurfaceAnalystPara
7474
tempObj.filterQueryParameter = datasetSurfaceAnalystParameters.filterQueryParameter;
7575
}
7676
if (name === "extractParameter") {
77+
if (datasetSurfaceAnalystParameters.extractParameter.clipRegion instanceof SuperMap.Geometry && datasetSurfaceAnalystParameters.extractParameter.clipRegion.components) {
78+
datasetSurfaceAnalystParameters.extractParameter.clipRegion = SuperMap.REST.ServerGeometry.fromGeometry(datasetSurfaceAnalystParameters.extractParameter.clipRegion);
79+
}
7780
tempObj.extractParameter = datasetSurfaceAnalystParameters.extractParameter;
7881
}
7982
else if (name === "dataset") {

‎src/common/iServer/RouteCalculateMeasureParameters.js‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,6 @@ export default class RouteCalculateMeasureParameters {
5353
if (!options) {
5454
return this;
5555
}
56-
var routeFromClient = options.sourceRoute;
57-
var routeHandle = {};
58-
if (routeFromClient && routeFromClient instanceof SuperMap.Geometry && routeFromClient.components) {
59-
routeHandle.type = routeFromClient.type;
60-
routeHandle.parts = routeFromClient.parts;
61-
var parts = [];
62-
for (var i = 0, len = routeFromClient.components.length; i < len; i++) {
63-
parts = parts.concat(routeFromClient.components[i].components);
64-
}
65-
routeHandle.points = parts;
66-
options.sourceRoute = routeHandle;
67-
}
6856
SuperMap.Util.extend(this, options);
6957
}
7058

@@ -84,8 +72,6 @@ export default class RouteCalculateMeasureParameters {
8472
me.isIgnoreGap = false;
8573
}
8674
}
87-
88-
8975
CLASS_NAME = "SuperMap.RouteCalculateMeasureParameters"
9076
}
9177

‎src/common/iServer/SpatialAnalystBase.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ export default class SpatialAnalystBase extends CommonServiceBase {
7474
}
7575
} else if (result.recordset && result.recordset.features) {
7676
result.recordset.features = JSON.parse(geoJSONFormat.write(result.recordset.features));
77+
}else if(result.resultGeometry){
78+
result.resultGeometry = JSON.parse(geoJSONFormat.write(result.resultGeometry));
7779
}
7880

7981
return result;

‎src/common/iServer/SurfaceAnalystParametersSetting.js‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,6 @@ export default class SurfaceAnalystParametersSetting {
7676
*/
7777
constructor(options) {
7878
if (options) {
79-
var clipRg = options.clipRegion;
80-
if (clipRg) {
81-
if (clipRg instanceof SuperMap.Geometry && clipRg.components) {
82-
options.clipRegion = SuperMap.REST.ServerGeometry.fromGeometry(clipRg);
83-
} else {
84-
delete options.clipRegion;
85-
}
86-
}
8779
SuperMap.Util.extend(this, options);
8880
}
8981
}

‎src/common/iServer/SurfaceAnalystService.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ export default class SurfaceAnalystService extends SpatialAnalystBase {
7575
* @return {Object} 转化后的JSON字符串。
7676
*/
7777
getJsonParameters(params) {
78-
var jsonParameters = "";
78+
var jsonParameters="";
79+
var parameterObject = {};
7980
var me = this, end;
8081
if (params instanceof DatasetSurfaceAnalystParameters) {
8182
var end = me.url.substr(me.url.length - 1, 1);
@@ -89,6 +90,8 @@ export default class SurfaceAnalystService extends SpatialAnalystBase {
8990
".jsonp?returnContent=true" : "/datasets/" + params.dataset + "/" +
9091
params.surfaceAnalystMethod.toLowerCase() + ".jsonp?returnContent=true";
9192
}
93+
DatasetSurfaceAnalystParameters.toObject(params,parameterObject);
94+
jsonParameters = SuperMap.Util.toJSON(parameterObject);
9295
} else if (params instanceof GeometrySurfaceAnalystParameters) {
9396
end = me.url.substr(me.url.length - 1, 1);
9497
if (me.isInTheSameDomain) {
@@ -100,10 +103,11 @@ export default class SurfaceAnalystService extends SpatialAnalystBase {
100103
".jsonp?returnContent=true" : "/geometry/" + params.surfaceAnalystMethod.toLowerCase() +
101104
".jsonp?returnContent=true";
102105
}
106+
jsonParameters = SuperMap.Util.toJSON(params);
103107
} else {
104108
return;
105109
}
106-
jsonParameters = SuperMap.Util.toJSON(params);
110+
107111
return jsonParameters;
108112
}
109113

0 commit comments

Comments
 (0)