@vcmap/core 5.1.5 → 5.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
1
  import GML2 from 'ol/format/GML2.js';
2
2
  import type { Options as GMLOptions } from 'ol/format/GMLBase.js';
3
- import { type GeoJSONObject, type Options as GeoJSONOptions } from 'ol/format/GeoJSON.js';
3
+ import { type Options as GeoJSONOptions } from 'ol/format/GeoJSON.js';
4
4
  import GML3 from 'ol/format/GML3.js';
5
5
  import type { Size } from 'ol/size.js';
6
6
  import type { Feature } from 'ol/index.js';
@@ -83,7 +83,7 @@ declare class WMSFeatureProvider extends AbstractFeatureProvider {
83
83
  constructor(layerName: string, options: WMSFeatureProviderOptions);
84
84
  get wmsSource(): TileWMS;
85
85
  set wmsSource(source: TileWMS);
86
- featureResponseCallback(data: GeoJSONObject, coordinate: Coordinate): Feature[];
86
+ featureResponseCallback(data: Document | Element | ArrayBuffer | any | string, coordinate: Coordinate): Feature[];
87
87
  getFeaturesByCoordinate(coordinate: Coordinate, resolution: number, headers?: Record<string, string>): Promise<Feature[]>;
88
88
  toJSON(): WMSFeatureProviderOptions;
89
89
  destroy(): void;
@@ -9,7 +9,7 @@ import AbstractFeatureProvider from './abstractFeatureProvider.js';
9
9
  import Projection, { mercatorProjection, } from '../util/projection.js';
10
10
  import { getWMSSource } from '../layer/wmsHelpers.js';
11
11
  import Extent from '../util/extent.js';
12
- import { getInitForUrl, requestJson } from '../util/fetch.js';
12
+ import { getInitForUrl, requestUrl } from '../util/fetch.js';
13
13
  import { featureProviderClassRegistry } from '../classRegistry.js';
14
14
  import { TilingScheme } from '../layer/rasterLayer.js';
15
15
  const gmlFormats = {
@@ -157,7 +157,8 @@ class WMSFeatureProvider extends AbstractFeatureProvider {
157
157
  const init = getInitForUrl(url, headers);
158
158
  let data;
159
159
  try {
160
- data = await requestJson(url, init);
160
+ const response = await requestUrl(url, init);
161
+ data = await response.text();
161
162
  }
162
163
  catch (ex) {
163
164
  this.getLogger().error(`Failed fetching WMS FeatureInfo ${url}`);
@@ -1 +1 @@
1
- {"version":3,"file":"wmsFeatureProvider.js","sourceRoot":"","sources":["../../../src/featureProvider/wmsFeatureProvider.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"wmsFeatureProvider.js","sourceRoot":"","sources":["../../../src/featureProvider/wmsFeatureProvider.ts"],"names":[],"mappings":"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"}
@@ -54,7 +54,7 @@ class VcsModule {
54
54
  * @param app
55
55
  */
56
56
  setConfigFromApp(app) {
57
- this._config = app.serializeModule(this._uuid);
57
+ this._config = { ...this.config, ...app.serializeModule(this._uuid) };
58
58
  }
59
59
  toJSON() {
60
60
  const config = {};
@@ -1 +1 @@
1
- {"version":3,"file":"vcsModule.js","sourceRoot":"","sources":["../../src/vcsModule.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"vcsModule.js","sourceRoot":"","sources":["../../src/vcsModule.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vcmap/core",
3
- "version": "5.1.5",
3
+ "version": "5.1.6",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "type": "module",
@@ -1,10 +1,7 @@
1
1
  import GML2 from 'ol/format/GML2.js';
2
2
  import type { Options as GMLOptions } from 'ol/format/GMLBase.js';
3
3
  import WFS from 'ol/format/WFS.js';
4
- import GeoJSON, {
5
- type GeoJSONObject,
6
- type Options as GeoJSONOptions,
7
- } from 'ol/format/GeoJSON.js';
4
+ import GeoJSON, { type Options as GeoJSONOptions } from 'ol/format/GeoJSON.js';
8
5
  import GML3 from 'ol/format/GML3.js';
9
6
  import Point from 'ol/geom/Point.js';
10
7
  import { getTransform, type Projection as OLProjection } from 'ol/proj.js';
@@ -24,7 +21,7 @@ import Projection, {
24
21
  import type { WMSSourceOptions } from '../layer/wmsHelpers.js';
25
22
  import { getWMSSource } from '../layer/wmsHelpers.js';
26
23
  import Extent, { ExtentOptions } from '../util/extent.js';
27
- import { getInitForUrl, requestJson } from '../util/fetch.js';
24
+ import { getInitForUrl, requestUrl } from '../util/fetch.js';
28
25
  import { featureProviderClassRegistry } from '../classRegistry.js';
29
26
  import { TilingScheme } from '../layer/rasterLayer.js';
30
27
 
@@ -206,7 +203,7 @@ class WMSFeatureProvider extends AbstractFeatureProvider {
206
203
  }
207
204
 
208
205
  featureResponseCallback(
209
- data: GeoJSONObject,
206
+ data: Document | Element | ArrayBuffer | any | string,
210
207
  coordinate: Coordinate,
211
208
  ): Feature[] {
212
209
  let features: Feature[];
@@ -259,9 +256,10 @@ class WMSFeatureProvider extends AbstractFeatureProvider {
259
256
 
260
257
  if (url) {
261
258
  const init = getInitForUrl(url, headers);
262
- let data: GeoJSONObject;
259
+ let data: string;
263
260
  try {
264
- data = await requestJson<GeoJSONObject>(url, init);
261
+ const response = await requestUrl(url, init);
262
+ data = await response.text();
265
263
  } catch (ex) {
266
264
  this.getLogger().error(`Failed fetching WMS FeatureInfo ${url}`);
267
265
  return [];
package/src/vcsModule.ts CHANGED
@@ -98,7 +98,7 @@ class VcsModule {
98
98
  * @param app
99
99
  */
100
100
  setConfigFromApp(app: VcsApp): void {
101
- this._config = app.serializeModule(this._uuid);
101
+ this._config = { ...this.config, ...app.serializeModule(this._uuid) };
102
102
  }
103
103
 
104
104
  toJSON(): VcsModuleConfig {