Skip to content

Commit a72ad99

Browse files
songyumengsongyumeng
committed
【examples】优化分布式分析例子的token读取方式 review by zhurch
1 parent 5a07dee commit a72ad99

Some content is hidden

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

43 files changed

+6542
-6152
lines changed

‎examples/classic/SummaryMeshJobService.html‎

Lines changed: 170 additions & 154 deletions
Large diffs are not rendered by default.

‎examples/classic/SummaryRegionJobService.html‎

Lines changed: 244 additions & 235 deletions
Large diffs are not rendered by default.

‎examples/classic/buffersAnalystJobService.html‎

Lines changed: 134 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*********************************************************************-->
44
<!DOCTYPE html>
55
<html>
6+
67
<head>
78
<meta charset="UTF-8">
89
<title data-i18n="resources.title_buffersAnalystJobService"></title>
@@ -19,144 +20,154 @@
1920
}
2021
</style>
2122
</head>
23+
2224
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
23-
<div id="map" style="width: 100%;height:100%"></div>
24-
<div id="control" class="control" style='width:350px'>
25-
<div class="panel panel-default">
26-
<div class="panel-heading">
27-
<h3 class="panel-title" data-i18n="resources.text_buffersAnalystJobService"></h3>
28-
</div>
29-
<div class="panel-body">
30-
<div class="input-group">
31-
<span class="input-group-addon"><span data-i18n="resources.text_inputData"></span><span
32-
data-i18n="[title]resources.text_requiredField" style="color: red;"> * </span>　</span>
33-
<input id="datasetName" type="text" class="form-control"
34-
value="samples_processing_newyorkPoint_P"/>
35-
</div>
36-
<p></p>
37-
<div class='input-group'>
38-
<span class='input-group-addon' data-i18n="resources.text_analysisRange"></span>
39-
<input id='bounds' type='text' class='form-control' value='-74.150, 40.550, -73.750, 40.950'/>
40-
</div>
41-
<p></p>
42-
<div class='input-group'>
43-
<span class='input-group-addon' data-i18n="resources.text_bufferDistance"></span>
44-
<input id='distace' type='text' class='form-control' value='15'/>
45-
</div>
46-
<p></p>
47-
<div class='input-group'>
48-
<span class='input-group-addon' data-i18n="resources.text_bufferDistanceField"></span>
49-
<input id='distanceField' type='text' class='form-control' value='pickup_latitude'/>
25+
<div id="map" style="width: 100%;height:100%"></div>
26+
<div id="control" class="control" style='width:350px'>
27+
<div class="panel panel-default">
28+
<div class="panel-heading">
29+
<h3 class="panel-title" data-i18n="resources.text_buffersAnalystJobService"></h3>
5030
</div>
51-
<p></p>
52-
<div class='input-group'>
53-
<span class='input-group-addon' data-i18n="resources.text_bufferDistanceUnit"></span>
54-
<select class='form-control' id='distanceUnit' name='distanceUnit'>
55-
<option value='Meter' selected='selected'>Meter</option>
56-
<option value='Kilometer'>Kilometer</option>
57-
<option value='Yard'>Yard</option>
58-
<option value='Foot'>Foot</option>
59-
<option value='Mile'>Mile</option>
60-
</select></div>
61-
<p></p>
62-
<div class='input-group'>
63-
<span class='input-group-addon' data-i18n="resources.text_fusionField"></span>
64-
<input id='dissoveField' type='text' class='form-control' value='pickup_longitude'/>
65-
</div>
66-
<p></p>
67-
<div align="right">
68-
<input type="button" id='btn' class="btn btn-primary" data-i18n="[value]resources.text_analyst"/>
31+
<div class="panel-body">
32+
<div class="input-group">
33+
<span class="input-group-addon"><span data-i18n="resources.text_inputData"></span><span data-i18n="[title]resources.text_requiredField"
34+
style="color: red;"> * </span>　</span>
35+
<input id="datasetName" type="text" class="form-control" value="samples_processing_newyorkPoint_P" />
36+
</div>
37+
<p></p>
38+
<div class='input-group'>
39+
<span class='input-group-addon' data-i18n="resources.text_analysisRange"></span>
40+
<input id='bounds' type='text' class='form-control' value='-74.150, 40.550, -73.750, 40.950' />
41+
</div>
42+
<p></p>
43+
<div class='input-group'>
44+
<span class='input-group-addon' data-i18n="resources.text_bufferDistance"></span>
45+
<input id='distace' type='text' class='form-control' value='15' />
46+
</div>
47+
<p></p>
48+
<div class='input-group'>
49+
<span class='input-group-addon' data-i18n="resources.text_bufferDistanceField"></span>
50+
<input id='distanceField' type='text' class='form-control' value='pickup_latitude' />
51+
</div>
52+
<p></p>
53+
<div class='input-group'>
54+
<span class='input-group-addon' data-i18n="resources.text_bufferDistanceUnit"></span>
55+
<select class='form-control' id='distanceUnit' name='distanceUnit'>
56+
<option value='Meter' selected='selected'>Meter</option>
57+
<option value='Kilometer'>Kilometer</option>
58+
<option value='Yard'>Yard</option>
59+
<option value='Foot'>Foot</option>
60+
<option value='Mile'>Mile</option>
61+
</select></div>
62+
<p></p>
63+
<div class='input-group'>
64+
<span class='input-group-addon' data-i18n="resources.text_fusionField"></span>
65+
<input id='dissoveField' type='text' class='form-control' value='pickup_longitude' />
66+
</div>
67+
<p></p>
68+
<div align="right">
69+
<input type="button" id='btn' class="btn btn-primary" data-i18n="[value]resources.text_analyst" />
70+
</div>
6971
</div>
7072
</div>
7173
</div>
72-
</div>
73-
<script type="text/javascript" src="../../dist/classic/include-classic.js"></script>
74-
<script type="text/javascript">
75-
var host = window.isLocal ? window.server : "http://114.115.213.31:8090";
76-
var resultLayer,
77-
processingsUrl = host + "/iserver/services/distributedanalyst/rest/v1/jobs",
78-
mapURL = host + "/iserver/services/map-world/rest/maps/World",
79-
token = '0ra2250-rPu6ZnqHPKqcqDjGkDGDv3bg5HHy1SNNXf79OlN0ArG07bq3cGFz0v-nfBm2RAnYJ3LGBsuiptH43g..',
80-
map = new SuperMap.Map("map", {
81-
controls: [
82-
new SuperMap.Control.Navigation(),
83-
new SuperMap.Control.Zoom(),
84-
new SuperMap.Control.LayerSwitcher()
74+
<script type="text/javascript" src="../../dist/classic/include-classic.js"></script>
75+
<script type="text/javascript">
76+
var host = window.isLocal ? window.server : "http://114.115.213.31:8090";
77+
var resultLayer,
78+
processingsUrl = host + "/iserver/services/distributedanalyst/rest/v1/jobs",
79+
mapURL = host + "/iserver/services/map-world/rest/maps/World",
80+
map = new SuperMap.Map("map", {
81+
controls: [
82+
new SuperMap.Control.Navigation(),
83+
new SuperMap.Control.Zoom(),
84+
new SuperMap.Control.LayerSwitcher()
8585

86-
], allOverlays: true
86+
],
87+
allOverlays: true
88+
});
89+
map.addControl(new SuperMap.Control.MousePosition());
90+
var layer = new SuperMap.Layer.TiledDynamicRESTLayer("World", mapURL, null, {
91+
maxResolution: "auto"
8792
});
88-
map.addControl(new SuperMap.Control.MousePosition());
89-
var layer = new SuperMap.Layer.TiledDynamicRESTLayer("World", mapURL, null, {maxResolution: "auto"});
90-
layer.events.on({"layerInitialized": addLayer});
91-
92-
function addLayer() {
93-
map.addLayers([layer]);
94-
map.setCenter(new SuperMap.LonLat(-73.95, 40.75), 12);
95-
}
96-
97-
var processingService = new SuperMap.REST.ProcessingService(processingsUrl,{withCredentials:window.isLocal});
98-
if (!window.isLocal) {
99-
SuperMap.SecurityManager.registerToken(processingsUrl, token);
100-
}
101-
102-
function getBounds() {
103-
if ($('#bounds').val() === "") {
104-
return "";
105-
}
106-
var bounds = [];
107-
$('#bounds').val().split(',').map(function (el) {
108-
bounds.push(parseFloat(el));
93+
layer.events.on({
94+
"layerInitialized": addLayer
10995
});
110-
return new SuperMap.Bounds(
111-
bounds[0],
112-
bounds[1],
113-
bounds[2],
114-
bounds[3]
115-
);
116-
}
11796

118-
$('#btn').on('click', function () {
119-
if ($('#msg_container')[0]) {
120-
$('#msg_container').remove();
97+
function addLayer() {
98+
map.addLayers([layer]);
99+
map.setCenter(new SuperMap.LonLat(-73.95, 40.75), 12);
121100
}
122-
widgets.loader.showLoader();
123-
if (map && resultLayer) {
124-
map.removeLayer(resultLayer);
125-
}
126-
var buffersAnalystJobsParameter = new SuperMap.BuffersAnalystJobsParameter({
127-
datasetName: $('#datasetName').val(),
128-
bounds: getBounds(),
129-
distance: $('#distace').val(),
130-
distanceField: $('#distanceField').val(),
131-
distanceUnit: $('#distanceUnit option:selected').attr('value'),
132-
dissolveField: $('#dissoveField').val()
101+
102+
var processingService = new SuperMap.REST.ProcessingService(processingsUrl, {
103+
withCredentials: window.isLocal
133104
});
134-
processingService.addBuffersJob(buffersAnalystJobsParameter, function (serviceResult) {
135-
if (serviceResult.error) {
136-
widgets.loader.removeLoader();
137-
var errorMsg = serviceResult.error.errorMsg || "code: " + serviceResult.error.code;
138-
widgets.alert.showAlert(resources.msg_createFailed + "<br>" + errorMsg, false);
139-
return;
105+
SuperMap.SecurityManager.registerToken(processingsUrl, window.exampleToken);
106+
107+
function getBounds() {
108+
if ($('#bounds').val() === "") {
109+
return "";
140110
}
141-
serviceResult.result.setting.serviceInfo.targetServiceInfos.map(function (info) {
142-
if (info.serviceType === 'RESTMAP') {
143-
SuperMap.FetchRequest.get(info.serviceAddress + '/maps').then(function (response) {
144-
return response.json();
145-
}).then(function (result) {
146-
var mapUrl = result[0].path;
147-
resultLayer = new SuperMap.Layer.TiledDynamicRESTLayer("resultLayer", mapUrl, {transparent: true});
148-
resultLayer.events.on({"layerInitialized": addLayer});
111+
var bounds = [];
112+
$('#bounds').val().split(',').map(function (el) {
113+
bounds.push(parseFloat(el));
114+
});
115+
return new SuperMap.Bounds(
116+
bounds[0],
117+
bounds[1],
118+
bounds[2],
119+
bounds[3]
120+
);
121+
}
149122

150-
function addLayer() {
151-
map.addLayer(resultLayer);
152-
widgets.loader.removeLoader();
153-
}
154-
});
123+
$('#btn').on('click', function () {
124+
if ($('#msg_container')[0]) {
125+
$('#msg_container').remove();
126+
}
127+
widgets.loader.showLoader();
128+
if (map && resultLayer) {
129+
map.removeLayer(resultLayer);
130+
}
131+
var buffersAnalystJobsParameter = new SuperMap.BuffersAnalystJobsParameter({
132+
datasetName: $('#datasetName').val(),
133+
bounds: getBounds(),
134+
distance: $('#distace').val(),
135+
distanceField: $('#distanceField').val(),
136+
distanceUnit: $('#distanceUnit option:selected').attr('value'),
137+
dissolveField: $('#dissoveField').val()
138+
});
139+
processingService.addBuffersJob(buffersAnalystJobsParameter, function (serviceResult) {
140+
if (serviceResult.error) {
141+
widgets.loader.removeLoader();
142+
var errorMsg = serviceResult.error.errorMsg || "code: " + serviceResult.error.code;
143+
widgets.alert.showAlert(resources.msg_createFailed + "<br>" + errorMsg, false);
144+
return;
155145
}
146+
serviceResult.result.setting.serviceInfo.targetServiceInfos.map(function (info) {
147+
if (info.serviceType === 'RESTMAP') {
148+
SuperMap.FetchRequest.get(info.serviceAddress + '/maps').then(function (
149+
response) {
150+
return response.json();
151+
}).then(function (result) {
152+
var mapUrl = result[0].path;
153+
resultLayer = new SuperMap.Layer.TiledDynamicRESTLayer(
154+
"resultLayer", mapUrl, {
155+
transparent: true
156+
});
157+
resultLayer.events.on({
158+
"layerInitialized": addLayer
159+
});
160+
161+
function addLayer() {
162+
map.addLayer(resultLayer);
163+
widgets.loader.removeLoader();
164+
}
165+
});
166+
}
167+
});
156168
});
157169
});
158-
});
159-
160-
</script>
170+
</script>
161171
</body>
172+
162173
</html>

0 commit comments

Comments
 (0)