ol 7.2.3-dev.1675089905871 → 7.2.3-dev.1675364517411
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.
- package/Map.d.ts +1 -1
- package/View.d.ts +17 -0
- package/View.d.ts.map +1 -1
- package/View.js +17 -0
- package/control/Attribution.d.ts.map +1 -1
- package/control/Attribution.js +14 -54
- package/dist/ol.js +2 -2
- package/dist/ol.js.map +1 -1
- package/format/GML32.d.ts.map +1 -1
- package/format/GML32.js +14 -0
- package/layer/Layer.d.ts +16 -0
- package/layer/Layer.d.ts.map +1 -1
- package/layer/Layer.js +54 -0
- package/package.json +1 -1
- package/source/Source.d.ts +4 -4
- package/source/Source.d.ts.map +1 -1
- package/source/Source.js +2 -2
- package/util.js +1 -1
package/Map.d.ts
CHANGED
|
@@ -210,7 +210,7 @@ export type MapOptions = {
|
|
|
210
210
|
* fetched unless this is specified at construction time or through
|
|
211
211
|
* {@link module :ol/Map~Map#setView}.
|
|
212
212
|
*/
|
|
213
|
-
view?: Promise<import("./View.js").ViewOptions> |
|
|
213
|
+
view?: View | Promise<import("./View.js").ViewOptions> | undefined;
|
|
214
214
|
};
|
|
215
215
|
/**
|
|
216
216
|
* @classdesc
|
package/View.d.ts
CHANGED
|
@@ -358,6 +358,19 @@ export type State = {
|
|
|
358
358
|
*/
|
|
359
359
|
zoom: number;
|
|
360
360
|
};
|
|
361
|
+
/**
|
|
362
|
+
* Like {@link import ("./Map.js").FrameState}, but just `viewState` and `extent`.
|
|
363
|
+
*/
|
|
364
|
+
export type ViewStateAndExtent = {
|
|
365
|
+
/**
|
|
366
|
+
* View state.
|
|
367
|
+
*/
|
|
368
|
+
viewState: State;
|
|
369
|
+
/**
|
|
370
|
+
* Extent.
|
|
371
|
+
*/
|
|
372
|
+
extent: import("./extent.js").Extent;
|
|
373
|
+
};
|
|
361
374
|
export type ViewObjectEventTypes = import("./ObjectEventType").Types | 'change:center' | 'change:resolution' | 'change:rotation';
|
|
362
375
|
/**
|
|
363
376
|
* *
|
|
@@ -821,6 +834,10 @@ declare class View extends BaseObject {
|
|
|
821
834
|
* @return {State} View state.
|
|
822
835
|
*/
|
|
823
836
|
getState(): State;
|
|
837
|
+
/**
|
|
838
|
+
* @return {ViewStateAndExtent} Like `FrameState`, but just `viewState` and `extent`.
|
|
839
|
+
*/
|
|
840
|
+
getViewStateAndExtent(): ViewStateAndExtent;
|
|
824
841
|
/**
|
|
825
842
|
* Get the current zoom level. This method may return non-integer zoom levels
|
|
826
843
|
* if the view does not constrain the resolution, or if an interaction or
|
package/View.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"View.d.ts","sourceRoot":"","sources":["View.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"View.d.ts","sourceRoot":"","sources":["View.js"],"names":[],"mappings":"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"}
|
package/View.js
CHANGED
|
@@ -212,6 +212,13 @@ import {fromExtent as polygonFromExtent} from './geom/Polygon.js';
|
|
|
212
212
|
* @property {number} zoom Zoom.
|
|
213
213
|
*/
|
|
214
214
|
|
|
215
|
+
/**
|
|
216
|
+
* Like {@link import("./Map.js").FrameState}, but just `viewState` and `extent`.
|
|
217
|
+
* @typedef {Object} ViewStateAndExtent
|
|
218
|
+
* @property {State} viewState View state.
|
|
219
|
+
* @property {import("./extent.js").Extent} extent Extent.
|
|
220
|
+
*/
|
|
221
|
+
|
|
215
222
|
/**
|
|
216
223
|
* Default min zoom level for the map view.
|
|
217
224
|
* @type {number}
|
|
@@ -1243,6 +1250,16 @@ class View extends BaseObject {
|
|
|
1243
1250
|
};
|
|
1244
1251
|
}
|
|
1245
1252
|
|
|
1253
|
+
/**
|
|
1254
|
+
* @return {ViewStateAndExtent} Like `FrameState`, but just `viewState` and `extent`.
|
|
1255
|
+
*/
|
|
1256
|
+
getViewStateAndExtent() {
|
|
1257
|
+
return {
|
|
1258
|
+
viewState: this.getState(),
|
|
1259
|
+
extent: this.calculateExtent(),
|
|
1260
|
+
};
|
|
1261
|
+
}
|
|
1262
|
+
|
|
1246
1263
|
/**
|
|
1247
1264
|
* Get the current zoom level. This method may return non-integer zoom levels
|
|
1248
1265
|
* if the view does not constrain the resolution, or if an interaction or
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Attribution.d.ts","sourceRoot":"","sources":["Attribution.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"Attribution.d.ts","sourceRoot":"","sources":["Attribution.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qBA+BuB,OAAO,gBAAgB,EAAE,OAAO,KAAE,IAAI;;AAtB7D;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH;;;;;;;;GAQG;AACH;IACE;;OAEG;IACH,2CAsIC;IA7HC;;;OAGG;IACH,mBAA8C;IAE9C;;;OAGG;IACH,mBAC4D;IAE5D;;;OAGG;IACH,uBAAqC;IAErC;;;OAGG;IACH,6BAA6D;IAE7D;;;OAGG;IACH,qBACgE;IA0B9D;;;OAGG;IACH,uBAAoD;IAUpD;;;OAGG;IACH,eAA4C;IAU9C;;;OAGG;IACH,sBAAqD;IAyBrD;;;;OAIG;IACH,8BAA+B;IAE/B;;;OAGG;IACH,yBAA4B;IAG9B;;;;;OAKG;IACH,mCAoBC;IAED;;;OAGG;IACH,uBA+BC;IAED;;;OAGG;IACH,qBAIC;IAED;;OAEG;IACH,sBASC;IAED;;;;OAIG;IACH,kBAHY,OAAO,CAKlB;IAED;;;;OAIG;IACH,4BAHW,OAAO,QAYjB;IAED;;;;;;OAMG;IACH,wBAHW,OAAO,QASjB;IAED;;;;;OAKG;IACH,gBAHY,OAAO,CAKlB;CAUF"}
|
package/control/Attribution.js
CHANGED
|
@@ -5,7 +5,6 @@ import Control from './Control.js';
|
|
|
5
5
|
import EventType from '../events/EventType.js';
|
|
6
6
|
import {CLASS_COLLAPSED, CLASS_CONTROL, CLASS_UNSELECTABLE} from '../css.js';
|
|
7
7
|
import {equals} from '../array.js';
|
|
8
|
-
import {inView} from '../layer/Layer.js';
|
|
9
8
|
import {removeChildren, replaceNode} from '../dom.js';
|
|
10
9
|
|
|
11
10
|
/**
|
|
@@ -191,60 +190,21 @@ class Attribution extends Control {
|
|
|
191
190
|
* @private
|
|
192
191
|
*/
|
|
193
192
|
collectSourceAttributions_(frameState) {
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
* A list of visible attributions.
|
|
202
|
-
* @type {Array<string>}
|
|
203
|
-
*/
|
|
204
|
-
const visibleAttributions = [];
|
|
205
|
-
|
|
206
|
-
let collapsible = true;
|
|
207
|
-
const layerStatesArray = frameState.layerStatesArray;
|
|
208
|
-
for (let i = 0, ii = layerStatesArray.length; i < ii; ++i) {
|
|
209
|
-
const layerState = layerStatesArray[i];
|
|
210
|
-
if (!inView(layerState, frameState.viewState)) {
|
|
211
|
-
continue;
|
|
212
|
-
}
|
|
213
|
-
|
|
214
|
-
const source = /** @type {import("../layer/Layer.js").default} */ (
|
|
215
|
-
layerState.layer
|
|
216
|
-
).getSource();
|
|
217
|
-
if (!source) {
|
|
218
|
-
continue;
|
|
219
|
-
}
|
|
220
|
-
|
|
221
|
-
const attributionGetter = source.getAttributions();
|
|
222
|
-
if (!attributionGetter) {
|
|
223
|
-
continue;
|
|
224
|
-
}
|
|
225
|
-
|
|
226
|
-
const attributions = attributionGetter(frameState);
|
|
227
|
-
if (!attributions) {
|
|
228
|
-
continue;
|
|
229
|
-
}
|
|
193
|
+
const visibleAttributions = Array.from(
|
|
194
|
+
new Set(
|
|
195
|
+
this.getMap()
|
|
196
|
+
.getAllLayers()
|
|
197
|
+
.flatMap((layer) => layer.getAttributions(frameState))
|
|
198
|
+
)
|
|
199
|
+
);
|
|
230
200
|
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
lookup[attributions[j]] = true;
|
|
239
|
-
}
|
|
240
|
-
}
|
|
241
|
-
} else {
|
|
242
|
-
if (!(attributions in lookup)) {
|
|
243
|
-
visibleAttributions.push(attributions);
|
|
244
|
-
lookup[attributions] = true;
|
|
245
|
-
}
|
|
246
|
-
}
|
|
247
|
-
}
|
|
201
|
+
const collapsible = !this.getMap()
|
|
202
|
+
.getAllLayers()
|
|
203
|
+
.some(
|
|
204
|
+
(layer) =>
|
|
205
|
+
layer.getSource() &&
|
|
206
|
+
layer.getSource().getAttributionsCollapsible() === false
|
|
207
|
+
);
|
|
248
208
|
if (!this.overrideCollapsible_) {
|
|
249
209
|
this.setCollapsible(collapsible);
|
|
250
210
|
}
|