Get rid of map focus
This commit is contained in:
@@ -40,7 +40,6 @@ import {create as createTransform, apply as applyTransform} from './transform.js
|
|||||||
* @property {import("./transform.js").Transform} coordinateToPixelTransform
|
* @property {import("./transform.js").Transform} coordinateToPixelTransform
|
||||||
* @property {null|import("./extent.js").Extent} extent
|
* @property {null|import("./extent.js").Extent} extent
|
||||||
* @property {Array<DeclutterItems>} declutterItems
|
* @property {Array<DeclutterItems>} declutterItems
|
||||||
* @property {import("./coordinate.js").Coordinate} focus
|
|
||||||
* @property {number} index
|
* @property {number} index
|
||||||
* @property {Array<import("./layer/Layer.js").State>} layerStatesArray
|
* @property {Array<import("./layer/Layer.js").State>} layerStatesArray
|
||||||
* @property {number} layerIndex
|
* @property {number} layerIndex
|
||||||
@@ -345,12 +344,6 @@ class PluggableMap extends BaseObject {
|
|||||||
*/
|
*/
|
||||||
this.handleResize_;
|
this.handleResize_;
|
||||||
|
|
||||||
/**
|
|
||||||
* @private
|
|
||||||
* @type {import("./coordinate.js").Coordinate}
|
|
||||||
*/
|
|
||||||
this.focus_ = null;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @private
|
* @private
|
||||||
* @type {!Array<PostRenderFunction>}
|
* @type {!Array<PostRenderFunction>}
|
||||||
@@ -891,12 +884,13 @@ class PluggableMap extends BaseObject {
|
|||||||
}
|
}
|
||||||
// Prioritize the highest zoom level tiles closest to the focus.
|
// Prioritize the highest zoom level tiles closest to the focus.
|
||||||
// Tiles at higher zoom levels are prioritized using Math.log(tileResolution).
|
// Tiles at higher zoom levels are prioritized using Math.log(tileResolution).
|
||||||
// Within a zoom level, tiles are prioritized by the distance in pixels
|
// Within a zoom level, tiles are prioritized by the distance in pixels between
|
||||||
// between the center of the tile and the focus. The factor of 65536 means
|
// the center of the tile and the center of the viewport. The factor of 65536
|
||||||
// that the prioritization should behave as desired for tiles up to
|
// means that the prioritization should behave as desired for tiles up to
|
||||||
// 65536 * Math.log(2) = 45426 pixels from the focus.
|
// 65536 * Math.log(2) = 45426 pixels from the focus.
|
||||||
const deltaX = tileCenter[0] - frameState.focus[0];
|
const center = frameState.viewState.center;
|
||||||
const deltaY = tileCenter[1] - frameState.focus[1];
|
const deltaX = tileCenter[0] - center[0];
|
||||||
|
const deltaY = tileCenter[1] - center[1];
|
||||||
return 65536 * Math.log(tileResolution) +
|
return 65536 * Math.log(tileResolution) +
|
||||||
Math.sqrt(deltaX * deltaX + deltaY * deltaY) / tileResolution;
|
Math.sqrt(deltaX * deltaX + deltaY * deltaY) / tileResolution;
|
||||||
}
|
}
|
||||||
@@ -927,7 +921,6 @@ class PluggableMap extends BaseObject {
|
|||||||
}
|
}
|
||||||
target = target.parentElement;
|
target = target.parentElement;
|
||||||
}
|
}
|
||||||
this.focus_ = mapBrowserEvent.coordinate;
|
|
||||||
mapBrowserEvent.frameState = this.frameState_;
|
mapBrowserEvent.frameState = this.frameState_;
|
||||||
const interactionsArray = this.getInteractions().getArray();
|
const interactionsArray = this.getInteractions().getArray();
|
||||||
if (this.dispatchEvent(mapBrowserEvent) !== false) {
|
if (this.dispatchEvent(mapBrowserEvent) !== false) {
|
||||||
@@ -1229,7 +1222,6 @@ class PluggableMap extends BaseObject {
|
|||||||
coordinateToPixelTransform: this.coordinateToPixelTransform_,
|
coordinateToPixelTransform: this.coordinateToPixelTransform_,
|
||||||
declutterItems: previousFrameState ? previousFrameState.declutterItems : [],
|
declutterItems: previousFrameState ? previousFrameState.declutterItems : [],
|
||||||
extent: getForViewAndSize(viewState.center, viewState.resolution, viewState.rotation, size),
|
extent: getForViewAndSize(viewState.center, viewState.resolution, viewState.rotation, size),
|
||||||
focus: this.focus_ ? this.focus_ : viewState.center,
|
|
||||||
index: this.frameIndex_++,
|
index: this.frameIndex_++,
|
||||||
layerIndex: 0,
|
layerIndex: 0,
|
||||||
layerStatesArray: this.getLayerGroup().getLayerStatesArray(),
|
layerStatesArray: this.getLayerGroup().getLayerStatesArray(),
|
||||||
|
|||||||
@@ -212,7 +212,6 @@ class RasterSource extends ImageSource {
|
|||||||
animate: false,
|
animate: false,
|
||||||
coordinateToPixelTransform: createTransform(),
|
coordinateToPixelTransform: createTransform(),
|
||||||
extent: null,
|
extent: null,
|
||||||
focus: null,
|
|
||||||
index: 0,
|
index: 0,
|
||||||
layerIndex: 0,
|
layerIndex: 0,
|
||||||
layerStatesArray: getLayerStatesArray(this.layers_),
|
layerStatesArray: getLayerStatesArray(this.layers_),
|
||||||
@@ -286,7 +285,6 @@ class RasterSource extends ImageSource {
|
|||||||
const center = getCenter(extent);
|
const center = getCenter(extent);
|
||||||
|
|
||||||
frameState.extent = extent.slice();
|
frameState.extent = extent.slice();
|
||||||
frameState.focus = center;
|
|
||||||
frameState.size[0] = Math.round(getWidth(extent) / resolution);
|
frameState.size[0] = Math.round(getWidth(extent) / resolution);
|
||||||
frameState.size[1] = Math.round(getHeight(extent) / resolution);
|
frameState.size[1] = Math.round(getHeight(extent) / resolution);
|
||||||
frameState.time = Infinity;
|
frameState.time = Infinity;
|
||||||
|
|||||||
Reference in New Issue
Block a user