Skip to content

Commit 25d7b6a

Browse files
author
caoxinke
committed
2 parents 4fb66f7 + 2c81d92 commit 25d7b6a

File tree

4 files changed

+42
-17
lines changed

4 files changed

+42
-17
lines changed

‎dist/iclient9-leaflet.js‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36890,7 +36890,12 @@ SuperMap.CartoCSS = SuperMap.Class({
3689036890
if (prop !== 'zoom' && prop !== 'frames' && prop !== "attachment" && prop != "elements") {
3689136891
//对layer-index作特殊处理以实现图层的控制
3689236892
if (prop === "layer-index") {
36893-
var getLayerIndex = Function("attributes", "zoom", "var _value = null;" + shader[prop].join('\n') + "; return _value; ");
36893+
/*var getLayerIndex = Function("attributes", "zoom", "var _value = null;" + shader[prop].join('\n') + "; return _value; ");*/
36894+
var getLayerIndex = function(attributes,zoom){
36895+
var _value = null;
36896+
shader[prop].join('\n');
36897+
return _value;
36898+
};
3689436899
var layerIndex = getLayerIndex();
3689536900
Object.defineProperty(shaderArray, "layerIndex", {
3689636901
configurable: true,
@@ -36911,7 +36916,12 @@ SuperMap.CartoCSS = SuperMap.Class({
3691136916
var featureFilterStart = index + myKeyword.length;
3691236917
var featureFilterEnd = body.indexOf(")", featureFilterStart + 1);
3691336918
var featureFilterStr = "featureId&&(featureId" + body.substring(featureFilterStart, featureFilterEnd) + ")";
36914-
var featureFilter = Function("featureId", "if(" + featureFilterStr + "){return true;}return false;");
36919+
/*var featureFilter = Function("featureId", "if(" + featureFilterStr + "){return true;}return false;");*/
36920+
var featureFilter = function(featureId){
36921+
if(featureFilterStr){
36922+
return true;}
36923+
return false;
36924+
}
3691536925
Object.defineProperty(shaderArray, "featureFilter", {
3691636926
configurable: true,
3691736927
enumerable: false,

‎dist/iclient9-openlayers.js‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28007,7 +28007,12 @@ SuperMap.CartoCSS = SuperMap.Class({
2800728007
if (prop !== 'zoom' && prop !== 'frames' && prop !== "attachment" && prop != "elements") {
2800828008
//对layer-index作特殊处理以实现图层的控制
2800928009
if (prop === "layer-index") {
28010-
var getLayerIndex = Function("attributes", "zoom", "var _value = null;" + shader[prop].join('\n') + "; return _value; ");
28010+
/*var getLayerIndex = Function("attributes", "zoom", "var _value = null;" + shader[prop].join('\n') + "; return _value; ");*/
28011+
var getLayerIndex = function(attributes,zoom){
28012+
var _value = null;
28013+
shader[prop].join('\n');
28014+
return _value;
28015+
};
2801128016
var layerIndex = getLayerIndex();
2801228017
Object.defineProperty(shaderArray, "layerIndex", {
2801328018
configurable: true,
@@ -28028,7 +28033,12 @@ SuperMap.CartoCSS = SuperMap.Class({
2802828033
var featureFilterStart = index + myKeyword.length;
2802928034
var featureFilterEnd = body.indexOf(")", featureFilterStart + 1);
2803028035
var featureFilterStr = "featureId&&(featureId" + body.substring(featureFilterStart, featureFilterEnd) + ")";
28031-
var featureFilter = Function("featureId", "if(" + featureFilterStr + "){return true;}return false;");
28036+
/*var featureFilter = Function("featureId", "if(" + featureFilterStr + "){return true;}return false;");*/
28037+
var featureFilter = function(featureId){
28038+
if(featureFilterStr){
28039+
return true;}
28040+
return false;
28041+
}
2803228042
Object.defineProperty(shaderArray, "featureFilter", {
2803328043
configurable: true,
2803428044
enumerable: false,

‎src/common/style/CartoCSS.js‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,12 @@ SuperMap.CartoCSS = SuperMap.Class({
943943
if (prop !== 'zoom' && prop !== 'frames' && prop !== "attachment" && prop != "elements") {
944944
//对layer-index作特殊处理以实现图层的控制
945945
if (prop === "layer-index") {
946-
var getLayerIndex = Function("attributes", "zoom", "var _value = null;" + shader[prop].join('\n') + "; return _value; ");
946+
/*var getLayerIndex = Function("attributes", "zoom", "var _value = null;" + shader[prop].join('\n') + "; return _value; ");*/
947+
var getLayerIndex = function(attributes,zoom){
948+
var _value = null;
949+
shader[prop].join('\n');
950+
return _value;
951+
};
947952
var layerIndex = getLayerIndex();
948953
Object.defineProperty(shaderArray, "layerIndex", {
949954
configurable: true,
@@ -964,7 +969,12 @@ SuperMap.CartoCSS = SuperMap.Class({
964969
var featureFilterStart = index + myKeyword.length;
965970
var featureFilterEnd = body.indexOf(")", featureFilterStart + 1);
966971
var featureFilterStr = "featureId&&(featureId" + body.substring(featureFilterStart, featureFilterEnd) + ")";
967-
var featureFilter = Function("featureId", "if(" + featureFilterStr + "){return true;}return false;");
972+
/*var featureFilter = Function("featureId", "if(" + featureFilterStr + "){return true;}return false;");*/
973+
var featureFilter = function(featureId){
974+
if(featureFilterStr){
975+
return true;}
976+
return false;
977+
}
968978
Object.defineProperty(shaderArray, "featureFilter", {
969979
configurable: true,
970980
enumerable: false,

‎web/index.html‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -87,19 +87,17 @@ <h2 id="quick-start">快速入门</h2>
8787
<div>
8888
<h3 style="margin-top: 34px;font-size: 24px;color: #404040;letter-spacing: -0.16px;">Leaflet</h3>
8989
<div class="map" id="leafletMap"></div>
90-
<p style="margin-top: 18px">将 iSevrer 发布的地图加载至 Leaflet 的 map 中
91-
<a href="../examples/leaflet/editor.html" style="font-size: 10px;float:right">查看源码&nbsp;&raquo;</a>
92-
</p>
90+
<p style="margin-top: 18px">将 iSevrer 发布的地图加载至 Leaflet 的 map 中</p>
9391
<pre class="javascript"><code>var map = L.map(&#39;map&#39;);
9492
L.supermap.tiledMapLayer(&quot;http://localhost:8090/iserver/services/map/rest/maps/China&quot;).addTo(map);</code></pre>
95-
93+
<a href="../examples/leaflet/editor.html#01_tiledMapLayer3857" style="font-size: 10px;float:right">查看源码&nbsp;&raquo;</a>
9694
</div>
9795
<!--OpenLayers-->
9896
<div>
9997
<h3 style="margin-top: 34px;font-size: 24px;color: #404040;letter-spacing: -0.16px;">OpenLayers</h3>
10098
<div class="map" id="olMap"></div>
10199
<p style="margin-top: 19px">将 iSevrer 发布的地图加载至 OpenLayers 的 map 中
102-
<a href="../examples/openlayers/editor.html" style="font-size: 10px;float:right">查看源码&nbsp;&raquo;</a>
100+
103101
</p>
104102
<pre class="javascript"><code>var map = new ol.Map({
105103
target: &#39;map&#39;,
@@ -109,14 +107,13 @@ <h3 style="margin-top: 34px;font-size: 24px;color: #404040;letter-spacing: -0.16
109107
}),
110108
})]
111109
});</code></pre>
112-
110+
<a href="../examples/openlayers/editor.html#01_tiledMapLayer4326" style="font-size: 10px;float:right">查看源码&nbsp;&raquo;</a>
113111
</div>
114112
<!--Mapbox GL JS-->
115113
<div>
116114
<h3 style="margin-top: 34px;font-size: 24px;color: #404040;letter-spacing: -0.16px;">Mapbox GL JS</h3>
117115
<div class="map" id="mapboxMap"></div>
118116
<p style="margin-top: 19px">将 iSevrer 发布的地图加载至 Mapbox GL JS 的 map 中
119-
<a href="../examples/mapboxgl/editor.html" style="font-size: 10px;float:right">查看源码&nbsp;&raquo;</a>
120117
</p>
121118
<pre class="javascript"><code>var map = new mapboxgl.Map({
122119
container: "map",
@@ -134,19 +131,17 @@ <h3 style="margin-top: 34px;font-size: 24px;color: #404040;letter-spacing: -0.16
134131
}]
135132
},
136133
});</code></pre>
137-
134+
<a href="../examples/mapboxgl/editor.html#01_tiledMapLayer" style="font-size: 10px;float:right">查看源码&nbsp;&raquo;</a>
138135
</div>
139136
<!--iClient3D-->
140137
<div>
141138
<h3 style="margin-top: 34px;font-size: 24px;color: #404040;letter-spacing: -0.16px;">iClient3D</h3>
142139
<div class="map" id="iC3DMap"></div>
143140
<p style="margin-top: 19px">
144-
&nbsp;
145-
<a href="../examples/iclient3d/editor.html" style="font-size: 10px;float:right;">查看源码&nbsp;&raquo;</a>
146141
</p>
147142

148143
<pre class="javascript"><code>var viewer = new Cesium.Viewer('cesiumContainer');</code></pre>
149-
144+
<a href="../examples/iclient3d/editor.html#01_3DMap" style="font-size: 10px;float:right;">查看源码&nbsp;&raquo;</a>
150145
</div>
151146
<!--新特性-->
152147
<div class="new-attributes">

0 commit comments

Comments
 (0)