Skip to content

Commit 615349e

Browse files
MyShallowTimeMyShallowTime
committed
Merge branch 'master' of https://github.com/SuperMap/iClient-JavaScript into master
2 parents c36de38 + 44dfd53 commit 615349e

File tree

55 files changed

+387
-57
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+387
-57
lines changed

‎examples/leaflet/04_terrainAspectCalculationService.html‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@ <h5 class='panel-title text-center' data-i18n="resources.text_terrainAspectCalcu
4747
removeTheme();
4848
var terrainAspectCalculationParameters = new L.supermap.TerrainAspectCalculationParameters({
4949
dataset: "JingjinTerrain@Jingjin",
50-
terrainAnalystSetting:{"boundsType":"UNION", "cellSizeType":"MAX"},
50+
terrainAnalystSetting: new L.supermap.terrainAnalystSetting({
51+
boundsType: L.supermap.BoundsType.UNION,
52+
cellSizeType: L.supermap.CellSizeType.MAX
53+
}),
5154
resultDatasetName:"testAspect",
5255
deleteExistResultDataset:true
5356
}

‎examples/leaflet/04_terrainCutFillCalculationService.html‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,16 @@ <h5 class='panel-title text-center' data-i18n="resources.text_terrainCutFillCalc
4949
var terrainCutFillCalculationParameters = new L.supermap.TerrainCutFillCalculationParameters({
5050
dataset: "JingjinTerrain@Jingjin",
5151
cutFillType:"REGION3D",
52-
region3D:{"points":[{"x":116.2,"y":40.1,"z":-5.0},{"x":116.5,"y":40.5,"z":0.0},{"x":116.5,"y":40.1,"z":30.0},{"x":116.2,"y":40.1,"z":-5.0}],"rotationX":0.0,"rotationY":0.0,"rotationZ":0.0,"scaleX":0.0,"scaleY":0.0,"scaleZ":0.0,"type":"REGION3D"},
52+
region3D: new L.supermap.Geometry3D({
53+
points:[{"x":116.2,"y":40.1,"z":-5.0},{"x":116.5,"y":40.5,"z":0.0},{"x":116.5,"y":40.1,"z":30.0},{"x":116.2,"y":40.1,"z":-5.0}],
54+
rotationX: 0.0,
55+
rotationY: 0.0,
56+
rotationZ: 0.0,
57+
scaleX: 0.0,
58+
scaleY: 0.0,
59+
scaleZ: 0.0,
60+
type: "REGION3D",
61+
}),
5362
resultDataset:"cutfill",
5463
buildPyramid:true,
5564
deleteExistResultDataset:true

‎examples/leaflet/04_terrainSlopeCalculationService.html‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@ <h5 class='panel-title text-center' data-i18n="resources.btn_terrainSlopeCalcula
4949
dataset: "JingjinTerrain@Jingjin",
5050
zFactor:0.00001,
5151
slopeType:"DEGREE",
52-
terrainAnalystSetting:{"boundsType":"UNION", "cellSizeType":"MAX"},
52+
terrainAnalystSetting: new L.supermap.terrainAnalystSetting({
53+
boundsType: L.supermap.BoundsType.UNION,
54+
cellSizeType: L.supermap.CellSizeType.MAX
55+
}),
5356
resultDatasetName:"testSlope",
5457
deleteExistResultDataset:true
5558

‎examples/mapboxgl/04_terrainAspectCalculationService.html‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,10 @@ <h5 class='panel-title text-center' data-i18n="resources.text_terrainAspectCalcu
6868
removeTheme();
6969
var terrainAspectCalculationParameters = new mapboxgl.supermap.TerrainAspectCalculationParameters({
7070
dataset: "JingjinTerrain@Jingjin",
71-
terrainAnalystSetting:{"boundsType":"UNION", "cellSizeType":"MAX"},
71+
terrainAnalystSetting: new mapboxgl.supermap.terrainAnalystSetting({
72+
boundsType: mapboxgl.supermap.BoundsType.UNION,
73+
cellSizeType: mapboxgl.supermap.CellSizeType.MAX
74+
}),
7275
resultDatasetName:"testAspect",
7376
deleteExistResultDataset:true
7477
}

‎examples/mapboxgl/04_terrainCutFillCalculationService.html‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,16 @@ <h5 class='panel-title text-center' data-i18n="resources.text_terrainCutFillCalc
6969
var terrainCutFillCalculationParameters = new mapboxgl.supermap.TerrainCutFillCalculationParameters({
7070
dataset: "JingjinTerrain@Jingjin",
7171
cutFillType:"REGION3D",
72-
region3D:{"points":[{"x":116.2,"y":40.1,"z":-5.0},{"x":116.5,"y":40.5,"z":0.0},{"x":116.5,"y":40.1,"z":30.0},{"x":116.2,"y":40.1,"z":-5.0}],"rotationX":0.0,"rotationY":0.0,"rotationZ":0.0,"scaleX":0.0,"scaleY":0.0,"scaleZ":0.0,"type":"REGION3D"},
72+
region3D: new mapboxgl.supermap.Geometry3D({
73+
points:[{"x":116.2,"y":40.1,"z":-5.0},{"x":116.5,"y":40.5,"z":0.0},{"x":116.5,"y":40.1,"z":30.0},{"x":116.2,"y":40.1,"z":-5.0}],
74+
rotationX: 0.0,
75+
rotationY: 0.0,
76+
rotationZ: 0.0,
77+
scaleX: 0.0,
78+
scaleY: 0.0,
79+
scaleZ: 0.0,
80+
type: "REGION3D",
81+
}),
7382
afterCutFillDataset: "cutfill",
7483
resultDataset:"cutfill",
7584
buildPyramid:true,

‎examples/mapboxgl/04_terrainSlopeCalculationService.html‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,10 @@ <h5 class='panel-title text-center' data-i18n="resources.text_terrainSlopeCalcul
7070
dataset: "JingjinTerrain@Jingjin",
7171
zFactor:0.00001,
7272
slopeType:"DEGREE",
73-
terrainAnalystSetting:{"boundsType":"UNION", "cellSizeType":"MAX"},
73+
terrainAnalystSetting: new mapboxgl.supermap.terrainAnalystSetting({
74+
boundsType: mapboxgl.supermap.BoundsType.UNION,
75+
cellSizeType: mapboxgl.supermap.CellSizeType.MAX
76+
}),
7477
resultDatasetName:"testSlope",
7578
deleteExistResultDataset:true
7679

‎examples/maplibregl/04_terrainAspectCalculationService.html‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,10 @@ <h5 class='panel-title text-center' data-i18n="resources.text_terrainAspectCalcu
6868
removeTheme();
6969
var terrainAspectCalculationParameters = new maplibregl.supermap.TerrainAspectCalculationParameters({
7070
dataset: "JingjinTerrain@Jingjin",
71-
terrainAnalystSetting:{"boundsType":"UNION", "cellSizeType":"MAX"},
71+
terrainAnalystSetting: new maplibregl.supermap.terrainAnalystSetting({
72+
boundsType: maplibregl.supermap.BoundsType.UNION,
73+
cellSizeType: maplibregl.supermap.CellSizeType.MAX
74+
}),
7275
resultDatasetName:"testAspect",
7376
deleteExistResultDataset:true
7477
}

‎examples/maplibregl/04_terrainCutFillCalculationService.html‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,16 @@ <h5 class='panel-title text-center' data-i18n="resources.text_terrainCutFillCalc
6969
var terrainCutFillCalculationParameters = new maplibregl.supermap.TerrainCutFillCalculationParameters({
7070
dataset: "JingjinTerrain@Jingjin",
7171
cutFillType:"REGION3D",
72-
region3D:{"points":[{"x":116.2,"y":40.1,"z":-5.0},{"x":116.5,"y":40.5,"z":0.0},{"x":116.5,"y":40.1,"z":30.0},{"x":116.2,"y":40.1,"z":-5.0}],"rotationX":0.0,"rotationY":0.0,"rotationZ":0.0,"scaleX":0.0,"scaleY":0.0,"scaleZ":0.0,"type":"REGION3D"},
72+
region3D: new maplibregl.supermap.Geometry3D({
73+
points:[{"x":116.2,"y":40.1,"z":-5.0},{"x":116.5,"y":40.5,"z":0.0},{"x":116.5,"y":40.1,"z":30.0},{"x":116.2,"y":40.1,"z":-5.0}],
74+
rotationX: 0.0,
75+
rotationY: 0.0,
76+
rotationZ: 0.0,
77+
scaleX: 0.0,
78+
scaleY: 0.0,
79+
scaleZ: 0.0,
80+
type: "REGION3D",
81+
}),
7382
resultDataset:"cutfill",
7483
buildPyramid:true,
7584
deleteExistResultDataset:true

‎examples/maplibregl/04_terrainSlopeCalculationService.html‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,10 @@ <h5 class='panel-title text-center' data-i18n="resources.text_terrainSlopeCalcul
7070
dataset: "JingjinTerrain@Jingjin",
7171
zFactor:0.00001,
7272
slopeType:"DEGREE",
73-
terrainAnalystSetting:{"boundsType":"UNION", "cellSizeType":"MAX"},
73+
terrainAnalystSetting: new maplibregl.supermap.terrainAnalystSetting({
74+
boundsType: maplibregl.supermap.BoundsType.UNION,
75+
cellSizeType: maplibregl.supermap.CellSizeType.MAX
76+
}),
7477
resultDatasetName:"testSlope",
7578
deleteExistResultDataset:true
7679

‎examples/openlayers/04_terrainAspectCalculationService.html‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,10 @@ <h5 class='panel-title text-center' data-i18n="resources.text_terrainAspectCalcu
6060
removeTheme();
6161
var terrainAspectCalculationParameters = new ol.supermap.TerrainAspectCalculationParameters({
6262
dataset: "JingjinTerrain@Jingjin",
63-
terrainAnalystSetting:{"boundsType":"UNION", "cellSizeType":"MAX"},
63+
terrainAnalystSetting: new ol.supermap.terrainAnalystSetting({
64+
boundsType: ol.supermap.BoundsType.UNION,
65+
cellSizeType: ol.supermap.CellSizeType.MAX
66+
}),
6467
resultDatasetName:"testAspect",
6568
deleteExistResultDataset:true
6669
}

0 commit comments

Comments
 (0)