Skip to content

Commit 63f47a2

Browse files
SuperHuZhiPengSuperHuZhiPeng
committed
Merge branch 'master' of github.com:SuperMap/iClient-JavaScript
2 parents 29291c3 + fbf9019 commit 63f47a2

File tree

14 files changed

+36
-24
lines changed

14 files changed

+36
-24
lines changed

‎examples/js/plottingPanel/PlotPanel.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ L.supermap.plotting.initPlotPanel = function (div, serverUrl, drawControl) {
8181
function analysisSymbolTree(symbolLibManager) {
8282
var treeData = [];
8383
var idIndex = addBasicCellTreeNodes(treeData);
84-
var idIndex = addRouteTreeNodes(treeData);
84+
//var idIndex = addRouteTreeNodes(treeData);
8585

8686
for (var i = 0; i < symbolLibManager.getSymbolLibNumber(); i++) {
8787
var symbolLib = symbolLibManager.getSymbolLibByIndex(i);

‎examples/js/tokengenerator.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
window.exampleToken = "PisX2NS9DsMKnnNzs6lg5WzjwZqvH2zXcizVYuBG0L0MvPrnBafdbATturwemCbsdUMHvIfItEBVCAcgubl-UNDHMsJU_XJWanQN65xaOUj_xMCsSTkKn26WFWLgvKBy";
2-
window.iportalToken ="faNfcKfyA5d0Um7GWybd0bH-ob9F-uqBIUzJG2mQ6RUyf47tY0v4jjkHrM8fTGiyFtXtdLWBzngHgGuX2hU8Qn2oig.."
2+
window.iportalToken ="-zB-JHDrzfSPdFedHkASLYkAatScvCxaJJlvphw5tMwRZtDyhhZ7Bv2tTXrT3l1sryYfZjOSArL3aPYm3Q2Ud7Y5ZA.."
33
window.iportalKey ="S3XYMe6UVH3rWPNbM979PybI"

‎examples/leaflet/echartsPie.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
attributeFilter: "NAME = '广州市' or NAME = '上海市'"
153153
}, {
154154
name: "Capital_P@China",
155-
attributeFilter: "NAME = '北京市'"
155+
attributeFilter: "Name = '北京市'"
156156
}]
157157
});
158158

@@ -167,7 +167,7 @@
167167
return latlng;
168168
}
169169
}).on('click', function (e) {
170-
var city = e.layer.feature.properties.NAME;
170+
var city = e.layer.feature.properties.NAME || e.layer.feature.properties.Name;
171171
chart.setOption({
172172
title: {
173173
text: city + resources.text_commoditySales

‎examples/leaflet/echartsScatter.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -322,10 +322,10 @@
322322
var param = new L.supermap.QueryBySQLParameters({
323323
queryParams: [{
324324
name: "ProvinceCapital_P@China",
325-
attributeFilter: "NAME = '广州市' or NAME = '上海市'"
325+
attributeFilter: "NAME = '广州市' or NAME = '上海市' or NAME = '北京市'"
326326
}, {
327327
name: "Capital_P@China",
328-
attributeFilter: "NAME = '北京市'"
328+
attributeFilter: "Name = '北京市'"
329329
}]
330330
});
331331

@@ -340,7 +340,7 @@
340340
return latlng;
341341
},
342342
}).on('click', function (e) {
343-
var city = e.layer.feature.properties.NAME;
343+
var city = e.layer.feature.properties.NAME || e.layer.feature.properties.Name;
344344
chart.setOption({
345345
color: [
346346
colorMap[city]

‎examples/leaflet/iPortalSecurity.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ <h4 data-i18n="resources.title_iPortalSecurity"></h4>
247247
//SuperMap.Support.cors = false;
248248
$(document).ready(function () {
249249
$("#loginUrl_iportal").val("http://localhost:8090/iportal");
250-
$("#tokenServiceUrl_iportal").val("https://iportal.supermap.io/iportal/web/services/925052030");
250+
$("#tokenServiceUrl_iportal").val("https://iportal.supermap.io/iportal/web/services/1850990365");
251251
$("#token_iportal").val(window.iportalToken);
252252

253253
$("#serviceUrl_iportal").val("https://iportal.supermap.io/portalproxy/rz0fn8kv/iserver/services/map-ChinaProvinces/rest/maps/ChinaProvinces");

‎examples/mapboxgl/echarts_pie.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202
},
203203
{
204204
name: 'Capital_P@China',
205-
attributeFilter: "NAME = '北京市'"
205+
attributeFilter: "Name = '北京市'"
206206
}
207207
]
208208
});
@@ -239,7 +239,7 @@
239239
.setDOMContent(div) // sets a popup on this marker
240240
.addTo(map);
241241

242-
var city = e.features[0].properties.NAME;
242+
var city = e.features[0].properties.NAME || e.features[0].properties.Name;
243243
chart.setOption({
244244
title: {
245245
text: city + resources.text_commoditySales

‎examples/mapboxgl/echarts_scatter.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@
357357
attributeFilter: "NAME = '广州市' or NAME = '上海市'"
358358
}, {
359359
name: "Capital_P@China",
360-
attributeFilter: "NAME = '北京市'"
360+
attributeFilter: "Name = '北京市'"
361361
}]
362362
});
363363

@@ -393,7 +393,7 @@
393393
.setDOMContent(div) // sets a popup on this marker
394394
.addTo(map);
395395

396-
var city = e.features[0].properties.NAME;
396+
var city = e.features[0].properties.NAME || e.features[0].properties.Name;
397397
chart.setOption({
398398
color: [
399399
colorMap[city]

‎examples/maplibregl/echarts_pie.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@
209209
},
210210
{
211211
name: 'Capital_P@China',
212-
attributeFilter: "NAME = '北京市'"
212+
attributeFilter: "Name = '北京市'"
213213
}
214214
]
215215
});
@@ -246,7 +246,7 @@
246246
.setDOMContent(div) // sets a popup on this marker
247247
.addTo(map);
248248

249-
var city = e.features[0].properties.NAME;
249+
var city = e.features[0].properties.NAME || e.features[0].properties.Name;
250250
chart.setOption({
251251
title: {
252252
text: city + resources.text_commoditySales

‎examples/maplibregl/echarts_scatter.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@
364364
attributeFilter: "NAME = '广州市' or NAME = '上海市'"
365365
}, {
366366
name: "Capital_P@China",
367-
attributeFilter: "NAME = '北京市'"
367+
attributeFilter: "Name = '北京市'"
368368
}]
369369
});
370370

@@ -401,7 +401,7 @@
401401
.setDOMContent(div) // sets a popup on this marker
402402
.addTo(map);
403403

404-
var city = e.features[0].properties.NAME;
404+
var city = e.features[0].properties.NAME || e.features[0].properties.Name;
405405
chart.setOption({
406406
color: [
407407
colorMap[city]

‎examples/maplibregl/multiphaseplay.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
}
150150

151151
function addTimeLine() {
152-
var allTime = allFeatures.map(feature => feature.time.split('/')[0]);
152+
var allTime = ['2009', '2010', '2011', '2012', '2013', '2014', '2015', '2016'];
153153
myChart = echarts.init(document.getElementById('timeline'));
154154
var option = {
155155
timeline: {

0 commit comments

Comments
 (0)