【fix】增加栅格分析的例子，修复leaflet cartocss配置pointurl不生效的问题 review by luoxiao

Author: songyumeng

dist/leaflet/iclient9-leaflet-es6.js

@@ -65939,7 +65939,7 @@ class ChartModel_ChartModel {
  * @class SuperMap.Widgets.ChartViewModel
  * @classdesc 图表组件功能类
  * @category Components Chart
- * @version 10.X.X
+ * @version 10.0.0
  * @param {Object} options - 可选参数。
  * @param {string} options.type - 图表类型。
  * @param {SuperMap.Widgets.Chart.Datasets} options.datasets - 数据来源。
@@ -81101,7 +81101,7 @@ var TileVectorLayer_TileVectorLayer = VectorGrid_VectorGrid.extend({
         for (var itemKey in shaders) {
             var shader = shaders[itemKey];
             for (var j = 0; j < shader.length; j++) {
-                var serverStyle = this.cartoCSSToLeaflet.getValidStyleFromCarto(coords.z, scale, shader[j], feature);
+                var serverStyle = this.cartoCSSToLeaflet.getValidStyleFromCarto(coords.z, scale, shader[j], feature,this.options.serverCartoCSSStyle);
                 if (serverStyle) {
                     style.push(serverStyle);
                 }

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

@@ -40872,7 +40872,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
  * @class SuperMap.Widgets.ChartViewModel
  * @classdesc 图表组件功能类
  * @category Components Chart
- * @version 10.X.X
+ * @version 10.0.0
  * @param {Object} options - 可选参数。
  * @param {string} options.type - 图表类型。
  * @param {SuperMap.Widgets.Chart.Datasets} options.datasets - 数据来源。
@@ -73570,7 +73570,7 @@ var TileVectorLayer = exports.TileVectorLayer = _VectorGrid.VectorGrid.extend({
         for (var itemKey in shaders) {
             var shader = shaders[itemKey];
             for (var j = 0; j < shader.length; j++) {
-                var serverStyle = this.cartoCSSToLeaflet.getValidStyleFromCarto(coords.z, scale, shader[j], feature);
+                var serverStyle = this.cartoCSSToLeaflet.getValidStyleFromCarto(coords.z, scale, shader[j], feature, this.options.serverCartoCSSStyle);
                 if (serverStyle) {
                     style.push(serverStyle);
                 }

dist/leaflet/iclient9-leaflet.js

@@ -49,6 +49,12 @@ var exampleConfig = {
                     name_en: "custom scale",
                     thumbnail: "l_tiledMapLayerProj4.png",
                     fileName: "01_tiledMapLayerProj4"
+                }, {
+                    name: "地图-栅格分析",
+                    name_en: "map rasterFunction",
+                    version: "10.0.0",
+                    thumbnail: "l_tiledMapLayerRasterfunction.png",
+                    fileName: "01_tiledMapLayer_rasterfunction"
                 }, {
                     name: "地图信息",
                     name_en: "map query service",

dist/leaflet/iclient9-leaflet.min.js

@@ -148,6 +148,7 @@ window.examplesResources = {
         "title_tiledMapLayer3857": "3857 Base Map of SuperMap REST",
         "title_imageMapLayer3857": "3857 Base Map of SuperMap REST (image)",
         "title_imageMapLayer4326": "4326 Base Map of SuperMap REST (image)",
+        "title_tiledMapLayer_rasterfunction": "SuperMap REST Map Service(rasterfunction)",
         "title_addressMatchService": "Address Match Service",
         "title_bufferAnalyst1": "Buffer Analysis 1",
         "title_bufferAnalyst2": "Buffer Analysis 2",

examples/leaflet/config.js

@@ -89,6 +89,7 @@ window.examplesResources = {
         "title_tiledMapLayer3857": "SuperMap REST 地图服务底图",
         "title_imageMapLayer3857": "SuperMap REST 地图服务底图(image)",
         "title_imageMapLayer4326": "SuperMap REST 地图服务底图(image)",
+        "title_tiledMapLayer_rasterfunction": "SuperMap REST 地图服务(栅格分析)",
         "title_addressMatchService": "地址匹配服务",
         "title_bufferAnalyst1": "缓冲区分析一",
         "title_bufferAnalyst2": "缓冲区分析二",

examples/locales/en-US/resources.js

@@ -20,7 +20,14 @@ var exampleConfig = {
                         name_en: "3857 coordinate system",
                         thumbnail: "mb_TileLayer.png",
                         fileName: "01_tiledMapLayer"
-                    },
+                    }, 
+                    {
+                        name: "地图-栅格分析",
+                        name_en: "map rasterFunction",
+                        version: "10.0.0",
+                        thumbnail: "tiledMapLayerRasterfunction.png",
+                        fileName: "01_tiledMapLayer_rasterfunction"
+                    },          
                     {
                         name: "地图信息",
                         name_en: "map query service",
@@ -495,7 +502,7 @@ var exampleConfig = {
                     {
                         name: "iServer数据服务矢量瓦片(2000万点)",
                         name_en: "iServer REST Data VectorTile(20 million Point)",
-                        version: "10.0.1",
+                        version: "10.0.0",
                         thumbnail: "mvtVectorTile_restdata.png",
                         fileName: "mvtVectorTile_restdata"
                     }

examples/locales/zh-CN/resources.js

@@ -35,6 +35,12 @@ var exampleConfig = {
                     name_en: "planar coordinate system",
                     thumbnail: "ol_tiledMapLayerNoProj.png",
                     fileName: "01_tiledMapLayerNoProj"
+                }, {
+                    name: "地图-栅格分析",
+                    name_en: "map rasterFunction",
+                    version: "10.0.0",
+                    thumbnail: "ol_tiledMapLayerRasterfunction.png",
+                    fileName: "01_tiledmaplayer_rasterfunction"
                 }, {
                     name: "地图信息",
                     name_en: "map query service",

examples/mapboxgl/config.js

@@ -291,7 +291,7 @@ export var TileVectorLayer = VectorGrid.extend({
         for (var itemKey in shaders) {
             var shader = shaders[itemKey];
             for (var j = 0; j < shader.length; j++) {
-                var serverStyle = this.cartoCSSToLeaflet.getValidStyleFromCarto(coords.z, scale, shader[j], feature);
+                var serverStyle = this.cartoCSSToLeaflet.getValidStyleFromCarto(coords.z, scale, shader[j], feature,this.options.serverCartoCSSStyle);
                 if (serverStyle) {
                     style.push(serverStyle);
                 }