Skip to content

Commit 73b4372

Browse files
songyumengsongyumeng
committed
【fix】增加栅格分析的例子，修复leaflet cartocss配置pointurl不生效的问题 review by luoxiao
1 parent cd30394 commit 73b4372

File tree

10 files changed

+30
-9
lines changed

10 files changed

+30
-9
lines changed

‎dist/leaflet/iclient9-leaflet-es6.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65939,7 +65939,7 @@ class ChartModel_ChartModel {
6593965939
* @class SuperMap.Widgets.ChartViewModel
6594065940
* @classdesc 图表组件功能类
6594165941
* @category Components Chart
65942-
* @version 10.X.X
65942+
* @version 10.0.0
6594365943
* @param {Object} options - 可选参数。
6594465944
* @param {string} options.type - 图表类型。
6594565945
* @param {SuperMap.Widgets.Chart.Datasets} options.datasets - 数据来源。
@@ -81101,7 +81101,7 @@ var TileVectorLayer_TileVectorLayer = VectorGrid_VectorGrid.extend({
8110181101
for (var itemKey in shaders) {
8110281102
var shader = shaders[itemKey];
8110381103
for (var j = 0; j < shader.length; j++) {
81104-
var serverStyle = this.cartoCSSToLeaflet.getValidStyleFromCarto(coords.z, scale, shader[j], feature);
81104+
var serverStyle = this.cartoCSSToLeaflet.getValidStyleFromCarto(coords.z, scale, shader[j], feature,this.options.serverCartoCSSStyle);
8110581105
if (serverStyle) {
8110681106
style.push(serverStyle);
8110781107
}

‎dist/leaflet/iclient9-leaflet-es6.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/leaflet/iclient9-leaflet.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40872,7 +40872,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
4087240872
* @class SuperMap.Widgets.ChartViewModel
4087340873
* @classdesc 图表组件功能类
4087440874
* @category Components Chart
40875-
* @version 10.X.X
40875+
* @version 10.0.0
4087640876
* @param {Object} options - 可选参数。
4087740877
* @param {string} options.type - 图表类型。
4087840878
* @param {SuperMap.Widgets.Chart.Datasets} options.datasets - 数据来源。
@@ -73570,7 +73570,7 @@ var TileVectorLayer = exports.TileVectorLayer = _VectorGrid.VectorGrid.extend({
7357073570
for (var itemKey in shaders) {
7357173571
var shader = shaders[itemKey];
7357273572
for (var j = 0; j < shader.length; j++) {
73573-
var serverStyle = this.cartoCSSToLeaflet.getValidStyleFromCarto(coords.z, scale, shader[j], feature);
73573+
var serverStyle = this.cartoCSSToLeaflet.getValidStyleFromCarto(coords.z, scale, shader[j], feature, this.options.serverCartoCSSStyle);
7357473574
if (serverStyle) {
7357573575
style.push(serverStyle);
7357673576
}

‎dist/leaflet/iclient9-leaflet.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/leaflet/config.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@ var exampleConfig = {
4949
name_en: "custom scale",
5050
thumbnail: "l_tiledMapLayerProj4.png",
5151
fileName: "01_tiledMapLayerProj4"
52+
}, {
53+
name: "地图-栅格分析",
54+
name_en: "map rasterFunction",
55+
version: "10.0.0",
56+
thumbnail: "l_tiledMapLayerRasterfunction.png",
57+
fileName: "01_tiledMapLayer_rasterfunction"
5258
}, {
5359
name: "地图信息",
5460
name_en: "map query service",

‎examples/locales/en-US/resources.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ window.examplesResources = {
148148
"title_tiledMapLayer3857": "3857 Base Map of SuperMap REST",
149149
"title_imageMapLayer3857": "3857 Base Map of SuperMap REST (image)",
150150
"title_imageMapLayer4326": "4326 Base Map of SuperMap REST (image)",
151+
"title_tiledMapLayer_rasterfunction": "SuperMap REST Map Service(rasterfunction)",
151152
"title_addressMatchService": "Address Match Service",
152153
"title_bufferAnalyst1": "Buffer Analysis 1",
153154
"title_bufferAnalyst2": "Buffer Analysis 2",

‎examples/locales/zh-CN/resources.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ window.examplesResources = {
8989
"title_tiledMapLayer3857": "SuperMap REST 地图服务底图",
9090
"title_imageMapLayer3857": "SuperMap REST 地图服务底图(image)",
9191
"title_imageMapLayer4326": "SuperMap REST 地图服务底图(image)",
92+
"title_tiledMapLayer_rasterfunction": "SuperMap REST 地图服务(栅格分析)",
9293
"title_addressMatchService": "地址匹配服务",
9394
"title_bufferAnalyst1": "缓冲区分析一",
9495
"title_bufferAnalyst2": "缓冲区分析二",

‎examples/mapboxgl/config.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,14 @@ var exampleConfig = {
2020
name_en: "3857 coordinate system",
2121
thumbnail: "mb_TileLayer.png",
2222
fileName: "01_tiledMapLayer"
23-
},
23+
},
24+
{
25+
name: "地图-栅格分析",
26+
name_en: "map rasterFunction",
27+
version: "10.0.0",
28+
thumbnail: "tiledMapLayerRasterfunction.png",
29+
fileName: "01_tiledMapLayer_rasterfunction"
30+
},
2431
{
2532
name: "地图信息",
2633
name_en: "map query service",
@@ -495,7 +502,7 @@ var exampleConfig = {
495502
{
496503
name: "iServer数据服务矢量瓦片(2000万点)",
497504
name_en: "iServer REST Data VectorTile(20 million Point)",
498-
version: "10.0.1",
505+
version: "10.0.0",
499506
thumbnail: "mvtVectorTile_restdata.png",
500507
fileName: "mvtVectorTile_restdata"
501508
}

‎examples/openlayers/config.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@ var exampleConfig = {
3535
name_en: "planar coordinate system",
3636
thumbnail: "ol_tiledMapLayerNoProj.png",
3737
fileName: "01_tiledMapLayerNoProj"
38+
}, {
39+
name: "地图-栅格分析",
40+
name_en: "map rasterFunction",
41+
version: "10.0.0",
42+
thumbnail: "ol_tiledMapLayerRasterfunction.png",
43+
fileName: "01_tiledmaplayer_rasterfunction"
3844
}, {
3945
name: "地图信息",
4046
name_en: "map query service",

‎src/leaflet/overlay/TileVectorLayer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ export var TileVectorLayer = VectorGrid.extend({
291291
for (var itemKey in shaders) {
292292
var shader = shaders[itemKey];
293293
for (var j = 0; j < shader.length; j++) {
294-
var serverStyle = this.cartoCSSToLeaflet.getValidStyleFromCarto(coords.z, scale, shader[j], feature);
294+
var serverStyle = this.cartoCSSToLeaflet.getValidStyleFromCarto(coords.z, scale, shader[j], feature,this.options.serverCartoCSSStyle);
295295
if (serverStyle) {
296296
style.push(serverStyle);
297297
}

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy