【fix】leaflet geometry支持的类型JSdoc修改。sonar review by xiongjj

songyumeng · songyumeng · commit e533fd1838b7 · 2020-09-24T11:56:36.000+08:00
diff --git a/build/jsdocs/template/typeLinkExt.js b/build/jsdocs/template/typeLinkExt.js
@@ -54,6 +54,7 @@ var typeLinks = {
     "L.LayerGroup": lfapi + '#layergroup',
     "L.TileLayer": lfapi + '#tilelayer',
     "L.CircleMarker": lfapi + '#circlemarker',
+    "L.Circle": lfapi + '#circle',
     "L.Path-option": lfapi + '#path-option',
     "L.Rectangle": lfapi + '#rectangle',
     'L.LatLngBounds': lfapi+ '#latlngbounds',
diff --git a/src/common/iServer/GeometryBufferAnalystParameters.js b/src/common/iServer/GeometryBufferAnalystParameters.js
@@ -25,7 +25,7 @@ export class GeometryBufferAnalystParameters extends BufferAnalystParameters {
         /**
          * @member {Object} SuperMap.GeometryBufferAnalystParameters.prototype.sourceGeometry
          * @description 要做缓冲区分析的几何对象。<br>
-         * 点类型可以是：{@link SuperMap.Geometry.Point}|{@link L.Point}|{@link L.GeoJSON}|{@link ol.geom.Point}|{@link ol.format.GeoJSON}。</br>
+         * 点类型可以是：{@link SuperMap.Geometry.Point}|{@link L.Marker}|{@link L.CircleMarker}|{@link L.Circle}|{@link L.GeoJSON}|{@link ol.geom.Point}|{@link ol.format.GeoJSON}。</br>
          * 线类型可以是：{@link SuperMap.Geometry.LineString}|{@link SuperMap.Geometry.LinearRing}|{@link L.Polyline}|{@link L.GeoJSON}|{@link ol.geom.LineString}|{@link ol.format.GeoJSON}。</br>
          * 面类型可以是：{@link SuperMap.Geometry.Polygon}|{@link L.Polygon}|{@link L.GeoJSON}|{@link ol.geom.Polygon}|{@link ol.format.GeoJSON}。 
          */
diff --git a/src/common/iServer/GeometryOverlayAnalystParameters.js b/src/common/iServer/GeometryOverlayAnalystParameters.js
@@ -13,7 +13,7 @@ import {ServerGeometry} from './ServerGeometry';
  * 几何对象叠加分析参数类。对指定的某两个几何对象做叠加分析。通过该类可以指定要做叠加分析的几何对象、叠加操作类型。
  * @param {Object} options - 参数。 
  * @param {Object} options.operateGeometry - 叠加分析的操作几何对象。 </br>
- *                                   点类型可以是：{@link SuperMap.Geometry.Point}|{@link L.Point}|{@link L.GeoJSON}|{@link ol.geom.Point}|{@link ol.format.GeoJSON}。</br>
+ *                                   点类型可以是：{@link SuperMap.Geometry.Point}|{@link L.Marker}|{@link L.CircleMarker}|{@link L.Circle}|{@link L.GeoJSON}|{@link ol.geom.Point}|{@link ol.format.GeoJSON}。</br>
  *                                   线类型可以是：{@link SuperMap.Geometry.LineString}|{@link SuperMap.Geometry.LinearRing}|{@link L.Polyline}|{@link L.GeoJSON}|{@link ol.geom.LineString}|{@link GeoJSONObject}。</br>
  *                                   面类型可以是：{@link SuperMap.Geometry.Polygon}|{@link L.Polygon}|{@link L.GeoJSON}|{@link ol.geom.Polygon}|{@link GeoJSONObject}。 
  * @param {Object} options.sourceGeometry - 叠加分析的源几何对象。 
diff --git a/src/common/iServer/GeoprocessingService.js b/src/common/iServer/GeoprocessingService.js
@@ -91,7 +91,9 @@ export class GeoprocessingService extends CommonServiceBase {
         const timer = setInterval(function () {
             const serviceProcessCompleted = function (serverResult) {
                 const state = serverResult.state.runState;
-                options.statusCallback ? options.statusCallback(state) : null;
+                if (options.statusCallback) {
+                    options.statusCallback(state);
+                }
                 switch (state) {
                     case 'FINISHED':
                         clearInterval(timer);
diff --git a/src/common/iServer/GetFeaturesByBufferParameters.js b/src/common/iServer/GetFeaturesByBufferParameters.js
@@ -44,7 +44,7 @@ export class GetFeaturesByBufferParameters extends GetFeaturesParametersBase {
         /**
          * @member {Object} SuperMap.GetFeaturesByBufferParameters.prototype.geometry
          * @description 空间查询条件。 <br>
-         * 点类型可以是：{@link SuperMap.Geometry.Point}|{@link L.Point}|{@link L.GeoJSON}|{@link ol.geom.Point}|{@link ol.format.GeoJSON}。</br>
+         * 点类型可以是：{@link SuperMap.Geometry.Point}|{@link L.Marker}|{@link L.CircleMarker}|{@link L.Circle}|{@link L.GeoJSON}|{@link ol.geom.Point}|{@link ol.format.GeoJSON}。</br>
          * 线类型可以是：{@link SuperMap.Geometry.LineString}|{@link SuperMap.Geometry.LinearRing}|{@link L.Polyline}|{@link L.GeoJSON}|{@link ol.geom.LineString}|{@link ol.format.GeoJSON}。</br>  
          * 面类型可以是：{@link SuperMap.Geometry.Polygon}|{@link L.Polygon}|{@link L.GeoJSON}|{@link ol.geom.Polygon}|{@link ol.format.GeoJSON}。  
          */
diff --git a/src/common/iServer/GetFeaturesByGeometryParameters.js b/src/common/iServer/GetFeaturesByGeometryParameters.js
@@ -39,7 +39,7 @@ export class GetFeaturesByGeometryParameters extends GetFeaturesParametersBase {
         /**
          * @member {Object} SuperMap.GetFeaturesByGeometryParameters.prototype.geometry
          * @description 用于查询的几何对象。 </br>
-         * 点类型可以是：{@link SuperMap.Geometry.Point}|{@link L.Point}|{@link L.GeoJSON}|{@link ol.geom.Point}|{@link ol.format.GeoJSON}。</br>
+         * 点类型可以是：{@link SuperMap.Geometry.Point}|{@link L.Marker}|{@link L.CircleMarker}|{@link L.Circle}|{@link L.GeoJSON}|{@link ol.geom.Point}|{@link ol.format.GeoJSON}。</br>
          * 线类型可以是：{@link SuperMap.Geometry.LineString}|{@link SuperMap.Geometry.LinearRing}|{@link L.Polyline}|{@link L.GeoJSON}|{@link ol.geom.LineString}|{@link ol.format.GeoJSON}。</br>  
          * 面类型可以是：{@link SuperMap.Geometry.Polygon}|{@link L.Polygon}|{@link L.GeoJSON}|{@link ol.geom.Polygon}|{@link ol.format.GeoJSON}。  
          */
diff --git a/src/common/iServer/MeasureParameters.js b/src/common/iServer/MeasureParameters.js
@@ -26,7 +26,7 @@ export class MeasureParameters {
         /**
          * @member {Object} SuperMap.MeasureParameters.prototype.geometry
          * @description 要量算的几何对象。<br>
-         * 点类型可以是：{@link SuperMap.Geometry.Point}|{@link L.Point}|{@link L.GeoJSON}|{@link ol.geom.Point}|{@link ol.format.GeoJSON}。<br>
+         * 点类型可以是：{@link SuperMap.Geometry.Point}|{@link L.Marker}|{@link L.CircleMarker}|{@link L.Circle}|{@link L.GeoJSON}|{@link ol.geom.Point}|{@link ol.format.GeoJSON}。<br>
          * 线类型可以是：{@link SuperMap.Geometry.LineString}|{@link SuperMap.Geometry.LinearRing}|{@link L.Polyline}|{@link L.GeoJSON}|{@link ol.geom.LineString}|{@link ol.format.GeoJSON}。<br>
          * 面类型可以是：{@link SuperMap.Geometry.Polygon}|{@link L.Polygon}|{@link L.GeoJSON}|{@link ol.geom.Polygon}|{@link ol.format.GeoJSON}。
          */
diff --git a/src/common/iServer/QueryByDistanceParameters.js b/src/common/iServer/QueryByDistanceParameters.js
@@ -45,7 +45,7 @@ export class QueryByDistanceParameters extends QueryParameters {
         /**
          * @member SuperMap.QueryByDistanceParameters.prototype.geometry
          * @description 用于查询的地理对象。<br>
-         * 点类型可以是：{@link SuperMap.Geometry.Point}|{@link L.Point}|{@link L.GeoJSON}|{@link ol.geom.Point}|{@link ol.format.GeoJSON}。<br>
+         * 点类型可以是：{@link SuperMap.Geometry.Point}|{@link L.Marker}|{@link L.CircleMarker}|{@link L.Circle}|{@link L.GeoJSON}|{@link ol.geom.Point}|{@link ol.format.GeoJSON}。<br>
          * 线类型可以是：{@link SuperMap.Geometry.LineString}|{@link SuperMap.Geometry.LinearRing}|{@link L.Polyline}|{@link L.GeoJSON}|{@link ol.geom.LineString}|{@link ol.format.GeoJSON}。<br>
          * 面类型可以是：{@link SuperMap.Geometry.Polygon}|{@link L.Polygon}|{@link L.GeoJSON}|{@link ol.geom.Polygon}|{@link ol.format.GeoJSON}。
          */
diff --git a/src/common/iServer/QueryByGeometryParameters.js b/src/common/iServer/QueryByGeometryParameters.js
@@ -48,7 +48,7 @@ export class QueryByGeometryParameters extends QueryParameters {
         /**
          * @member {Object} SuperMap.QueryByGeometryParameters.prototype.geometry
          * @description 用于查询的几何对象。<br>
-         * 点类型可以是：{@link SuperMap.Geometry.Point}|{@link L.Point}|{@link L.GeoJSON}|{@link ol.geom.Point}|{@link ol.format.GeoJSON}。<br>
+         * 点类型可以是：{@link SuperMap.Geometry.Point}|{@link L.Marker}|{@link L.CircleMarker}|{@link L.Circle}|{@link L.GeoJSON}|{@link ol.geom.Point}|{@link ol.format.GeoJSON}。<br>
          * 线类型可以是：{@link SuperMap.Geometry.LineString}|{@link SuperMap.Geometry.LinearRing}|{@link L.Polyline}|{@link L.GeoJSON}|{@link ol.geom.LineString}|{@link ol.format.GeoJSON}。<br>
          * 面类型可以是：{@link SuperMap.Geometry.Polygon}|{@link L.Polygon}|{@link L.GeoJSON}|{@link ol.geom.Polygon}|{@link ol.format.GeoJSON}。
          */
diff --git a/src/leaflet/components/clientcomputation/ClientComputationView.js b/src/leaflet/components/clientcomputation/ClientComputationView.js
@@ -419,6 +419,9 @@ export var ClientComputationView = ComponentsViewBase.extend({
 
         //复选框事件
         let isSaveStatus = true;
+        //合并缓冲区
+        //合并缓冲区，默认不选中，即为false
+        let isUnion = false;
         //选中select
         saveAttrsLabel.classList.add("selected");
         saveAttrsCheckbox.classList.add("checkbox-active");
@@ -444,9 +447,6 @@ export var ClientComputationView = ComponentsViewBase.extend({
                 }
             }
         }
-        //合并缓冲区
-        //合并缓冲区，默认不选中，即为false
-        let isUnion = false;
         isUnionContainer.onclick = () => {
             if (isUnion) {
                 //将选中状态 由选中->不选中，修改其样式和状态
diff --git a/src/leaflet/components/search/SearchView.js b/src/leaflet/components/search/SearchView.js
@@ -272,6 +272,9 @@ export var SearchView = ComponentsViewBase.extend({
         //--------搜索按钮：
         const searchBtn = document.createElement("div");
         searchBtn.setAttribute("class", "component-search-icon supermapol-icons-search");
+        //查询结果页面
+        const resultDomObj = new PaginationContainer();
+        this._resultDomObj = resultDomObj;
         //查询要素或匹配要素【搜索按钮点击事件】
         searchBtn.onclick = () => {
             //若是遮挡结果显示，则关闭
@@ -305,9 +308,6 @@ export var SearchView = ComponentsViewBase.extend({
         poiContainer.appendChild(searchBtn);
         //--------搜索按钮 END
 
-        //查询结果页面
-        const resultDomObj = new PaginationContainer();
-        this._resultDomObj = resultDomObj;
         const resultContainer = function createResultPage() {
             const resultContainer = resultDomObj.getElement();
             resultContainer.style.position = "absolute";
diff --git a/src/openlayers/core/Util.js b/src/openlayers/core/Util.js
@@ -49,10 +49,10 @@ export class Util {
      * @param {Object} smObj - 待转参数。
      */
     static toGeoJSON(smObj) {
-        if (smObj) {
-            var format = new GeoJSONFormat();
-            return format.toGeoJSON(smObj);
+        if (!smObj) {
+            return null;
         }
+        return new GeoJSONFormat().toGeoJSON(smObj);
     }
 
     /**
@@ -61,11 +61,11 @@ export class Util {
      * @param {GeoJSONObject} geoJSON - GeoJSON 对象。
      */
     static toSuperMapGeometry(geoJSON) {
-        if (geoJSON && geoJSON.type) {
-            var format = new GeoJSONFormat();
-            var result = format.read(geoJSON, 'FeatureCollection');
-            return result[0].geometry;
+        if (!geoJSON || !geoJSON.type) {
+            return null;
         }
+        const result = new GeoJSONFormat().read(geoJSON, 'FeatureCollection');
+        return result[0].geometry;
     }
 
     /**
@@ -77,11 +77,10 @@ export class Util {
      * @returns {number} 比例尺。
      */
     static resolutionToScale(resolution, dpi, mapUnit) {
-        var inchPerMeter = 1 / 0.0254;
+        const inchPerMeter = 1 / 0.0254;
         // 地球半径。
-        var meterPerMapUnit = this.getMeterPerMapUnit(mapUnit);
-        var scale = resolution * dpi * inchPerMeter * meterPerMapUnit;
-        scale = 1 / scale;
+        const meterPerMapUnit = this.getMeterPerMapUnit(mapUnit);
+        const scale = 1 / (resolution * dpi * inchPerMeter * meterPerMapUnit);
         return scale;
     }
 
@@ -102,21 +101,19 @@ export class Util {
      * @returns processing 服务裁剪、查询分析的分析参数。
      */
     static toProcessingParam(points) {
-        var geometryParam = {};
         if (points.length < 1) {
-            geometryParam = '';
-        } else {
-            var results = [];
-            for (var i = 0; i < points.length; i++) {
-                var point = {};
-                point.x = points[i][0];
-                point.y = points[i][1];
-                results.push(point);
-            }
-            results.push(results[0]);
-            geometryParam.type = 'REGION';
-            geometryParam.points = results;
+            return '';
+        }
+        const geometryParam = {};
+        const results = [];
+        for (let i = 0; i < points.length; i++) {
+            const point = { x: points[i][0], y: points[i][1] };
+            results.push(point);
         }
+        results.push(results[0]);
+        geometryParam.type = 'REGION';
+        geometryParam.points = results;
+
         return geometryParam;
     }
 
@@ -129,10 +126,9 @@ export class Util {
      * @returns {number} 分辨率。
      */
     static scaleToResolution(scale, dpi, mapUnit) {
-        var inchPerMeter = 1 / 0.0254;
-        var meterPerMapUnitValue = this.getMeterPerMapUnit(mapUnit);
-        var resolution = scale * dpi * inchPerMeter * meterPerMapUnitValue;
-        resolution = 1 / resolution;
+        const inchPerMeter = 1 / 0.0254;
+        const meterPerMapUnitValue = this.getMeterPerMapUnit(mapUnit);
+        const resolution = 1 / (scale * dpi * inchPerMeter * meterPerMapUnitValue);
         return resolution;
     }
 
@@ -144,8 +140,8 @@ export class Util {
      * @returns {number} 返回每地图单位多少米。
      */
     static getMeterPerMapUnit(mapUnit) {
-        var earchRadiusInMeters = 6378137;
-        var meterPerMapUnit;
+        const earchRadiusInMeters = 6378137;
+        let meterPerMapUnit;
         if (mapUnit === Unit.METER) {
             meterPerMapUnit = 1;
         } else if (mapUnit === Unit.DEGREE) {
@@ -170,7 +166,7 @@ export class Util {
      * @returns {boolean} 是否是数组。
      */
     static isArray(obj) {
-        return Object.prototype.toString.call(obj) == '[object Array]';
+        return Object.prototype.toString.call(obj) === '[object Array]';
     }
 
     /**
@@ -180,7 +176,7 @@ export class Util {
      * @param {Object} options - 转换参数。
      */
     static Csv2GeoJSON(csv, options) {
-        var defaultOptions = {
+        const defaultOptions = {
             titles: ['lon', 'lat'],
             latitudeTitle: 'lat',
             longitudeTitle: 'lon',
@@ -190,9 +186,9 @@ export class Util {
             firstLineTitles: false
         };
         options = options || defaultOptions;
-        var _propertiesNames = [];
+        const _propertiesNames = [];
         if (typeof csv === 'string') {
-            var titulos = options.titles;
+            let titulos = options.titles;
             if (options.firstLineTitles) {
                 csv = csv.split(options.lineSeparator);
                 if (csv.length < 2) {
@@ -208,12 +204,12 @@ export class Util {
                 options.titles = titulos;
             }
             for (let i = 0; i < titulos.length; i++) {
-                var prop = titulos[i]
+                let prop = titulos[i]
                     .toLowerCase()
                     .replace(/[^\w ]+/g, '')
                     .replace(/ +/g, '_');
-                if (prop == '' || prop == '_') {
-                    prop = 'prop-' + i;
+                if (prop === '' || prop === '_') {
+                    prop = `prop-${i}`;
                 }
                 _propertiesNames[i] = prop;
             }
@@ -229,29 +225,29 @@ export class Util {
         }
 
         function _csv2json(csv) {
-            var json = {};
+            const json = {};
             json['type'] = 'FeatureCollection';
             json['features'] = [];
-            var titulos = options.titles;
+            const titulos = options.titles;
             csv = csv.split(options.lineSeparator);
-            for (var num_linea = 0; num_linea < csv.length; num_linea++) {
-                var campos = csv[num_linea].trim().split(options.fieldSeparator),
+            for (let num_linea = 0; num_linea < csv.length; num_linea++) {
+                const campos = csv[num_linea].trim().split(options.fieldSeparator),
                     lng = parseFloat(campos[titulos.indexOf(options.longitudeTitle)]),
                     lat = parseFloat(campos[titulos.indexOf(options.latitudeTitle)]);
 
-                var isInRange = lng < 180 && lng > -180 && lat < 90 && lat > -90;
-                if (!(campos.length == titulos.length && isInRange)) {
+                const isInRange = lng < 180 && lng > -180 && lat < 90 && lat > -90;
+                if (!(campos.length === titulos.length && isInRange)) {
                     continue;
                 }
 
-                var feature = {};
+                const feature = {};
                 feature['type'] = 'Feature';
                 feature['geometry'] = {};
                 feature['properties'] = {};
                 feature['geometry']['type'] = 'Point';
                 feature['geometry']['coordinates'] = [lng, lat];
-                for (var i = 0; i < titulos.length; i++) {
-                    if (titulos[i] != options.latitudeTitle && titulos[i] != options.longitudeTitle) {
+                for (let i = 0; i < titulos.length; i++) {
+                    if (titulos[i] !== options.latitudeTitle && titulos[i] !== options.longitudeTitle) {
                         feature['properties'][_propertiesNames[i]] = _deleteDoubleQuotes(campos[i]);
                     }
                 }
@@ -268,7 +264,7 @@ export class Util {
      * @param {number} opt_height - 画布高度。
      */
     static createCanvasContext2D(opt_width, opt_height) {
-        var canvas = document.createElement('CANVAS');
+        const canvas = document.createElement('CANVAS');
         if (opt_width) {
             canvas.width = opt_width;
         }
@@ -282,7 +278,7 @@ export class Util {
      * @description 是否支持 webgl2。
      */
     static supportWebGL2() {
-        var canvas = document.createElement('canvas');
+        const canvas = document.createElement('canvas');
         return Boolean(canvas && canvas.getContext('webgl2'));
     }
 
@@ -389,15 +385,14 @@ export class Util {
         recordLength,
         onlyAttribute
     ) {
-        var queryParam, queryBySQLParams, queryBySQLService;
-        queryParam = new FilterParameter({
+        const queryParam = new FilterParameter({
             name: layerName,
             attributeFilter: attributeFilter
         });
         if (fields) {
             queryParam.fields = fields;
         }
-        var params = {
+        const params = {
             queryParams: [queryParam]
         };
         if (onlyAttribute) {
@@ -410,8 +405,8 @@ export class Util {
                 epsgCode: epsgCode
             };
         }
-        queryBySQLParams = new QueryBySQLParameters(params);
-        queryBySQLService = new QueryService(url);
+        const queryBySQLParams = new QueryBySQLParameters(params);
+        const queryBySQLService = new QueryService(url);
         queryBySQLService.queryBySQL(queryBySQLParams, function (data) {
             data.type === 'processCompleted' ? processCompleted(data) : processFaild(data);
         });
@@ -466,7 +461,7 @@ export class Util {
         if (!(geo instanceof Geometry) && ['MultiPolygon', 'Polygon'].indexOf(polygon.getType()) < 0) {
             return;
         }
-        const feature =  polygon instanceof Feature ? polygon : new Feature(polygon);
+        const feature = polygon instanceof Feature ? polygon : new Feature(polygon);
         const style = new Style({
             fill: new Fill({
                 color: 'black'
@@ -481,7 +476,7 @@ export class Util {
         });
 
         const clipRender = function (e) {
-            var vectorContext = getVectorContext(e);
+            const vectorContext = getVectorContext(e);
             e.context.globalCompositeOperation = 'destination-in';
             clipLayer.getSource().forEachFeature(function (feature) {
                 vectorContext.drawFeature(feature, style);

Original file line number	Diff line number	Diff line change
`@@ -419,6 +419,9 @@ export var ClientComputationView = ComponentsViewBase.extend({`
`419`	`419`
`420`	`420`	`//复选框事件`
`421`	`421`	`let isSaveStatus = true;`
	`422`	`+ //合并缓冲区`
	`423`	`+ //合并缓冲区，默认不选中，即为false`
	`424`	`+ let isUnion = false;`
`422`	`425`	`//选中select`
`423`	`426`	`saveAttrsLabel.classList.add("selected");`
`424`	`427`	`saveAttrsCheckbox.classList.add("checkbox-active");`
`@@ -444,9 +447,6 @@ export var ClientComputationView = ComponentsViewBase.extend({`
`444`	`447`	`}`
`445`	`448`	`}`
`446`	`449`	`}`
`447`		`- //合并缓冲区`
`448`		`- //合并缓冲区，默认不选中，即为false`
`449`		`- let isUnion = false;`
`450`	`450`	`isUnionContainer.onclick = () => {`
`451`	`451`	`if (isUnion) {`
`452`	`452`	`//将选中状态由选中->不选中，修改其样式和状态`