Skip to content

Commit bbacd0a

Browse files
hhyu1hhyu1
committed
2 parents 8193292 + 25af9ff commit bbacd0a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1694
-492
lines changed

‎build/jsdocs/openlayers/docs.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,7 @@
6262
"src/common/components/templates/PopContainer",
6363
"src/common/components/templates/Select",
6464
"src/common/security/KeyServiceParameter",
65-
"src/common/components/templates/TemplateBase",
66-
67-
"src/openlayers/core/Util"
65+
"src/common/components/templates/TemplateBase"
6866
]
6967
},
7068
"plugins": ["plugins/markdown","../plugins/usage", "../plugins/moduleCategories"],

‎build/server.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ const serveIndex = require('serve-index');
55

66
const webpack = require('webpack');
77
const webpackDevMiddleware = require('webpack-dev-middleware');
8+
89
const product = process.argv[2];
910
var dirname = product === 'openlayers' ? 'ol' : product
1011
const app = (module.exports = express());
1112
if (product) {
1213
const config = require(`./webpack.config.${product}.js`);
1314
const configBase = require(`./webpack.config.base.js`);
14-
const entry = [`./src/${product}/${product === 'classic'? 'index': 'namespace'}.js`];
15+
const entry = [`./src/${product}/namespace.js`];
1516
const filename = `iclient-${dirname}`;
1617
config.output.filename = `${filename}-es6.min.js`;
1718
config.output.path = path.resolve(`${__dirname}/../dist/${dirname}`);

‎examples/leaflet/01_chartService.html

Lines changed: 104 additions & 100 deletions
Large diffs are not rendered by default.

‎examples/mapboxgl/01_chartService.html

Lines changed: 105 additions & 101 deletions
Large diffs are not rendered by default.

‎examples/openlayers/01_chartService.html

Lines changed: 106 additions & 103 deletions
Large diffs are not rendered by default.

‎src/classic/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ export { OutputSetting } from '@supermap/iclient-common/iServer/OutputSetting';
1616
export { MappingParameters } from '@supermap/iclient-common/iServer/MappingParameters';
1717
export { GeoCodingParameter } from '@supermap/iclient-common/iServer/GeoCodingParameter';
1818
export { GeoDecodingParameter } from '@supermap/iclient-common/iServer/GeoDecodingParameter';
19+
export { VectorClipJobsParameter } from '@supermap/iclient-common/iServer/VectorClipJobsParameter';
1920
export { Util } from '@supermap/iclient-common/commontypes/Util';
21+
export { FetchRequest } from '@supermap/iclient-common/util/FetchRequest';
2022
export * from './overlay';
2123
export * from './services';
2224
export { SuperMap } from './SuperMap';

‎src/classic/namespace.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import {
22
ElasticSearch,
33
SecurityManager,
4+
VectorClipJobsParameter,
45
KernelDensityJobParameter,
56
SingleObjectQueryJobsParameter,
67
SummaryAttributesJobsParameter,
@@ -14,11 +15,13 @@ import {
1415
GeoCodingParameter,
1516
GeoDecodingParameter,
1617
SuperMap,
17-
Util
18+
Util,
19+
FetchRequest
1820
} from './index';
1921

2022
SuperMap.ElasticSearch = ElasticSearch;
2123
SuperMap.SecurityManager = SecurityManager;
24+
SuperMap.VectorClipJobsParameter = VectorClipJobsParameter;
2225
SuperMap.KernelDensityJobParameter = KernelDensityJobParameter;
2326
SuperMap.SingleObjectQueryJobsParameter = SingleObjectQueryJobsParameter;
2427
SuperMap.SummaryAttributesJobsParameter = SummaryAttributesJobsParameter;
@@ -31,5 +34,6 @@ SuperMap.OutputSetting = OutputSetting;
3134
SuperMap.MappingParameters = MappingParameters;
3235
SuperMap.GeoCodingParameter = GeoCodingParameter;
3336
SuperMap.GeoDecodingParameter = GeoDecodingParameter;
37+
SuperMap.FetchRequest = FetchRequest;
3438
SuperMap.Util = {...SuperMap.Util, ...Util};
3539
export * from './index';

‎src/common/iServer/ChartQueryService.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ export class ChartQueryService extends CommonServiceBase {
162162
this._transformFeatures(recordsets[i], fieldNameFormatter, me.format)
163163
}
164164
// 点选查询的返回结果
165-
if(recordsets[i].chartFeatureRecordsets) {
166-
recordsets[i].chartFeatureRecordsets.forEach(chartFeatureRecordset => {
165+
if(recordsets[i].chartRecordsets) {
166+
recordsets[i].chartRecordsets.forEach(chartFeatureRecordset => {
167167
this._transformFeatures(chartFeatureRecordset, fieldNameFormatter, me.format)
168168
});
169169
}

‎src/common/iServer/ChartSetting.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
* @param {boolean} [options.textClipRegionEnabled=false] - 是否启用海图图层的文本显示裁剪区。
4040
* @param {boolean} [options.displayLowAccurateMarker=true] - 是否显示低精度符号。
4141
* @param {number} [options.displayScaleFactor] - 比例尺缩放。
42-
* @param {object} [options.chartAcronymClassify] - 物标分组是否可显示的对应关系。
42+
* @param {object} [options.displayableAcronymClassify] - 物标分组是否可显示的对应关系。
4343
* @usage
4444
*/
4545
export class ChartSetting {
@@ -208,10 +208,10 @@
208208
this.displayScaleFactor = 0.05;
209209

210210
/**
211-
* @member {object} [options.chartAcronymClassify]
211+
* @member {object} [options.displayableAcronymClassify]
212212
* @description 物标分组是否可显示的对应关系。
213213
*/
214-
this.chartAcronymClassify = null;
214+
this.displayableAcronymClassify = null;
215215

216216
if (options) {
217217
Util.extend(this, options);
@@ -252,7 +252,7 @@
252252
this.textClipRegionEnabled = null;
253253
this.displayLowAccurateMarker = null;
254254
this.displayScaleFactor = null;
255-
this.chartAcronymClassify = null;
255+
this.displayableAcronymClassify = null;
256256
}
257257
}
258258

‎src/common/iServer/GetFeaturesByBufferService.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,7 @@ export class GetFeaturesByBufferService extends GetFeaturesServiceBase {
4747
* @returns {Object} 转化后的 JSON 字符串。
4848
*/
4949
getJsonParameters(params) {
50-
if (!(params instanceof GetFeaturesByBufferParameters)) {
51-
return;
52-
}
53-
return GetFeaturesByBufferParameters.toJsonParameters(params);
50+
return GetFeaturesByBufferParameters.toJsonParameters(params);
5451
}
5552

5653
}

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