ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updates the option to be called showFullExtent

Browse Source
This commit is contained in:
Jeremy Smith
2020-02-05 16:46:45 +10:00
parent 001cb98990
commit 3082972cce
3 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/ol/resolutionconstraint.js
View File

@@ -16,14 +16,14 @@ import {clamp} from './math.js';
* @param {number} resolution Resolution
* @param {import("./extent.js").Extent=} maxExtent Maximum allowed extent.
* @param {import("./size.js").Size} viewportSize Viewport size.
* @param {boolean} oneAxis Whether we can exceed extent constraint along one axis but not both.
* @param {boolean} showFullExtent Whether to show the full extent.
* @return {number} Capped resolution.
*/
function getViewportClampedResolution(resolution, maxExtent, viewportSize, oneAxis) {
function getViewportClampedResolution(resolution, maxExtent, viewportSize, showFullExtent) {
const xResolution = getWidth(maxExtent) / viewportSize[0];
const yResolution = getHeight(maxExtent) / viewportSize[1];
if (oneAxis) {
if (showFullExtent) {
return Math.min(resolution, Math.max(xResolution, yResolution));
}
return Math.min(resolution, Math.min(xResolution, yResolution));
@@ -57,10 +57,10 @@ function getSmoothClampedResolution(resolution, maxResolution, minResolution) {
* @param {Array<number>} resolutions Resolutions.
* @param {boolean=} opt_smooth If true, the view will be able to slightly exceed resolution limits. Default: true.
* @param {import("./extent.js").Extent=} opt_maxExtent Maximum allowed extent.
* @param {boolean=} opt_oneAxis If true, can exceed extent constraint along one axis but not both. Default: false.
* @param {boolean=} opt_showFullExtent If true, allows us to show the full extent. Default: false.
* @return {Type} Zoom function.
*/
export function createSnapToResolutions(resolutions, opt_smooth, opt_maxExtent, opt_oneAxis) {
export function createSnapToResolutions(resolutions, opt_smooth, opt_maxExtent, opt_showFullExtent) {
return (
/**
* @param {number|undefined} resolution Resolution.
@@ -74,7 +74,7 @@ export function createSnapToResolutions(resolutions, opt_smooth, opt_maxExtent,
const maxResolution = resolutions[0];
const minResolution = resolutions[resolutions.length - 1];
const cappedMaxRes = opt_maxExtent ?
getViewportClampedResolution(maxResolution, opt_maxExtent, size, opt_oneAxis) :
getViewportClampedResolution(maxResolution, opt_maxExtent, size, opt_showFullExtent) :
maxResolution;
// during interacting or animating, allow intermediary values
@@ -106,10 +106,10 @@ export function createSnapToResolutions(resolutions, opt_smooth, opt_maxExtent,
* @param {number=} opt_minResolution Minimum resolution.
* @param {boolean=} opt_smooth If true, the view will be able to slightly exceed resolution limits. Default: true.
* @param {import("./extent.js").Extent=} opt_maxExtent Maximum allowed extent.
* @param {boolean=} opt_oneAxis If true, can exceed extent constraint along one axis but not both. Default: false.
* @param {boolean=} opt_showFullExtent If true, allows us to show the full extent. Default: false.
* @return {Type} Zoom function.
*/
export function createSnapToPower(power, maxResolution, opt_minResolution, opt_smooth, opt_maxExtent, opt_oneAxis) {
export function createSnapToPower(power, maxResolution, opt_minResolution, opt_smooth, opt_maxExtent, opt_showFullExtent) {
return (
/**
* @param {number|undefined} resolution Resolution.
@@ -121,7 +121,7 @@ export function createSnapToPower(power, maxResolution, opt_minResolution, opt_s
function(resolution, direction, size, opt_isMoving) {
if (resolution !== undefined) {
const cappedMaxRes = opt_maxExtent ?
getViewportClampedResolution(maxResolution, opt_maxExtent, size, opt_oneAxis) :
getViewportClampedResolution(maxResolution, opt_maxExtent, size, opt_showFullExtent) :
maxResolution;
const minResolution = opt_minResolution !== undefined ? opt_minResolution : 0;
@@ -155,10 +155,10 @@ export function createSnapToPower(power, maxResolution, opt_minResolution, opt_s
* @param {number} minResolution Min resolution.
* @param {boolean=} opt_smooth If true, the view will be able to slightly exceed resolution limits. Default: true.
* @param {import("./extent.js").Extent=} opt_maxExtent Maximum allowed extent.
* @param {boolean=} opt_oneAxis If true, can exceed extent constraint along one axis but not both. Default: false.
* @param {boolean=} opt_showFullExtent If true, allows us to show the full extent. Default: false.
* @return {Type} Zoom function.
*/
export function createMinMaxResolution(maxResolution, minResolution, opt_smooth, opt_maxExtent, opt_oneAxis) {
export function createMinMaxResolution(maxResolution, minResolution, opt_smooth, opt_maxExtent, opt_showFullExtent) {
return (
/**
* @param {number|undefined} resolution Resolution.
@@ -170,7 +170,7 @@ export function createMinMaxResolution(maxResolution, minResolution, opt_smooth,
function(resolution, direction, size, opt_isMoving) {
if (resolution !== undefined) {
const cappedMaxRes = opt_maxExtent ?
getViewportClampedResolution(maxResolution, opt_maxExtent, size, opt_oneAxis) :
getViewportClampedResolution(maxResolution, opt_maxExtent, size, opt_showFullExtent) :
maxResolution;
const smooth = opt_smooth !== undefined ? opt_smooth : true;