【fix】去掉服务端专题图相关flow参数，流动显示在前端出图中无法体现 review by qiwei

Author: songyumeng

examples/classic/theme_themeGraduatedSymbol.html

@@ -79,9 +79,6 @@ <h5 class='panel-title text-center' data-i18n="resources.text_graduatedSymbol"><
                 expression: "SMAREA",
                 baseValue: 3000000000000,
                 graduatedMode: SuperMap.REST.GraduatedMode.CONSTANT,
-                flow: new SuperMap.REST.ThemeFlow({
-                    flowEnabled: true
-                }),
                 style: graStyle
             }),
             themeParameters = new SuperMap.REST.ThemeParameters({

examples/leaflet/03_themeGraduatedSymbol.html

@@ -29,9 +29,6 @@
             expression: "SMAREA",
             baseValue: 3000000000000,
             graduatedMode: SuperMap.GraduatedMode.CONSTANT,
-            flow: new SuperMap.ThemeFlow({
-                flowEnabled: true
-            }),
             style: new SuperMap.ThemeGraduatedSymbolStyle({
                 positiveStyle: new SuperMap.ServerStyle({
                     markerSize: 50,

examples/mapboxgl/03_themeGraduatedSymbol.html

@@ -51,9 +51,6 @@
             expression: "SMAREA",
             baseValue: 3000000000000,
             graduatedMode: SuperMap.GraduatedMode.CONSTANT,
-            flow: new SuperMap.ThemeFlow({
-                flowEnabled: true
-            }),
             style: new SuperMap.ThemeGraduatedSymbolStyle({
                 positiveStyle: new SuperMap.ServerStyle({
                     markerSize: 50,

examples/openlayers/03_themeGraduatedSymbol.html

@@ -41,9 +41,6 @@
             expression: "SMAREA",
             baseValue: 3000000000000,
             graduatedMode: SuperMap.GraduatedMode.CONSTANT,
-            flow: new SuperMap.ThemeFlow({
-                flowEnabled: true
-            }),
             style: new SuperMap.ThemeGraduatedSymbolStyle({
                 positiveStyle: new SuperMap.ServerStyle({
                     markerSize: 50,

src/common/iServer/ThemeFlow.js

@@ -7,6 +7,7 @@ import {ServerStyle} from './ServerStyle';
 
 /**
  * @class SuperMap.ThemeFlow
+ * @private
  * @category  iServer Map Theme
  * @classdesc 标签或符号流动显示和牵引线风格设置类。
  *            通过该类可以设置专题图中符号是否流动显示、是否使用牵引线以及牵引线风格。

src/common/iServer/ThemeGraduatedSymbol.js

@@ -18,7 +18,6 @@ import {GraduatedMode} from '../REST';
  * @param {SuperMap.ThemeGraduatedSymbolStyle} options.style - 用于设置等级符号图正负和零值显示风格。
  * @param {string} options.expression - 等级符号专题图的字段或字段表达式。
  * @param {number} [options.baseValue=0] - 等级符号专题图的基准值，单位同专题变量的单位。
- * @param {SuperMap.ThemeFlow} [options.flow] - 等级符号专题图符号流动显示与牵引线设置类。
  * @param {SuperMap.GraduatedMode} [options.graduatedMode=SuperMap.GraduatedMode.CONSTANT] - 等级符号专题图分级模式。
  * @param {SuperMap.ThemeOffset} [options.offset] - 用于设置标签专题图中标记文本相对于要素内点的偏移量对象。
  * @param {SuperMap.ThemeMemoryData} [options.memoryData] - 专题图内存数据。
@@ -42,13 +41,6 @@ export class ThemeGraduatedSymbol extends Theme {
          */
         this.expression = null;
 
-        /**
-         * @member {SuperMap.ThemeFlow} SuperMap.ThemeGraduatedSymbol.prototype.flow
-         * @description 等级符号专题图符号流动显示与牵引线设置类。<br>
-         *              通过该字段可以设置等级符号是否流动显示和牵引线风格。
-         */
-        this.flow = new ThemeFlow();
-
         /**
          * @member {SuperMap.GraduatedMode} [SuperMap.ThemeGraduatedSymbol.prototype.graduatedMode=SuperMap.GraduatedMode.CONSTANT]
          * @description 等级符号专题图分级模式。<br>
@@ -87,10 +79,6 @@ export class ThemeGraduatedSymbol extends Theme {
         super.destroy();
         var me = this;
         me.expression = null;
-        if (me.flow) {
-            me.flow.destroy();
-            me.flow = null;
-        }
         me.graduatedMode = GraduatedMode.CONSTANT;
         if (me.offset) {
             me.offset.destroy();
@@ -125,11 +113,6 @@ export class ThemeGraduatedSymbol extends Theme {
         obj.baseValue = this.baseValue;
         obj.expression = this.expression;
         obj.graduatedMode = this.graduatedMode;
-        if (this.flow) {
-            obj.flowEnabled = this.flow.flowEnabled;
-            obj.leaderLineDisplayed = this.flow.leaderLineDisplayed;
-            obj.leaderLineStyle = this.flow.leaderLineStyle;
-        }
         if (this.offset) {
             obj.offsetFixed = this.offset.offsetFixed;
             obj.offsetX = this.offset.offsetX;
@@ -157,7 +140,6 @@ export class ThemeGraduatedSymbol extends Theme {
         }
         var res = new SuperMap.ThemeGraduatedSymbol();
         Util.copy(res, obj);
-        res.flow = ThemeFlow.fromObj(obj);
         res.offset = ThemeOffset.fromObj(obj);
         res.style = ThemeGraduatedSymbolStyle.fromObj(obj);
         return res;

src/common/iServer/ThemeGraph.js

@@ -21,7 +21,6 @@ import {ThemeGraphType, GraduatedMode, GraphAxesTextDisplayMode} from '../REST';
  * @param {Object} options - 参数。
  * @param {Array.<SuperMap.ThemeGraphItem>} options.items - 统计专题图子项集合。
  * @param {number}  [options.barWidth=0] - 柱状专题图中每一个柱的宽度。
- * @param {SuperMap.ThemeFlow} [options.flow] - 统计专题图流动显示与牵引线设置。
  * @param {SuperMap.GraduatedMode} [options.graduatedMode=SuperMap.GraduatedMode.CONSTANT] - 统计图中地理要素的值与图表尺寸间的映射关系。
  * @param {SuperMap.ThemeGraphAxes} [options.graphAxes] - 统计图中坐标轴样式相关信息。
  * @param {SuperMap.ThemeGraphSize} [options.graphSize=0] - 统计符号的最大最小尺寸。
@@ -47,13 +46,6 @@ export class ThemeGraph extends Theme {
          */
         this.barWidth = 0;
 
-        /**
-         * @member {SuperMap.ThemeFlow} SuperMap.ThemeGraph.prototype.flow
-         * @description 统计专题图流动显示与牵引线设置。
-         *              通过该字段可以设置统计符号是否流动显示和牵引线风格。
-         */
-        this.flow = new ThemeFlow();
-
         /**
          * @member {SuperMap.GraduatedMode} [SuperMap.ThemeGraph.prototype.graduatedMode=SuperMap.GraduatedMode.CONSTANT]
          * @description 统计图中地理要素的值与图表尺寸间的映射关系（常数、对数、平方根），即分级方式。
@@ -237,10 +229,6 @@ export class ThemeGraph extends Theme {
         super.destroy();
         var me = this;
         me.barWidth = null;
-        if (me.flow) {
-            me.flow.destroy();
-            me.flow = null;
-        }
         me.graduatedMode = null;
         if (me.graphAxes) {
             me.graphAxes.destroy();
@@ -296,11 +284,6 @@ export class ThemeGraph extends Theme {
             obj.graphTextFormat = this.graphText.graphTextFormat;
             obj.graphTextStyle = this.graphText.graphTextStyle;
         }
-        if (this.flow) {
-            obj.flowEnabled = this.flow.flowEnabled;
-            obj.leaderLineDisplayed = this.flow.leaderLineDisplayed;
-            obj.leaderLineStyle = this.flow.leaderLineStyle;
-        }
         if (this.graphAxes) {
             obj.axesColor = this.graphAxes.axesColor;
             obj.axesDisplayed = this.graphAxes.axesDisplayed;
@@ -343,7 +326,6 @@ export class ThemeGraph extends Theme {
         var len = itemsG ? itemsG.length : 0;
         Util.copy(res, obj);
         res.items = [];
-        res.flow = ThemeFlow.fromObj(obj);
         res.graphAxes = ThemeGraphAxes.fromObj(obj);
         res.graphSize = ThemeGraphSize.fromObj(obj);
         res.graphText = ThemeGraphText.fromObj(obj);

src/common/iServer/ThemeLabel.js

@@ -24,7 +24,6 @@ import {LabelOverLengthMode} from '../REST';
  * @param {Array.<SuperMap.LabelMatrixCell>} options.matrixCells - 矩阵标签元素数组。
  * @param {SuperMap.ThemeLabelAlongLine} [options.alongLine] - 标签沿线标注方向样式类。
  * @param {SuperMap.ThemeLabelBackground} [options.background] - 标签专题图中标签的背景风格类。
- * @param {SuperMap.ThemeFlow} [options.flow] - 标签专题图标签流动显示与牵引线设置类。
  * @param {SuperMap.LabelOverLengthMode} [options.labelOverLengthMode=SuperMap.LabelOverLengthMode.NONE] - 标签专题图中超长标签的处理模式枚举类。
  * @param {number} [options.maxLabelLength=256] - 标签在每一行显示的最大长度。
  * @param {number} [options.numericPrecision=0] - 通过该字段设置其显示的精度。
@@ -54,12 +53,6 @@ export class ThemeLabel extends Theme {
          */
         this.background = new ThemeLabelBackground();
 
-        /**
-         * @member {SuperMap.ThemeFlow} [SuperMap.ThemeLabel.prototype.flow]
-         * @description 标签专题图标签流动显示与牵引线设置类。通过该字段可以设置标签是否流动显示和牵引线风格。
-         */
-        this.flow = new ThemeFlow();
-
         /**
          * @member {Array.<SuperMap.ThemeUniqueItem>} [SuperMap.ThemeLabel.prototype.items]
          * @description 分段标签专题图的子项数组。分段标签专题图使用 rangeExpression
@@ -174,7 +167,6 @@ export class ThemeLabel extends Theme {
             me.background.destroy();
             me.background = null;
         }
-        me.flow = null;
         if (me.items) {
             for (var i = 0, items = me.items, len = items.length; i < len; i++) {
                 items[i].destroy();
@@ -240,12 +232,6 @@ export class ThemeLabel extends Theme {
             obj.offsetX = this.offset.offsetX;
             obj.offsetY = this.offset.offsetY;
         }
-
-        if (this.flow) {
-            obj.flowEnabled = this.flow.flowEnabled;
-            obj.leaderLineDisplayed = this.flow.leaderLineDisplayed;
-            obj.leaderLineStyle = this.flow.leaderLineStyle;
-        }
         if (this.text) {
             obj.maxTextHeight = this.text.maxTextHeight;
             obj.maxTextWidth = this.text.maxTextWidth;
@@ -289,11 +275,6 @@ export class ThemeLabel extends Theme {
         Util.copy(lab, obj);
         lab.alongLine = ThemeLabelAlongLine.fromObj(obj);
         lab.background = ThemeLabelBackground.fromObj(obj);
-        lab.flow = new ThemeFlow({
-            flowEnabled: obj.flowEnabled,
-            leaderLineDisplayed: obj.leaderLineDisplayed,
-            leaderLineStyle: obj.leaderLineStyle
-        });
         if (itemsL) {
             lab.items = [];
             for (var i = 0, len = itemsL.length; i < len; i++) {

test/common/iServer/ThemeServiceSpec.js

@@ -367,10 +367,6 @@ describe('ThemeService', () => {
         var themeGraph = new ThemeGraph({
                 barWidth: 2,
                 graphType: ThemeGraphType.PIE,
-                flow: new ThemeFlow({
-                    flowEnabled: false,
-                    leaderLineDisplayed: false
-                }),
                 graphAxes: new ThemeGraphAxes({
                     axesTextDisplayed: false
                 }),
@@ -1347,9 +1343,6 @@ describe('ThemeService', () => {
         var themeGradSym = new ThemeGraduatedSymbol({
             baseValue: 5,
             expression: "POP_1994",
-            flow: new ThemeFlow({
-                flowEnabled: false
-            }),
             graduatedMode: GraduatedMode.LOGARITHM,
             offset: myOffset,
             style: myStyle

test/leaflet/services/ThemeServiceSpec.js

@@ -130,9 +130,6 @@ describe('leaflet_ThemeService', () => {
             expression: 'SMAREA',
             baseValue: 3000000000000,
             graduatedMode: 'CONSTANT',
-            flow: new ThemeFlow({
-                flowEnabled: true
-            }),
             style: new ThemeGraduatedSymbolStyle({
                 positiveStyle: new ServerStyle({
                     markerSize: 50,

test/mapboxgl/services/ThemeServiceSpec.js

@@ -93,9 +93,6 @@ describe('mapboxgl_ThemeService', () => {
             expression: "SMAREA",
             baseValue: 300,
             graduatedMode: GraduatedMode.CONSTANT,
-            flow: new ThemeFlow({
-                flowEnabled: true
-            }),
             style: new ThemeGraduatedSymbolStyle({
                 positiveStyle: new ServerStyle({
                     markerSize: 50,

test/openlayers/services/ThemeServiceSpec.js

@@ -99,9 +99,6 @@ describe('openlayers_ThemeService', () => {
             expression: "SMAREA",
             baseValue: 3000000000000,
             graduatedMode: GraduatedMode.CONSTANT,
-            flow: new ThemeFlow({
-                flowEnabled: true
-            }),
             style: new ThemeGraduatedSymbolStyle({
                 positiveStyle: new ServerStyle({
                     markerSize: 50,