【update】Aggregations聚合参数对象化 review by songym

Author: luoxiao-supermap

examples/component/components_coordinate_conversion_vue.html

@@ -29,10 +29,7 @@
 
         <script>
             new Vue({
-                el: '#main',
-                created() {
-                    SuperMap.Components.setTheme('dark');
-                }
+                el: '#main'
             });
         </script>
     </body>

examples/component/components_timeline_cloud.html

@@ -97,13 +97,14 @@
                 server-url="https://www.supermapol.com"
                 :map-id="235407763"
                 :tianditu-key="tiandituKey"
+                :map-options="mapOptions"
                 :loading="loading"
                 @load="load"
             ></sm-web-map>
             <sm-time-line
                 ref="timeLine"
                 :data="data"
-                :play-interval="1000"
+                :play-interval="800"
                 :next-enable="nextEnable"
                 :label="label"
                 @timelinechanged="timelineChanged"
@@ -207,7 +208,11 @@
                             'T202007210500',
                             'T202007210600',
                             'T202007210700'
-                        ]
+                        ],
+                        mapOptions: {
+                            style: { version: 8, sources: {}, layers: [] },
+                            zoom: 4.6
+                        }
                     };
                 },
                 computed: {

examples/component/components_timeline_supermap.html

@@ -122,7 +122,7 @@
                         mapOptions: {
                             style: { version: 8, sources: {}, layers: [] },
                             center: [104.0924, 30.5217],
-                            zoom: 17,
+                            zoom: 18,
                             bearing: 0,
                             pitch: 0,
                             tileSize: 1024,

examples/component/img/components_coordinate_conversion_vue.png

@@ -1253,33 +1253,36 @@ export {
 }
 
 /**
- * @enum AggregationType
+ * @enum BucketAggType
  * @memberOf SuperMap
- * @description  聚合查询枚举类，该类定义了Es数据服务中聚合查询模式常量
+ * @description  格网聚合查询枚举类，该类定义了Elasticsearch数据服务中聚合查询模式常量
  * @type {string}
  */
-var AggregationType = SuperMap.AggregationType = {
-    /** 格网聚合类型。 */
-    GEOHASH_GRID: "geohash_grid",
-    /** 过滤聚合类型。 */
-    FILTER: "filter"
+var BucketAggType = SuperMap.BucketAggType = {
+    /** 格网聚合类型 */
+    GEOHASH_GRID: "geohash_grid"
 };
 export {
-    AggregationType
+  BucketAggType
 }
-
 /**
- * @enum AggregationType
+ * @enum MetricsAggType
  * @memberOf SuperMap
- * @description  聚合查询中filter查询枚举类
+ * @description  指标聚合类型枚举类，该类定义了Elasticsearch数据服务中聚合查询模式常量
  * @type {string}
  */
-var AggregationQueryBuilderType = SuperMap.AggregationQueryBuilderType = {
-    /** 范围查询。 */
-    GEO_BOUNDING_BOX: "geo_bounding_box"
-}
+var MetricsAggType = SuperMap.MetricsAggType = {
+  /** 平均值聚合类型 */
+  AVG:'avg',
+  /** 最大值聚合类型 */
+  MAX:'max',
+  /** 最小值聚合类型 */
+  MIN:'min',
+  /** 求和聚合类型 */
+  SUM:'sum'
+};
 export {
-    AggregationQueryBuilderType
+  MetricsAggType
 }
 
 /**

src/common/REST.js

@@ -1,19 +1,16 @@
 /* Copyright© 2000 - 2021 SuperMap Software Co.Ltd. All rights reserved.
  * This program are made available under the terms of the Apache License, Version 2.0
  * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
-import {SuperMap} from '../SuperMap';
-import {Util} from '../commontypes/Util';
+import { SuperMap } from '../SuperMap';
+import { Util } from '../commontypes/Util';
 
 /**
  * @class SuperMap.AggregationParameter
  * @classdesc 聚合查询参数设置，该参数仅支持数据来源 Elasticsearch 服务的数据服务。
  * @category iServer Data FeatureResults
  * @param {Object} options - 初始化参数。
  * @param {string} options.aggName - 聚合名称。
- * @param {SuperMap.AggregationType} options.aggType - 聚合类型设置。
  * @param {string} options.aggFieldName - 聚合字段。
- * @param {SuperMap.AggregationParameter} options.subAgg - 子聚合类。
- *
  */
 export class AggregationParameter {
     constructor(options) {
@@ -22,23 +19,13 @@ export class AggregationParameter {
          * @description 聚合名称。
          */
         this.aggName = null;
-        /**
-         * @member {SuperMap.AggregationType} SuperMap.AggregationParameter.prototype.aggType
-         * @description 聚合类型设置类。
-         */
-        this.aggType = null;
         /**
          * @member {string} SuperMap.AggregationParameter.prototype.aggFieldName
          * @description 聚合字段。
          */
         this.aggFieldName = null;
-        /**
-         * @member {SuperMap.AggregationParameter} SuperMap.AggregationParameter.prototype.subAgg
-         * @description 子聚合。
-         */
-        this.subAgg = null;
 
-        this.CLASS_NAME = "SuperMap.AggregationParameter";
+        this.CLASS_NAME = 'SuperMap.AggregationParameter';
         Util.extend(this, options);
     }
 
@@ -47,10 +34,7 @@ export class AggregationParameter {
         me.aggName = null;
         me.aggFieldName = null;
         me.aggType = null;
-        if (me.subAgg) {
-            me.subAgg = null;
-        }
     }
 }
 
-SuperMap.AggregationParameter = AggregationParameter;
+SuperMap.AggregationParameter = AggregationParameter;

src/common/iServer/AggQueryBuilderParameter.js

@@ -0,0 +1,38 @@
+/* Copyright© 2000 - 2021 SuperMap Software Co.Ltd. All rights reserved.
+ * This program are made available under the terms of the Apache License, Version 2.0
+ * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
+import { SuperMap } from '../SuperMap';
+import { Util } from '../commontypes/Util';
+import { AggregationParameter } from './AggregationParameter';
+
+/**
+ * @class SuperMap.BucketAggParameter
+ * @classdesc 子聚合类查询参数设置，该参数仅支持数据来源 Elasticsearch 服务的Supermap iServer的rest数据服务。
+ * @category iServer Data FeatureResults
+ * @param {Object} options - 初始化参数。
+ * @param {Array.<SuperMap.MetricsAggParameter>} options.subAggs - 子聚合类集合。
+ *
+ */
+export class BucketAggParameter extends AggregationParameter {
+    constructor(options) {
+        super();
+        /**
+         * @member {Array.<SuperMap.MetricsAggParameter>} SuperMap.BucketAggParameter.prototype.subAggs
+         * @description 子聚合类集合。
+         */
+        this.subAggs = null;
+        this.aggType = null;
+
+        this.CLASS_NAME = 'SuperMap.BucketAggParameter';
+        Util.extend(this, options);
+    }
+
+    destroy() {
+        var me = this;
+        if (me.subAggs) {
+            me.subAggs = null;
+        }
+    }
+}
+
+SuperMap.BucketAggParameter = BucketAggParameter;