Merge branch 'master' of https://github.com/SuperMap/iClient-JavaScript

Author: Yuki-Zhao

.gitignore

@@ -8,4 +8,6 @@
 /examples-test/reports
 /web/
 /package-lock.json
-.npmrc
+.npmrc
+/dist/mapboxgl/resources/
+/dist/maplibregl/resources/

CHANGELOG.md

@@ -36,6 +36,7 @@
             "src/common/iServer/ProcessingServiceBase",
             "src/common/iServer/PointWithMeasure",
             "src/common/iServer/ServerTheme",
+            "src/common/iServer/QueryService",
             "src/common/overlay/RankSymbol",
             "src/common/overlay/ThemeVector",
             "src/common/overlay/Graph",
@@ -64,7 +65,8 @@
             "src/common/components/templates/Select",
             "src/common/security/KeyServiceParameter",
             "src/common/components/templates/TemplateBase",
-
+            "src/common/mapping",
+            
             "src/leaflet/components/clientcomputation/ClientComputationViewModel",
             "src/leaflet/components/dataflow/DataFlowViewModel",
             "src/leaflet/overlay/dataflow/MapvRenderer",

build/jsdocs/leaflet/docs.json

@@ -36,6 +36,7 @@
             "src/common/iServer/ProcessingServiceBase",
             "src/common/iServer/PointWithMeasure",
             "src/common/iServer/ServerTheme",
+            "src/common/iServer/QueryService",
             "src/common/overlay/RankSymbol",
             "src/common/overlay/ThemeVector",
             "src/common/overlay/Graph",
@@ -64,9 +65,16 @@
             "src/common/components/templates/Select",
             "src/common/security/KeyServiceParameter",
             "src/common/components/templates/TemplateBase",
+            "src/common/mapping/utils/L7LayerUtil",
+            "src/common/mapping/utils/Color",
+            "src/common/mapping/utils/util",
+            "src/common/mapping/WebMapV2",
+            "src/common/mapping/WebMapV3",
+            "src/common/mapping/MapStyle",
+            "src/common/mapping/WebMapV2Base",
+            "src/common/mapping/WebMapService",
             "src/mapboxgl/core/Util",
-            "src/mapboxgl/overlay/L7/l7-render",
-            "src/mapboxgl/mapping/utils"
+            "src/mapboxgl/overlay/L7/l7-render"
         ]
     },
     "plugins": ["plugins/markdown","../plugins/usage", "../plugins/moduleCategories"],

build/jsdocs/mapboxgl/docs.json

@@ -8,7 +8,7 @@
   "disqus": "",
   "tags": {
     "allowUnknownTags": true,
-    "linkdoc-maplibregl": "https://maplibre.org/maplibre-gl-js-docs/api/"
+    "linkdoc-maplibregl": "https://maplibre.org/maplibre-gl-js/docs/API/"
   },
   "i18n": {
     "defaultLang": "en",
@@ -34,6 +34,7 @@
       "src/common/iServer/ProcessingServiceBase",
       "src/common/iServer/PointWithMeasure",
       "src/common/iServer/ServerTheme",
+      "src/common/iServer/QueryService",
       "src/common/overlay/RankSymbol",
       "src/common/overlay/ThemeVector",
       "src/common/overlay/Graph",
@@ -62,6 +63,14 @@
       "src/common/components/templates/Select",
       "src/common/security/KeyServiceParameter",
       "src/common/components/templates/TemplateBase",
+      "src/common/mapping/utils/L7LayerUtil",
+      "src/common/mapping/utils/Color",
+      "src/common/mapping/utils/util",
+      "src/common/mapping/WebMapV2",
+      "src/common/mapping/WebMapV3",
+      "src/common/mapping/MapStyle",
+      "src/common/mapping/WebMapV2Base",
+      "src/common/mapping/WebMapService",
       "src/maplibregl/core/Util",
       "src/maplibregl/overlay/L7/l7-render"
     ]

build/jsdocs/maplibregl/docs.json

@@ -8,6 +8,6 @@ SuperMap iClient for MaplibreGL 是一套基于 MaplibreGL v1 的云 GIS 网络
 
 ## 参考 API
 
-- Maplibre GL JS API:<a href="https://www.maplibre.com/maplibre-gl-js/api/" target="_blank">https://www.maplibre.com/maplibre-gl-js/api/</a>
+- Maplibre GL JS API:<a href="https://maplibre.org/maplibre-gl-js/docs/API/" target="_blank">https://maplibre.org/maplibre-gl-js/docs/API/</a>
 - ECharts API:<a href="https://echarts.apache.org/api.html#echarts" target="_blank">https://echarts.apache.org/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/maplibregl/index.md

@@ -35,6 +35,7 @@
             "src/common/iServer/ProcessingServiceBase",
             "src/common/iServer/PointWithMeasure",
             "src/common/iServer/ServerTheme",
+            "src/common/iServer/QueryService",
             "src/common/overlay/RankSymbol",
             "src/common/overlay/Graph",
             "src/common/overlay/ThemeVector",
@@ -62,7 +63,8 @@
             "src/common/components/templates/PopContainer",
             "src/common/components/templates/Select",
             "src/common/security/KeyServiceParameter",
-            "src/common/components/templates/TemplateBase"
+            "src/common/components/templates/TemplateBase",
+            "src/common/mapping"
         ]
     },
     "plugins": ["plugins/markdown","../plugins/usage", "../plugins/moduleCategories"],

build/jsdocs/openlayers/docs.json

@@ -1,7 +1,7 @@
 $(function () {
     $('.navigationDiv').load("nav.html .main-sidebar", null, function () {
         var height = $('.sidebar').height();
-        $('.main-sidebar #categories').css('height', height - 50 + 'px');
+        $('.main-sidebar #categories').css('height', height - 125 + 'px');
         // Search Items
         $('#searchBox').on('keyup', function (e) {
 
@@ -101,6 +101,6 @@ $(function () {
     });
     $(window).resize(function () {
       var height = $('.navigationDiv .sidebar').height();
-      $('.main-sidebar #categories').css('height', height - 50 + 'px');
+      $('.main-sidebar #categories').css('height', height - 125 + 'px');
     })
 });

build/jsdocs/template/static/scripts/main.js

@@ -1,7 +1,7 @@
 var olapi = "https://openlayers.org/en/v6.14.1/apidoc/";
 var lfapi = "https://leafletjs.com/reference.html";
 var mbglapi = "https://www.mapbox.com/mapbox-gl-js/api/";
-var mlbglapi = "https://maplibre.org/maplibre-gl-js-docs/api/";
+var mlbglapi = "https://maplibre.org/maplibre-gl-js/docs/API/";
 var mapv = "https://github.com/huiyan-fe/mapv/blob/master/src/";
 var classicapi="https://iclient.supermap.io/web/libs/iclient8c/apidoc/files/SuperMap"
 var geojsonapi = "https://geojson.org";
@@ -84,9 +84,9 @@ var typeLinks = {
     "mapboxgl.source": 'https://docs.mapbox.com/mapbox-gl-js/style-spec/sources/#geojson',
 
     //maplibregl
-    "maplibregl.Map": mlbglapi + '#map',
-    "maplibregl.Evented": mlbglapi + '#Evented',
-    "maplibregl.LngLatBounds": mlbglapi + '#lnglatbounds',
+    "maplibregl.Map": mlbglapi + 'classes/Map/',
+    "maplibregl.Evented": mlbglapi + 'classes/Evented/',
+    "maplibregl.LngLatBounds": mlbglapi + 'classes/LngLatBounds/',
 
     //mapv
     "Mapv.DataSet": mapv + 'data/DataSet.md',
@@ -105,6 +105,7 @@ var typeLinks = {
     "GeoJSONObject": geojsonapi,
     "GeoJSONGeometry": geometryapi +'#section-3.1',
     "GeoJSONFeature": geometryapi + '#section-3.2',
+    "FeatureCollection": geometryapi + '#section-3.3',
     // WebMap 结构
     "WebMapSummaryObject": helpDocApi + '#iP/Appendix/WebMap/WebMapSummary.htm',
     "FlatGeobuf": 'https://github.com/flatgeobuf/flatgeobuf',

build/jsdocs/template/typeLinkExt.js

@@ -7,11 +7,14 @@ const pkg = require('../package.json');
 
 function compareDependencies(pkgName, dependenciesToCompare, rootDependencies = pkg.dependencies) {
   Object.keys(dependenciesToCompare).forEach(name => {
-    if (!rootDependencies[name] || rootDependencies[name] !== dependenciesToCompare[name]) {
+    if(!rootDependencies[name]){
+      console.log(chalk.red(`Dependency error [${pkgName}]: The dependency ${name} not in root package.json!\n`));
+    }
+    if (rootDependencies[name] !== dependenciesToCompare[name]) {
       if (rootDependencies[name].includes('file:src/')){
         return;
       }
-      console.log(chalk.red(`ERROR [${pkgName}]: The dependency ${name} version can not match in root package.json!\n`));
+      console.log(chalk.red(`Dependency error [${pkgName}]: The dependency ${name} version can not match in root package.json!\n`));
     }
   });
 }
@@ -24,7 +27,7 @@ function checkRootDependencies(dependenciesToCompare, rootDependencies = pkg.dep
       return;
     }
     if (!clientDepsList.some(deps => Object.keys(deps).some(item => item === name))) {
-      console.log(chalk.red(`ERROR: The dependency ${name} version can not match in (${clientNames.join('|')}) package.json!\n`));
+      console.log(chalk.red(`Dependency error: The dependency ${name} version can not match in (${clientNames.join('|')}) package.json!\n`));
     }
   });
 }