Skip to content

Commit ea77316

Browse files
songyumengsongyumeng
committed
【fix】去掉服务端专题图相关flow参数，流动显示在前端出图中无法体现 review by qiwei
1 parent 1952c5d commit ea77316

File tree

12 files changed

+1
-83
lines changed

12 files changed

+1
-83
lines changed

‎examples/classic/theme_themeGraduatedSymbol.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,6 @@ <h5 class='panel-title text-center' data-i18n="resources.text_graduatedSymbol"><
7979
expression: "SMAREA",
8080
baseValue: 3000000000000,
8181
graduatedMode: SuperMap.REST.GraduatedMode.CONSTANT,
82-
flow: new SuperMap.REST.ThemeFlow({
83-
flowEnabled: true
84-
}),
8582
style: graStyle
8683
}),
8784
themeParameters = new SuperMap.REST.ThemeParameters({

‎examples/leaflet/03_themeGraduatedSymbol.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929
expression: "SMAREA",
3030
baseValue: 3000000000000,
3131
graduatedMode: SuperMap.GraduatedMode.CONSTANT,
32-
flow: new SuperMap.ThemeFlow({
33-
flowEnabled: true
34-
}),
3532
style: new SuperMap.ThemeGraduatedSymbolStyle({
3633
positiveStyle: new SuperMap.ServerStyle({
3734
markerSize: 50,

‎examples/mapboxgl/03_themeGraduatedSymbol.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@
5151
expression: "SMAREA",
5252
baseValue: 3000000000000,
5353
graduatedMode: SuperMap.GraduatedMode.CONSTANT,
54-
flow: new SuperMap.ThemeFlow({
55-
flowEnabled: true
56-
}),
5754
style: new SuperMap.ThemeGraduatedSymbolStyle({
5855
positiveStyle: new SuperMap.ServerStyle({
5956
markerSize: 50,

‎examples/openlayers/03_themeGraduatedSymbol.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@
4141
expression: "SMAREA",
4242
baseValue: 3000000000000,
4343
graduatedMode: SuperMap.GraduatedMode.CONSTANT,
44-
flow: new SuperMap.ThemeFlow({
45-
flowEnabled: true
46-
}),
4744
style: new SuperMap.ThemeGraduatedSymbolStyle({
4845
positiveStyle: new SuperMap.ServerStyle({
4946
markerSize: 50,

‎src/common/iServer/ThemeFlow.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {ServerStyle} from './ServerStyle';
77

88
/**
99
* @class SuperMap.ThemeFlow
10+
* @private
1011
* @category iServer Map Theme
1112
* @classdesc 标签或符号流动显示和牵引线风格设置类。
1213
* 通过该类可以设置专题图中符号是否流动显示、是否使用牵引线以及牵引线风格。

‎src/common/iServer/ThemeGraduatedSymbol.js

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import {GraduatedMode} from '../REST';
1818
* @param {SuperMap.ThemeGraduatedSymbolStyle} options.style - 用于设置等级符号图正负和零值显示风格。
1919
* @param {string} options.expression - 等级符号专题图的字段或字段表达式。
2020
* @param {number} [options.baseValue=0] - 等级符号专题图的基准值，单位同专题变量的单位。
21-
* @param {SuperMap.ThemeFlow} [options.flow] - 等级符号专题图符号流动显示与牵引线设置类。
2221
* @param {SuperMap.GraduatedMode} [options.graduatedMode=SuperMap.GraduatedMode.CONSTANT] - 等级符号专题图分级模式。
2322
* @param {SuperMap.ThemeOffset} [options.offset] - 用于设置标签专题图中标记文本相对于要素内点的偏移量对象。
2423
* @param {SuperMap.ThemeMemoryData} [options.memoryData] - 专题图内存数据。
@@ -42,13 +41,6 @@ export class ThemeGraduatedSymbol extends Theme {
4241
*/
4342
this.expression = null;
4443

45-
/**
46-
* @member {SuperMap.ThemeFlow} SuperMap.ThemeGraduatedSymbol.prototype.flow
47-
* @description 等级符号专题图符号流动显示与牵引线设置类。<br>
48-
* 通过该字段可以设置等级符号是否流动显示和牵引线风格。
49-
*/
50-
this.flow = new ThemeFlow();
51-
5244
/**
5345
* @member {SuperMap.GraduatedMode} [SuperMap.ThemeGraduatedSymbol.prototype.graduatedMode=SuperMap.GraduatedMode.CONSTANT]
5446
* @description 等级符号专题图分级模式。<br>
@@ -87,10 +79,6 @@ export class ThemeGraduatedSymbol extends Theme {
8779
super.destroy();
8880
var me = this;
8981
me.expression = null;
90-
if (me.flow) {
91-
me.flow.destroy();
92-
me.flow = null;
93-
}
9482
me.graduatedMode = GraduatedMode.CONSTANT;
9583
if (me.offset) {
9684
me.offset.destroy();
@@ -125,11 +113,6 @@ export class ThemeGraduatedSymbol extends Theme {
125113
obj.baseValue = this.baseValue;
126114
obj.expression = this.expression;
127115
obj.graduatedMode = this.graduatedMode;
128-
if (this.flow) {
129-
obj.flowEnabled = this.flow.flowEnabled;
130-
obj.leaderLineDisplayed = this.flow.leaderLineDisplayed;
131-
obj.leaderLineStyle = this.flow.leaderLineStyle;
132-
}
133116
if (this.offset) {
134117
obj.offsetFixed = this.offset.offsetFixed;
135118
obj.offsetX = this.offset.offsetX;
@@ -157,7 +140,6 @@ export class ThemeGraduatedSymbol extends Theme {
157140
}
158141
var res = new SuperMap.ThemeGraduatedSymbol();
159142
Util.copy(res, obj);
160-
res.flow = ThemeFlow.fromObj(obj);
161143
res.offset = ThemeOffset.fromObj(obj);
162144
res.style = ThemeGraduatedSymbolStyle.fromObj(obj);
163145
return res;

‎src/common/iServer/ThemeGraph.js

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import {ThemeGraphType, GraduatedMode, GraphAxesTextDisplayMode} from '../REST';
2121
* @param {Object} options - 参数。
2222
* @param {Array.<SuperMap.ThemeGraphItem>} options.items - 统计专题图子项集合。
2323
* @param {number} [options.barWidth=0] - 柱状专题图中每一个柱的宽度。
24-
* @param {SuperMap.ThemeFlow} [options.flow] - 统计专题图流动显示与牵引线设置。
2524
* @param {SuperMap.GraduatedMode} [options.graduatedMode=SuperMap.GraduatedMode.CONSTANT] - 统计图中地理要素的值与图表尺寸间的映射关系。
2625
* @param {SuperMap.ThemeGraphAxes} [options.graphAxes] - 统计图中坐标轴样式相关信息。
2726
* @param {SuperMap.ThemeGraphSize} [options.graphSize=0] - 统计符号的最大最小尺寸。
@@ -47,13 +46,6 @@ export class ThemeGraph extends Theme {
4746
*/
4847
this.barWidth = 0;
4948

50-
/**
51-
* @member {SuperMap.ThemeFlow} SuperMap.ThemeGraph.prototype.flow
52-
* @description 统计专题图流动显示与牵引线设置。
53-
* 通过该字段可以设置统计符号是否流动显示和牵引线风格。
54-
*/
55-
this.flow = new ThemeFlow();
56-
5749
/**
5850
* @member {SuperMap.GraduatedMode} [SuperMap.ThemeGraph.prototype.graduatedMode=SuperMap.GraduatedMode.CONSTANT]
5951
* @description 统计图中地理要素的值与图表尺寸间的映射关系（常数、对数、平方根），即分级方式。
@@ -237,10 +229,6 @@ export class ThemeGraph extends Theme {
237229
super.destroy();
238230
var me = this;
239231
me.barWidth = null;
240-
if (me.flow) {
241-
me.flow.destroy();
242-
me.flow = null;
243-
}
244232
me.graduatedMode = null;
245233
if (me.graphAxes) {
246234
me.graphAxes.destroy();
@@ -296,11 +284,6 @@ export class ThemeGraph extends Theme {
296284
obj.graphTextFormat = this.graphText.graphTextFormat;
297285
obj.graphTextStyle = this.graphText.graphTextStyle;
298286
}
299-
if (this.flow) {
300-
obj.flowEnabled = this.flow.flowEnabled;
301-
obj.leaderLineDisplayed = this.flow.leaderLineDisplayed;
302-
obj.leaderLineStyle = this.flow.leaderLineStyle;
303-
}
304287
if (this.graphAxes) {
305288
obj.axesColor = this.graphAxes.axesColor;
306289
obj.axesDisplayed = this.graphAxes.axesDisplayed;
@@ -343,7 +326,6 @@ export class ThemeGraph extends Theme {
343326
var len = itemsG ? itemsG.length : 0;
344327
Util.copy(res, obj);
345328
res.items = [];
346-
res.flow = ThemeFlow.fromObj(obj);
347329
res.graphAxes = ThemeGraphAxes.fromObj(obj);
348330
res.graphSize = ThemeGraphSize.fromObj(obj);
349331
res.graphText = ThemeGraphText.fromObj(obj);

‎src/common/iServer/ThemeLabel.js

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import {LabelOverLengthMode} from '../REST';
2424
* @param {Array.<SuperMap.LabelMatrixCell>} options.matrixCells - 矩阵标签元素数组。
2525
* @param {SuperMap.ThemeLabelAlongLine} [options.alongLine] - 标签沿线标注方向样式类。
2626
* @param {SuperMap.ThemeLabelBackground} [options.background] - 标签专题图中标签的背景风格类。
27-
* @param {SuperMap.ThemeFlow} [options.flow] - 标签专题图标签流动显示与牵引线设置类。
2827
* @param {SuperMap.LabelOverLengthMode} [options.labelOverLengthMode=SuperMap.LabelOverLengthMode.NONE] - 标签专题图中超长标签的处理模式枚举类。
2928
* @param {number} [options.maxLabelLength=256] - 标签在每一行显示的最大长度。
3029
* @param {number} [options.numericPrecision=0] - 通过该字段设置其显示的精度。
@@ -54,12 +53,6 @@ export class ThemeLabel extends Theme {
5453
*/
5554
this.background = new ThemeLabelBackground();
5655

57-
/**
58-
* @member {SuperMap.ThemeFlow} [SuperMap.ThemeLabel.prototype.flow]
59-
* @description 标签专题图标签流动显示与牵引线设置类。通过该字段可以设置标签是否流动显示和牵引线风格。
60-
*/
61-
this.flow = new ThemeFlow();
62-
6356
/**
6457
* @member {Array.<SuperMap.ThemeUniqueItem>} [SuperMap.ThemeLabel.prototype.items]
6558
* @description 分段标签专题图的子项数组。分段标签专题图使用 rangeExpression
@@ -174,7 +167,6 @@ export class ThemeLabel extends Theme {
174167
me.background.destroy();
175168
me.background = null;
176169
}
177-
me.flow = null;
178170
if (me.items) {
179171
for (var i = 0, items = me.items, len = items.length; i < len; i++) {
180172
items[i].destroy();
@@ -240,12 +232,6 @@ export class ThemeLabel extends Theme {
240232
obj.offsetX = this.offset.offsetX;
241233
obj.offsetY = this.offset.offsetY;
242234
}
243-
244-
if (this.flow) {
245-
obj.flowEnabled = this.flow.flowEnabled;
246-
obj.leaderLineDisplayed = this.flow.leaderLineDisplayed;
247-
obj.leaderLineStyle = this.flow.leaderLineStyle;
248-
}
249235
if (this.text) {
250236
obj.maxTextHeight = this.text.maxTextHeight;
251237
obj.maxTextWidth = this.text.maxTextWidth;
@@ -289,11 +275,6 @@ export class ThemeLabel extends Theme {
289275
Util.copy(lab, obj);
290276
lab.alongLine = ThemeLabelAlongLine.fromObj(obj);
291277
lab.background = ThemeLabelBackground.fromObj(obj);
292-
lab.flow = new ThemeFlow({
293-
flowEnabled: obj.flowEnabled,
294-
leaderLineDisplayed: obj.leaderLineDisplayed,
295-
leaderLineStyle: obj.leaderLineStyle
296-
});
297278
if (itemsL) {
298279
lab.items = [];
299280
for (var i = 0, len = itemsL.length; i < len; i++) {

‎test/common/iServer/ThemeServiceSpec.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -367,10 +367,6 @@ describe('ThemeService', () => {
367367
var themeGraph = new ThemeGraph({
368368
barWidth: 2,
369369
graphType: ThemeGraphType.PIE,
370-
flow: new ThemeFlow({
371-
flowEnabled: false,
372-
leaderLineDisplayed: false
373-
}),
374370
graphAxes: new ThemeGraphAxes({
375371
axesTextDisplayed: false
376372
}),
@@ -1347,9 +1343,6 @@ describe('ThemeService', () => {
13471343
var themeGradSym = new ThemeGraduatedSymbol({
13481344
baseValue: 5,
13491345
expression: "POP_1994",
1350-
flow: new ThemeFlow({
1351-
flowEnabled: false
1352-
}),
13531346
graduatedMode: GraduatedMode.LOGARITHM,
13541347
offset: myOffset,
13551348
style: myStyle

‎test/leaflet/services/ThemeServiceSpec.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,6 @@ describe('leaflet_ThemeService', () => {
130130
expression: 'SMAREA',
131131
baseValue: 3000000000000,
132132
graduatedMode: 'CONSTANT',
133-
flow: new ThemeFlow({
134-
flowEnabled: true
135-
}),
136133
style: new ThemeGraduatedSymbolStyle({
137134
positiveStyle: new ServerStyle({
138135
markerSize: 50,

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy