Merge branch 'master' into dependabot/npm_and_yarn/leaflet-1.6.0

Author: songyumeng

.editorconfig

@@ -9,7 +9,7 @@ charset = utf-8
 
 [*.{js,html,css}]
 indent_style = space
-indent_size = 2
+indent_size = 4
 
 [*.{json}]
 indent_style = space

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 10.0.1 #
+
+
+
 # 10.0.0 #
 
 ## Distribution package changes
@@ -329,7 +333,7 @@
 - iClient for MapboxGL新增支持WGS84、China2000、Xian80、Beijing54等标准地理坐标系，覆盖MVT矢量瓦片、栅格瓦片、可视化图层、标绘等功能
 
 - 需单独引用iClient对Mapbox GL JS的增强库（基于2018年10月版本v0.51.0）
- http://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/mapbox-gl-enhance.js
+ https://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/mapbox-gl-enhance.js
 
 ![whatsNewMultiCoordinate](https://github.com/SuperMap/iClient-JavaScript/blob/master/.github/911-1.png)
 
@@ -366,7 +370,7 @@
 ### for MapboxGL
 
 - 支持WGS84、China2000、Xian80、Beijing54等标准地理坐标系，需单独引用iClient对MapboxGL的增强库：
- http://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/mapbox-gl-enhance.js
+ https://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/mapbox-gl-enhance.js
 
 ## Fixed
 
@@ -552,29 +556,29 @@
 
 ### 渲染性能再升级
 
-- 高效率点图层GraphicLayer支持数据量由之前的30万提升至100万，相较9D版本有了3倍以上的性能提升，100万点数据可在1秒内完成渲染；同时，新增支持任意带经纬度的点数据格式，例如GeoJSON，TopoJSON，二维表等多种格式，同时可以实时改变点的样式，并支持交互操作如根据属性筛选和过滤和鼠标事件。[示例>>](http://iclient.supermap.io/examples/leaflet/editor.html#12_graphiclayer_webgl)
+- 高效率点图层GraphicLayer支持数据量由之前的30万提升至100万，相较9D版本有了3倍以上的性能提升，100万点数据可在1秒内完成渲染；同时，新增支持任意带经纬度的点数据格式，例如GeoJSON，TopoJSON，二维表等多种格式，同时可以实时改变点的样式，并支持交互操作如根据属性筛选和过滤和鼠标事件。[示例>>](https://iclient.supermap.io/examples/leaflet/editor.html#12_graphiclayer_webgl)
 
 ![GraphicLayer](https://github.com/SuperMap/iClient-JavaScript/blob/master/.github/910-1.png)
 
-- 数据流图层DataFlowLayer增了MapV引擎，大幅提高了绘制Marker的性能，对于矢量点的渲染数据量由之前的1万提升至10万，对于栅格图片的渲染数据量由之前的3000提升至1万。[示例>>](http://iclient.supermap.io/examples/leaflet/editor.html#dataFlowService_mapv)
+- 数据流图层DataFlowLayer增了MapV引擎，大幅提高了绘制Marker的性能，对于矢量点的渲染数据量由之前的1万提升至10万，对于栅格图片的渲染数据量由之前的3000提升至1万。[示例>>](https://iclient.supermap.io/examples/leaflet/editor.html#dataFlowService_mapv)
 
 ![DataFlowLayer](https://github.com/SuperMap/iClient-JavaScript/blob/master/.github/910-2.png)
 
 ### 对接最新ECharts，渲染千万级数据
 
-- ECharts在今年1月发布了最新的版本4.0，新版本最大的亮点是支持了千万级数据的可视化渲染，通过对数据进行分块后加载，不需要漫长地等待所有数据加载完再进行绘制，以增量渲染的方式对数据进行可视化，从而提升性能。9D(2019)版本对EChartsLayer也同时进行了升级，已让Leaflet、OpenLayers、MapboxGL地图库都支持了ECharts 4.0的增量渲染能力。[示例>>](http://iclient.supermap.io/examples/leaflet/editor.html#echarts_linesDrawMillionsBeijingRoadsNetwork)
+- ECharts在今年1月发布了最新的版本4.0，新版本最大的亮点是支持了千万级数据的可视化渲染，通过对数据进行分块后加载，不需要漫长地等待所有数据加载完再进行绘制，以增量渲染的方式对数据进行可视化，从而提升性能。9D(2019)版本对EChartsLayer也同时进行了升级，已让Leaflet、OpenLayers、MapboxGL地图库都支持了ECharts 4.0的增量渲染能力。[示例>>](https://iclient.supermap.io/examples/leaflet/editor.html#echarts_linesDrawMillionsBeijingRoadsNetwork)
 
 ![EChartsLayer](https://github.com/SuperMap/iClient-JavaScript/blob/master/.github/910-3.png)
 
 ### MVT矢量瓦片细节优化
 
-- OpenLayers地图库的三方插件对于MVT矢量瓦片的特性支持的不够完美，9D(2019)版本在MVT矢量瓦片的细节呈现方面做了很多优化并增加了新特性，例如：支持面填充、支持文字标签避让、优化中文沿线标注、支持自定义字体、解决多面丢失、优化了渲染性能等，从而让OpenLayers拥有了可以媲美MapboxGL对MVT矢量瓦片的渲染效果，同时还支持除3857以外的其它任意标准坐标系。[示例>>](http://iclient.supermap.io/examples/openlayers/editor.html#mvtvectorlayer_mbstyle_landuse)
+- OpenLayers地图库的三方插件对于MVT矢量瓦片的特性支持的不够完美，9D(2019)版本在MVT矢量瓦片的细节呈现方面做了很多优化并增加了新特性，例如：支持面填充、支持文字标签避让、优化中文沿线标注、支持自定义字体、解决多面丢失、优化了渲染性能等，从而让OpenLayers拥有了可以媲美MapboxGL对MVT矢量瓦片的渲染效果，同时还支持除3857以外的其它任意标准坐标系。[示例>>](https://iclient.supermap.io/examples/openlayers/editor.html#mvtvectorlayer_mbstyle_landuse)
 
 ![MVT](https://github.com/SuperMap/iClient-JavaScript/blob/master/.github/910-4.png)
 
 ### 更多优秀的可视化特效
 
-- 9D版本为我们带来了很多炫酷的可视化效果，9D(2019)版本在这方面继续加强，新增集成了echarts / echartsgl / deck.gl可视化库的更多特效和范例。[示例>>](http://iclient.supermap.io/examples/mapboxgl/editor.html#deckglLayer_sfcontour)
+- 9D版本为我们带来了很多炫酷的可视化效果，9D(2019)版本在这方面继续加强，新增集成了echarts / echartsgl / deck.gl可视化库的更多特效和范例。[示例>>](https://iclient.supermap.io/examples/mapboxgl/editor.html#deckglLayer_sfcontour)
 
 ![deck.gl](https://github.com/SuperMap/iClient-JavaScript/blob/master/.github/910-5.png)
 

README.md

@@ -10,10 +10,15 @@ SuperMap iClient JavaScript 10i 是一套开源开放的 WebGIS 客户端应用
 
 ![Overview](https://raw.githubusercontent.com/SuperMap/iClient-JavaScript/master/.github/product_overview.png)
 
-[中文官网](http://iclient.supermap.io) | [ENGLISH HOMEPAGE](http://iclient.supermap.io/en/web/index.html)
+[中文官网](https://iclient.supermap.io) | [ENGLISH HOMEPAGE](https://iclient.supermap.io/en/web/index.html)
+
+## WebComponents Web组件库
+### [vue-iclient](https://github.com/SuperMap/vue-iclient)
+
+基于Vue 2.x的iClient UI组件库，[快速上手文档](https://iclient.supermap.io/web/apis/vue/zh/api/guide/quick-start.html)
 
 ## 示例
- [![](https://www.supermap.com/pic/anlipic/201792216859921.gif)](http://iclient.supermap.io/examples/mapboxgl/editor.html#mapvPolylineTime)
+ [![](https://www.supermap.com/pic/anlipic/201792216859921.gif)](https://iclient.supermap.io/examples/mapboxgl/editor.html#mapvPolylineTime)
 
 ## 许可
 [ Apache License 2.0 ](./LICENSE)

README_EN.md

@@ -10,10 +10,10 @@ SuperMap iClient JavaScript 10i is a set of open source WebGIS client applicatio
 
 ![Overview](https://github.com/SuperMap/iClient-JavaScript/blob/master/.github/product_overview_en.png)
 
-[中文官网](http://iclient.supermap.io) | [ENGLISH HOMEPAGE](http://iclient.supermap.io/en/web/index.html)
+[中文官网](https://iclient.supermap.io) | [ENGLISH HOMEPAGE](https://iclient.supermap.io/en/web/index.html)
 
 ## Samples
- [![](https://www.supermap.com/pic/anlipic/201792216859921.gif)](http://iclient.supermap.io/examples/mapboxgl/editor.html#mapvPolylineTime)
+ [![](https://www.supermap.com/pic/anlipic/201792216859921.gif)](https://iclient.supermap.io/examples/mapboxgl/editor.html#mapvPolylineTime)
 
 ## License
 [ Apache License 2.0 ](./LICENSE)

build/jsdocs/classic/index.md

@@ -1,11 +1,11 @@
 # SuperMap iClient Classic API
 SuperMap iClient Classic 是一套基于SuperMap iClient 8C(2017) for JavaScript的GIS客户端应用程序开发工具，通过它用户可以在SuperMap iClient 8C(2017) for JavaScript的基础上使用最新的SuperMap服务功能。
-* 官网(website)：<a href="http://iclient.supermap.io/web/introduction/classic.html#introduce" target="_parent">http://iclient.supermap.io/web/introduction/classic.html#introduce</a>
+* 官网(website)：<a href="https://iclient.supermap.io/web/introduction/classic.html#introduce" target="_parent">https://iclient.supermap.io/web/introduction/classic.html#introduce</a>
 
 * 源码(source code)：<a href="https://github.com/SuperMap/iClient-JavaScript/tree/master/src/classic" target="_blank">https://github.com/SuperMap/iClient-JavaScript/tree/master/src/classic</a>
 
 ## 参考API
 
-* iClient8C API:<a href="http://iclient.supermap.io/libs/iclient8c/apidoc/files/SuperMap/Map-js.html" target="_blank">http://iclient.supermap.io/libs/iclient8c/apidoc/files/SuperMap/Map-js.html</a>
-* ECharts API:<a href="http://echarts.baidu.com/api.html#echarts" target="_blank">http://echarts.baidu.com/api.html#echarts</a>
+* iClient8C API:<a href="https://iclient.supermap.io/web/libs/iclient8c/apidoc/files/SuperMap/Map-js.html" target="_blank">https://iclient.supermap.io/web/libs/iclient8c/apidoc/files/SuperMap/Map-js.html</a>
+* ECharts API:<a href="https://echarts.baidu.com/api.html#echarts" target="_blank">https://echarts.baidu.com/api.html#echarts</a>
 * MapV API:<a href="https://github.com/huiyan-fe/mapv/blob/master/API.md" target="_blank">https://github.com/huiyan-fe/mapv/blob/master/API.md</a>

build/jsdocs/leaflet/docs.json

@@ -9,7 +9,7 @@
  "disqus":"",
  "tags": {
  "allowUnknownTags": true,
- "linkdoc-leaflet":"http://leafletjs.com/reference-1.2.0.html"
+ "linkdoc-leaflet":"https://leafletjs.com/reference-1.2.0.html"
  },
  "i18n": {
  "defaultLang": "en",

build/jsdocs/leaflet/index.md

@@ -1,7 +1,7 @@
 # SuperMap iClient for Leaflet API
 SuperMap iClient for Leaflet 是一套基于Leaflet的云GIS网络客户端开发平台， 支持访问SuperMap iServer / iEdge / iPortal / iManager / Online的地图、服务和资源，为用户提供了完整专业的GIS能力， 同时提供了优秀的可视化功能。
 
-* 官网(website)：<a href="http://iclient.supermap.io/web/introduction/leaflet.html#introduce" target="_parent">http://iclient.supermap.io/web/introduction/leaflet.html#introduce</a>
+* 官网(website)：<a href="https://iclient.supermap.io/web/introduction/leaflet.html#introduce" target="_parent">https://iclient.supermap.io/web/introduction/leaflet.html#introduce</a>
 
 * 源码(source code)：<a href="https://github.com/SuperMap/iClient-JavaScript/tree/master/src/leaflet" target="_blank">https://github.com/SuperMap/iClient-JavaScript/tree/master/src/leaflet</a>
 <table><tr>
@@ -27,7 +27,7 @@ SuperMap iClient for Leaflet 是一套基于Leaflet的云GIS网络客户端开
 <table><tr>
  <th width="33.3%">可视化</th><th width="33.3%">地图</th><th width="33.3%">投影</th>
 </tr><tr>
- <td><p>丰富的可视化效果，矢量瓦片、客户端专题图、开源可视化库[ECharts](http://echarts.baidu.com/)，[MapV](http://mapv.baidu.com/)</p>
+ <td><p>丰富的可视化效果，矢量瓦片、客户端专题图、开源可视化库[ECharts](https://echarts.baidu.com/)，[MapV](https://mapv.baidu.com/)</p>
   [L.supermap.tiledVectorLayer](L.supermap.tiledVectorLayer.html)<br>
   [L.supermap.graphicLayer](L.supermap.graphicLayer.html)<br>
   [L.supermap.dataFlowLayer](L.supermap.dataFlowLayer.html)<br>
@@ -49,6 +49,6 @@ SuperMap iClient for Leaflet 是一套基于Leaflet的云GIS网络客户端开
 
 ## 参考API
 
-* Leaflet API：<a href="http://leafletjs.com/reference.html" target="_blank">http://leafletjs.com/reference.html</a>
-* ECharts API:<a href="http://echarts.baidu.com/api.html#echarts" target="_blank">http://echarts.baidu.com/api.html#echarts</a>
+* Leaflet API：<a href="https://leafletjs.com/reference.html" target="_blank">https://leafletjs.com/reference.html</a>
+* ECharts API:<a href="https://echarts.baidu.com/api.html#echarts" target="_blank">https://echarts.baidu.com/api.html#echarts</a>
 * MapV API:<a href="https://github.com/huiyan-fe/mapv/blob/master/API.md" target="_blank">https://github.com/huiyan-fe/mapv/blob/master/API.md</a>

build/jsdocs/mapboxgl/index.md

@@ -1,12 +1,12 @@
 # SuperMap iClient for MapboxGL API
 SuperMap iClient for MapboxGL 是一套基于MapboxGL的云GIS网络客户端开发平台， 支持访问SuperMap iServer / iEdge / iPortal / iManager / Online的地图、服务和资源，为用户提供了完整专业的GIS能力， 同时提供了优秀的可视化功能。
 
-* 官网(website)：<a href="http://iclient.supermap.io/web/introduction/mapboxgl.html#introduce" target="_parent">http://iclient.supermap.io/web/introduction/mapboxgl.html#introduce</a>
+* 官网(website)：<a href="https://iclient.supermap.io/web/introduction/mapboxgl.html#introduce" target="_parent">https://iclient.supermap.io/web/introduction/mapboxgl.html#introduce</a>
 
 * 源码(source code)：<a href="https://github.com/SuperMap/iClient-JavaScript/tree/master/src/mapboxgl" target="_blank">https://github.com/SuperMap/iClient-JavaScript/tree/master/src/mapboxgl</a>
 
 ## 参考API
 
 * Mapbox GL JS API:<a href="https://www.mapbox.com/mapbox-gl-js/api/" target="_blank">https://www.mapbox.com/mapbox-gl-js/api/</a>
-* ECharts API:<a href="http://echarts.baidu.com/api.html#echarts" target="_blank">http://echarts.baidu.com/api.html#echarts</a>
+* ECharts API:<a href="https://echarts.baidu.com/api.html#echarts" target="_blank">https://echarts.baidu.com/api.html#echarts</a>
 * MapV API:<a href="https://github.com/huiyan-fe/mapv/blob/master/API.md" target="_blank">https://github.com/huiyan-fe/mapv/blob/master/API.md</a>

build/jsdocs/openlayers/index.md

@@ -1,7 +1,7 @@
 # SuperMap iClient for OpenLayers API
 SuperMap iClient for OpenLayers 是一套基于OpenLayers的云GIS网络客户端开发平台， 支持访问SuperMap iServer / iEdge / iPortal / iManager / Online的地图、服务和资源，为用户提供了完整专业的GIS能力， 同时提供了优秀的可视化功能。
 
-* 官网(website)：<a href="http://iclient.supermap.io/web/introduction/openlayers.html#introduce" target="_parent">http://iclient.supermap.io/web/introduction/openlayers.html#introduce</a>
+* 官网(website)：<a href="https://iclient.supermap.io/web/introduction/openlayers.html#introduce" target="_parent">https://iclient.supermap.io/web/introduction/openlayers.html#introduce</a>
 
 * 源码(source code)：<a href="https://github.com/SuperMap/iClient-JavaScript/tree/master/src/openlayers" target="_blank">https://github.com/SuperMap/iClient-JavaScript/tree/master/src/openlayers</a>
 <table><tr>
@@ -27,7 +27,7 @@ SuperMap iClient for OpenLayers 是一套基于OpenLayers的云GIS网络客户
 <table><tr>
  <th width="33.3%">可视化</th><th width="33.3%">地图</th><th width="33.3%"></th>
 </tr><tr>
- <td><p>丰富的可视化效果，矢量瓦片、客户端专题图、开源可视化库[ECharts](http://echarts.baidu.com/)，[MapV](http://mapv.baidu.com/)</p>
+ <td><p>丰富的可视化效果，矢量瓦片、客户端专题图、开源可视化库[ECharts](https://echarts.baidu.com/)，[MapV](https://mapv.baidu.com/)</p>
   [ol.source.VectorTileSuperMapRest](ol.source.VectorTileSuperMapRest.html)<br>
   [ol.source.Graphic](ol.source.Graphic.html)<br>
   [ol.source.DataFlow](ol.source.DataFlow.html)<br>
@@ -46,6 +46,6 @@ SuperMap iClient for OpenLayers 是一套基于OpenLayers的云GIS网络客户
 
 ## 参考API
 
-* OpenLayers API:<a href="http://openlayers.org/en/latest/apidoc/" target="_blank">http://openlayers.org/en/latest/apidoc/</a>
-* ECharts API:<a href="http://echarts.baidu.com/api.html#echarts" target="_blank">http://echarts.baidu.com/api.html#echarts</a>
+* OpenLayers API:<a href="https://openlayers.org/en/latest/apidoc/" target="_blank">https://openlayers.org/en/latest/apidoc/</a>
+* ECharts API:<a href="https://echarts.baidu.com/api.html#echarts" target="_blank">https://echarts.baidu.com/api.html#echarts</a>
 * MapV API:<a href="https://github.com/huiyan-fe/mapv/blob/master/API.md" target="_blank">https://github.com/huiyan-fe/mapv/blob/master/API.md</a>

build/jsdocs/template/typeLinkExt.js

@@ -1,38 +1,38 @@
-var olapi = "https://openlayers.org/en/v4.6.5/apidoc/";
-var lfapi = "http://leafletjs.com/reference-1.5.1.html";
+var olapi = "https://openlayers.org/en/v6.1.1/apidoc/";
+var lfapi = "https://leafletjs.com/reference-1.5.1.html";
 var mbglapi = "https://www.mapbox.com/mapbox-gl-js/api/";
 var mapv = "https://github.com/huiyan-fe/mapv/blob/master/src/";
-var classicapi="http://iclient.supermap.io/libs/iclient8c/apidoc/files/SuperMap"
-var geojsonapi = "http://geojson.org";
+var classicapi="https://iclient.supermap.io/web/libs/iclient8c/apidoc/files/SuperMap"
+var geojsonapi = "https://geojson.org";
 var typeLinks = {
  //openlayers
- "ol.Map": olapi + "ol.Map.html",
- "ol.View": olapi + "ol.View.html",
- "ol.extent": olapi + "ol.extent.html",
- "ol.feature": olapi + "ol.feature.html",
- "ol.geom.Polygon": olapi + "ol.geom.Polygon.html",
- "ol.geom.LineString": olapi + "ol.geom.LineString.html",
- "ol.geom.Point": olapi + "ol.geom.Point.html",
- "ol.geom.Geometry":olapi + "ol.geom.Geometry.html",
- "ol.format.GeoJSON": olapi + "ol.format.GeoJSON.html",
- "ol.proj.Projection": olapi + "ol.proj.Projection",
- "ol.Observable": olapi + "ol.Observable",
- "ol.style.Image": olapi + "ol.style.Image",
- "ol.style.Fill": olapi + "ol.style.Fill",
- "ol.style.Stroke": olapi + "ol.style.Stroke",
- "ol.Object": olapi + "ol.Object",
- "ol.source.ImageCanvas": olapi + "ol.source.ImageCanvas",
- "ol.source.TileImage": olapi + "ol.source.TileImage",
- "ol.source.WMTS": olapi + "ol.source.WMTS",
- "ol.source.XYZ": olapi + "ol.source.XYZ",
- "ol.source.Vector": olapi + "ol.source.Vector",
- "ol.source.VectorTile": olapi + "ol.source.VectorTile",
- "ol.Pixel": olapi + "ol.html#.Pixel",
- "ol.source.State": olapi + "ol.source.html#.State",
- "ol.layer.Layer": olapi + "ol.layer.Layer.html",
- "ol.FeatureStyleFunction": olapi + "ol.html#.FeatureStyleFunction",
- "ol.StyleFunction": olapi + "ol.html#.StyleFunction",
- "ol.control.ScaleLine": olapi + "ol.control.ScaleLine",
+ "ol/Map": olapi + "module-ol_Map-Map",
+ "ol/View": olapi + "module-ol_View-View",
+ "ol/extent": olapi + "module-ol_extent.html",
+ "ol/feature": olapi + "module-ol_Feature-Feature.html",
+ "ol/geom/Polygon": olapi + "module-ol_geom_Polygon-Polygon.html",
+ "ol/geom/LineString": olapi + "module-ol_geom_LineString-LineString.html",
+ "ol/geom/Point": olapi + "module-ol_geom_Point-Point.html",
+ "ol/geom/Geometry":olapi + "module-ol_geom_Geometry-Geometry.html",
+ "ol/format/GeoJSON": olapi + "module-ol_format_GeoJSON-GeoJSON.html",
+ "ol/proj/Projection": olapi + "module-ol_proj_Projection-Projection.html",
+ "ol/Observable": olapi + "module-ol_Observable-Observable.html",
+ "ol/style/Image": olapi + "module-ol_style_Image-ImageStyle.html",
+ "ol/style/Fill": olapi + "module-ol_style_Fill-Fill.html",
+ "ol/style/Stroke": olapi + "module-ol_style_Stroke-Stroke.html",
+ "ol/Object": olapi + "module-ol_Object-BaseObject.html",
+ "ol/source/ImageCanvas": olapi + "module-ol_source_ImageCanvas-ImageCanvasSource.html",
+ "ol/source/TileImage": olapi + "module-ol_source_TileImage-TileImage.html",
+ "ol/source/WMTS": olapi + "module-ol_source_WMTS-WMTS.html",
+ "ol/source/XYZ": olapi + "module-ol_source_XYZ-XYZ.html",
+ "ol/source/Vector": olapi + "module-ol_source_Vector-VectorSource.html",
+ "ol/source/VectorTile": olapi + "module-ol_source_VectorTile-VectorTile.html",
+ "ol/Pixel": olapi + "module-ol_pixel.html",
+ "ol/source/State": olapi + "module-ol_source_State.html",
+ "ol/layer/Layer": olapi + "module-ol_layer_Layer-Layer.html",
+ "ol/StyleFunction": olapi + "module-ol_style_Style.html#~StyleFunction",
+ "ol/control/ScaleLine": olapi + "module-ol_control_ScaleLine-ScaleLine.html",
+ "ol/control/Control": olapi + "module-ol_control_Control-Control.html",
 
 
  //leaflet