Skip to content

Commit 4fb66f7

Browse files
author
caoxinke
committed
修改分布式空间处理服务示例中服务地址和Token;优化示例显示。
1 parent 10aed91 commit 4fb66f7

15 files changed

+1934
-1813
lines changed

‎dist/iclient9-leaflet.js‎

Lines changed: 1756 additions & 1739 deletions
Large diffs are not rendered by default.

‎dist/iclient9-openlayers.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9108,7 +9108,7 @@ ol.supermap.ProcessingJobsService = function (url, options) {
91089108
ol.inherits(ol.supermap.ProcessingJobsService, ol.supermap.ServiceBase);
91099109

91109110
/**
9111-
* 获取核密度分析作业的列表。
9111+
* 获取密度分析作业的列表。
91129112
* @param callback 请求结果的回调函数。
91139113
* @param resultFormat 返回的结果类型（默认为GeoJSON）。
91149114
*/
@@ -9128,7 +9128,7 @@ ol.supermap.ProcessingJobsService.prototype.getKernelDensityJobs = function (cal
91289128
};
91299129

91309130
/**
9131-
* 获取某一个核密度分析作业。
9131+
* 获取某一个密度分析作业。
91329132
* @param id 空间分析作业的id。
91339133
* @param callback 请求结果的回调函数。
91349134
* @param resultFormat 返回的结果类型（默认为GeoJSON）。
@@ -9149,7 +9149,7 @@ ol.supermap.ProcessingJobsService.prototype.getKernelDensityJob = function (id,
91499149
};
91509150

91519151
/**
9152-
* 新建一个核密度分析作业。
9152+
* 新建一个密度分析作业。
91539153
* @param callback 请求结果的回调函数。
91549154
* @param resultFormat 返回的结果类型（默认为GeoJSON）。
91559155
*/
@@ -9173,8 +9173,8 @@ ol.supermap.ProcessingJobsService.prototype.addKernelDensityJob = function (para
91739173
};
91749174

91759175
/**
9176-
* 获取核密度分析作业的状态。
9177-
* @param id 核密度分析作业的id。
9176+
* 获取密度分析作业的状态。
9177+
* @param id 密度分析作业的id。
91789178
*/
91799179
ol.supermap.ProcessingJobsService.prototype.getKernelDensityJobState = function (id) {
91809180
return this.kernelDensityJobs[id];
@@ -19768,7 +19768,7 @@ module.exports = SuperMap.InterpolationRBFAnalystParameters;
1976819768
var SuperMap = __webpack_require__(0);
1976919769
/**
1977019770
* Class: SuperMap.KernelDensityJobParameter
19771-
* 核密度分析任务参数类
19771+
* 密度分析任务参数类
1977219772
*/
1977319773

1977419774
SuperMap.KernelDensityJobParameter = SuperMap.Class({
@@ -19863,7 +19863,7 @@ var KernelDensityJobParameter = __webpack_require__(149);
1986319863
SuperMap.REST.KernelDensityJobsService = SuperMap.Class(ProcessingJobsServiceBase, {
1986419864

1986519865
initialize: function (url, options) {
19866-
url += "/spatialanalyst/kernelDensity";
19866+
url += "/spatialanalyst/density";
1986719867
ProcessingJobsServiceBase.prototype.initialize.apply(this, arguments);
1986819868
},
1986919869

@@ -23017,7 +23017,7 @@ module.exports = SuperMap.REST.StopQueryService;
2301723017
var SuperMap = __webpack_require__(0);
2301823018
/**
2301923019
* Class: SuperMap.KernelDensityJobParameter
23020-
* 核密度分析任务参数类
23020+
* 格网聚合分析任务参数类
2302123021
*/
2302223022

2302323023
SuperMap.SummaryMeshJobParameter = SuperMap.Class({

‎examples/leaflet/SummaryMeshJobService.html‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<link rel="stylesheet" href="http://cdn.bootcss.com/leaflet/1.0.3/leaflet.css">
88
</head>
99
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
10-
<button type="button" id="btn" class="btn btn-primary" autocomplete="off">创建格网聚合分析作业</button>
1110
<div id="model" class="modal fade" tabindex="-1" role="dialog">
1211
<div class="modal-dialog" role="document">
1312
<div class="modal-content">
@@ -27,8 +26,8 @@ <h4 class="modal-title">提示</h4>
2726
<script type="text/javascript" src="http://cdn.bootcss.com/leaflet/1.0.3/leaflet.js"></script>
2827
<script type="text/javascript" src="../../dist/iclient9-leaflet.js"></script>
2928
<script type="text/javascript">
30-
var layer, processingJobsUrl = "http://192.168.12.28:8090/iserver/services/processing/rest/v1/jobs",
31-
token = '5JtxoDBziy-6O00kK7UGKl3arPZXaO8OrIHc-3iTzfeS7JFQ_ay4yCvTwtwUuf53YSrosYOsWPiHj9J76KhPZQ..',
29+
var layer, processingJobsUrl = "http://113.209.64.227:8090/iserver/services/processing/rest/v1/jobs",
30+
token = 'GSHB7qlocJkqEH0Ld6VUSGQfekOdPd3e9UdJoHjiupfbkGDggXQLSPWd6VaKm8NH4gvXx6UQ0TCI5wpfr-4Tlw..',
3231
map = L.map('map', {
3332
crs: L.supermap.NonEarthCRS({
3433
bounds: L.bounds([40.65, -74.05], [40.85, -73.85]),
@@ -38,15 +37,24 @@ <h4 class="modal-title">提示</h4>
3837
zoom: 0
3938
}),
4039
summaryMeshJobParameter = new SuperMap.SummaryMeshJobParameter({
41-
datasetName: 'taxi_newyork_taxi_2013-01_14k',
40+
datasetName: 'test_newyork_taxi_2013_01_14k',
4241
resolution: 0.001,
4342
resultFieldNames: 'result',
4443
meshType: 0,
4544
fields: 10,
4645
query: L.latLngBounds(L.latLng(40.550, -74.150), L.latLng(40.950, -73.750)),
4746
statisticModes: 'max'
4847
}),
49-
processingJobsService = new L.supermap.processingJobsService(processingJobsUrl);
48+
processingJobsService = new L.supermap.processingJobsService(processingJobsUrl),
49+
info = L.control({position: 'topright'});
50+
51+
info.onAdd = function () {
52+
var btn = L.DomUtil.create('button', 'btn btn-primary');
53+
btn.id = 'btn';
54+
btn.innerHTML = '创建格网聚合分析作业';
55+
return btn;
56+
};
57+
info.addTo(map);
5058

5159
SuperMap.Credential.CREDENTIAL = new SuperMap.Credential(token, 'token');
5260

@@ -60,15 +68,15 @@ <h4 class="modal-title">提示</h4>
6068
if (serviceResult.error) {
6169
$('#btn').prop('disabled', false);
6270
$("#model").modal('hide');
63-
alert(serviceResult.error.message);
71+
alert('创建失败!');
6472
return;
6573
}
6674
serviceResult.result.setting.serviceInfo.targetServiceInfos.map(function (info) {
6775
if (info.serviceType === 'RESTMAP') {
68-
var mapUrl = info.serviceAddress + '/maps/summaryMesh_map';
69-
L.supermap.tiledMapLayer(mapUrl, {noWrap: true}).addTo(map);
70-
$("#model").modal('hide');
71-
$('#btn').prop('disabled', false);
76+
var mapUrl = info.serviceAddress + '/maps/summaryMesh1_Map';
77+
L.supermap.tiledMapLayer(mapUrl, {noWrap: true}).addTo(map);
78+
$("#model").modal('hide');
79+
$('#btn').prop('disabled', false);
7280
}
7381
});
7482
});

‎examples/leaflet/buildCacheService.html‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<link rel="stylesheet" href="http://cdn.bootcss.com/leaflet/1.0.3/leaflet.css">
88
</head>
99
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
10-
<button type="button" id="btn" class="btn btn-primary" autocomplete="off">创建生成地图缓存作业</button>
1110
<div id="model" class="modal fade" tabindex="-1" role="dialog">
1211
<div class="modal-dialog" role="document">
1312
<div class="modal-content">
@@ -27,29 +26,38 @@ <h4 class="modal-title">提示</h4>
2726
<script type="text/javascript" src="http://cdn.bootcss.com/leaflet/1.0.3/leaflet.js"></script>
2827
<script type="text/javascript" src="../../dist/iclient9-leaflet.js"></script>
2928
<script type="text/javascript">
30-
var layer, processingJobsUrl = "http://192.168.12.28:8090/iserver/services/processing/rest/v1/jobs",
31-
token = '5JtxoDBziy-6O00kK7UGKl3arPZXaO8OrIHc-3iTzfeS7JFQ_ay4yCvTwtwUuf53YSrosYOsWPiHj9J76KhPZQ..',
29+
var layer, processingJobsUrl = "http://113.209.64.227:8090/iserver/services/processing/rest/v1/jobs",
30+
token = 'GSHB7qlocJkqEH0Ld6VUSGQfekOdPd3e9UdJoHjiupfbkGDggXQLSPWd6VaKm8NH4gvXx6UQ0TCI5wpfr-4Tlw..',
3231
map = L.map('map', {
3332
crs: L.supermap.NonEarthCRS({
3433
bounds: L.bounds([40.65, -74.05], [40.85, -73.85]),
3534
origin: L.point(40.65, -73.85)
3635
}),
3736
center: [40.75, -73.95],
3837
maxZoom: 18,
39-
zoom: 0
38+
zoom: 1
4039
}),
4140
buildCacheJobParameter = new SuperMap.BuildCacheJobParameter({
42-
datasetName: 'taxi_newyork_taxi_2013-01_14k',
41+
datasetName: 'test_newyork_taxi_2013_01_14k',
4342
cacheName: 'cache',
4443
cacheType: 'MongoDB',
45-
serverAdresses: ['192.168.12.28:27010'],
44+
serverAdresses: ['113.209.64.227:27010'],
4645
database: 'smtiles',
4746
version: 'v1',
4847
bounds: L.latLngBounds(L.latLng(40.550, -74.150), L.latLng(40.950, -73.750)),
4948
imageType: 'Heatmap',
5049
level: 5
5150
}),
52-
processingJobsService = new L.supermap.processingJobsService(processingJobsUrl);
51+
processingJobsService = new L.supermap.processingJobsService(processingJobsUrl),
52+
info = L.control({position: 'topright'});
53+
54+
info.onAdd = function () {
55+
var btn = L.DomUtil.create('button', 'btn btn-primary');
56+
btn.id = 'btn';
57+
btn.innerHTML = '创建生成地图缓存作业';
58+
return btn;
59+
};
60+
info.addTo(map);
5361

5462
SuperMap.Credential.CREDENTIAL = new SuperMap.Credential(token, 'token');
5563

@@ -63,7 +71,7 @@ <h4 class="modal-title">提示</h4>
6371
if (serviceResult.error) {
6472
$('#btn').prop('disabled', false);
6573
$("#model").modal('hide');
66-
alert(serviceResult.error.message);
74+
alert('创建失败!');
6775
return;
6876
}
6977
serviceResult.result.setting.serviceInfo.targetServiceInfos.map(function (info) {

‎examples/leaflet/config.js‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,22 @@ var exampleConfig = {
206206
thumbnail: "l_trafficTransferAnalystService.png",
207207
fileName: "06_trafficTransferAnalystService"
208208
}]
209+
},
210+
"processingJobs": {
211+
name: "分布式空间处理作业",
212+
content: [{
213+
name: "密度分析作业",
214+
thumbnail: "kernelDensityJobService.png",
215+
fileName: "kernelDensityJobService"
216+
}, {
217+
name: "格网聚合分析作业",
218+
thumbnail: "SummaryMeshJobService.png",
219+
fileName: "SummaryMeshJobService"
220+
}, {
221+
name: "生成地图缓存作业",
222+
thumbnail: "buildCacheService.png",
223+
fileName: "buildCacheService"
224+
}]
209225
}
210226
}
211227
},

‎examples/leaflet/kernelDensityJobService.html‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,19 @@
22
<html>
33
<head>
44
<meta charset="UTF-8">
5-
<title>核密度分析作业</title>
5+
<title>密度分析作业</title>
66
<link href="http://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
77
<link rel="stylesheet" href="http://cdn.bootcss.com/leaflet/1.0.3/leaflet.css">
88
</head>
99
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
10-
<button type="button" id="btn" class="btn btn-primary" autocomplete="off">创建核密度分析作业</button>
1110
<div id="model" class="modal fade" tabindex="-1" role="dialog">
1211
<div class="modal-dialog" role="document">
1312
<div class="modal-content">
1413
<div class="modal-header">
1514
<h4 class="modal-title">提示</h4>
1615
</div>
1716
<div class="modal-body">
18-
<p>正在创建核密度分析作业...</p>
17+
<p>正在创建密度分析作业...</p>
1918
</div>
2019
</div>
2120
</div>
@@ -27,8 +26,8 @@ <h4 class="modal-title">提示</h4>
2726
<script type="text/javascript" src="http://cdn.bootcss.com/leaflet/1.0.3/leaflet.js"></script>
2827
<script type="text/javascript" src="../../dist/iclient9-leaflet.js"></script>
2928
<script type="text/javascript">
30-
var layer, processingJobsUrl = "http://192.168.12.28:8090/iserver/services/processing/rest/v1/jobs",
31-
token = '5JtxoDBziy-6O00kK7UGKl3arPZXaO8OrIHc-3iTzfeS7JFQ_ay4yCvTwtwUuf53YSrosYOsWPiHj9J76KhPZQ..',
29+
var layer, processingJobsUrl = "http://113.209.64.227:8090/iserver/services/processing/rest/v1/jobs",
30+
token = 'GSHB7qlocJkqEH0Ld6VUSGQfekOdPd3e9UdJoHjiupfbkGDggXQLSPWd6VaKm8NH4gvXx6UQ0TCI5wpfr-4Tlw..',
3231
map = L.map('map', {
3332
crs: L.supermap.NonEarthCRS({
3433
bounds: L.bounds([40.65, -74.05], [40.85, -73.85]),
@@ -38,15 +37,24 @@ <h4 class="modal-title">提示</h4>
3837
zoom: 0
3938
}),
4039
kernelDensityJobParameter = new SuperMap.KernelDensityJobParameter({
41-
datasetName: 'taxi_newyork_taxi_2013-01_14k',
40+
datasetName: 'test_newyork_taxi_2013_01_14k',
4241
resolution: 0.001,
4342
method: 0,
4443
meshType: 0,
4544
fields: 10,
4645
query: L.latLngBounds(L.latLng(40.550, -74.150), L.latLng(40.950, -73.750)),
4746
radius: 0.01
4847
}),
49-
processingJobsService = new L.supermap.processingJobsService(processingJobsUrl);
48+
processingJobsService = new L.supermap.processingJobsService(processingJobsUrl),
49+
info = L.control({position: 'topright'});
50+
51+
info.onAdd = function () {
52+
var btn = L.DomUtil.create('button', 'btn btn-primary');
53+
btn.id = 'btn';
54+
btn.innerHTML = '创建密度分析作业';
55+
return btn;
56+
};
57+
info.addTo(map);
5058

5159
SuperMap.Credential.CREDENTIAL = new SuperMap.Credential(token, 'token');
5260

@@ -60,12 +68,12 @@ <h4 class="modal-title">提示</h4>
6068
if (serviceResult.error) {
6169
$('#btn').prop('disabled', false);
6270
$("#model").modal('hide');
63-
alert(serviceResult.error.message);
71+
alert('创建失败!');
6472
return;
6573
}
6674
serviceResult.result.setting.serviceInfo.targetServiceInfos.map(function (info) {
6775
if (info.serviceType === 'RESTMAP') {
68-
var mapUrl = info.serviceAddress + '/maps/kernelDensity_map';
76+
var mapUrl = info.serviceAddress + '/maps/kernelDensity1_Map';
6977
L.supermap.tiledMapLayer(mapUrl, {noWrap: true}).addTo(map);
7078
$("#model").modal('hide');
7179
$('#btn').prop('disabled', false);

‎examples/openlayers/SummaryMeshJobService.html‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,15 @@
55
<title>格网聚合分析作业</title>
66
<link href="http://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
77
<link href="http://cdn.bootcss.com/openlayers/4.0.1/ol.css" rel="stylesheet">
8+
<style>
9+
.ol-popup {
10+
position: absolute;
11+
top: 10px;
12+
right: 10px;
13+
}
14+
</style>
815
</head>
916
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
10-
<button type="button" id="btn" class="btn btn-primary" autocomplete="off">创建格网聚合分析作业</button>
1117
<div id="model" class="modal fade" tabindex="-1" role="dialog">
1218
<div class="modal-dialog" role="document">
1319
<div class="modal-content">
@@ -21,14 +27,14 @@ <h4 class="modal-title">提示</h4>
2127
</div>
2228
</div>
2329
<div id="map" style="width: 100%;height:100%;border: 1px solid #dddddd"></div>
24-
30+
<div id="popup" class="ol-popup"/>
2531
<script src="http://cdn.bootcss.com/openlayers/4.0.1/ol-debug.js"></script>
2632
<script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
2733
<script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
2834
<script type="text/javascript" src="../../dist/iclient9-openlayers.js"></script>
2935
<script type="text/javascript">
30-
var layer, processingJobsUrl = "http://192.168.12.28:8090/iserver/services/processing/rest/v1/jobs",
31-
token = '5JtxoDBziy-6O00kK7UGKl3arPZXaO8OrIHc-3iTzfeS7JFQ_ay4yCvTwtwUuf53YSrosYOsWPiHj9J76KhPZQ..',
36+
var layer, processingJobsUrl = "http://113.209.64.227:8090/iserver/services/processing/rest/v1/jobs",
37+
token = 'GSHB7qlocJkqEH0Ld6VUSGQfekOdPd3e9UdJoHjiupfbkGDggXQLSPWd6VaKm8NH4gvXx6UQ0TCI5wpfr-4Tlw..',
3238
extent = [-74.05, 40.65, -73.85, 40.85],
3339
projection = new ol.proj.Projection({
3440
extent: extent,
@@ -43,15 +49,25 @@ <h4 class="modal-title">提示</h4>
4349
})
4450
}),
4551
summaryMeshJobParameter = new SuperMap.SummaryMeshJobParameter({
46-
datasetName: 'taxi_newyork_taxi_2013-01_14k',
52+
datasetName: 'test_newyork_taxi_2013_01_14k',
4753
resolution: 0.001,
4854
resultFieldNames: 'result',
4955
meshType: 0,
5056
fields: 10,
5157
query: [-74.150, 40.550, -73.750, 40.950],
5258
statisticModes: 'max'
5359
}),
54-
processingJobsService = new ol.supermap.ProcessingJobsService(processingJobsUrl);
60+
processingJobsService = new ol.supermap.ProcessingJobsService(processingJobsUrl),
61+
popup = document.getElementById('popup'),
62+
button = document.createElement('button');
63+
64+
popup.appendChild(button);
65+
button.id = 'btn'
66+
button.className = 'btn btn-primary';
67+
button.innerHTML = '创建格网聚合分析作业';
68+
var info = new ol.control.Control({element: popup});
69+
info.setMap(map);
70+
map.addControl(info);
5571

5672
SuperMap.Credential.CREDENTIAL = new SuperMap.Credential(token, 'token');
5773

@@ -65,12 +81,12 @@ <h4 class="modal-title">提示</h4>
6581
if (serviceResult.error) {
6682
$('#btn').prop('disabled', false);
6783
$("#model").modal('hide');
68-
alert(serviceResult.error.message);
84+
alert('创建失败!');
6985
return;
7086
}
7187
serviceResult.result.setting.serviceInfo.targetServiceInfos.map(function (info) {
7288
if (info.serviceType === 'RESTMAP') {
73-
var mapUrl = info.serviceAddress + '/maps/summaryMesh_map';
89+
var mapUrl = info.serviceAddress + '/maps/summaryMesh1_Map';
7490
new ol.supermap.MapService(mapUrl).getMapInfo(function (mapInfo) {
7591
layer = new ol.layer.Tile({
7692
source: new ol.supermap.TileSuperMapRest(ol.supermap.TileSuperMapRest.optionsFromMapJSON(mapUrl, mapInfo.result))

0 commit comments

Comments
 (0)