Skip to content
Snippets Groups Projects
Commit 5c6722b6 authored by Glenn Vorhes's avatar Glenn Vorhes
Browse files

fix fit to map

parent b2da183e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
dist/olHelpers/extentUtil.d.ts
+ 6
− 5
View file @ 5c6722b6
import ol from 'custom-ol'; import ol from 'custom-ol';
import { LayerBaseVector } from "../layers/LayerBaseVector";
/** /**
* *
* @param {Array<LayerBaseVector>|Array<ol.layer.Vector>|LayerBaseVector|ol.layer.Vector|*} layers - array of layers or single * @param {Array<LayerBaseVector>|Array<ol.layer.Vector>|LayerBaseVector|ol.layer.Vector|*} layers - array of layers or single
* @returns {ol.Extent|Array<number>|*} - collective extent * @returns {ol.Extent|Array<number>|*} - collective extent
*/ */
export declare function calculateExtent(layers: any): ol.Extent | Array<number> | ol.Extent | number[]; export declare function calculateExtent(layers: ol.layer.Vector[] | LayerBaseVector[]): ol.Extent | Array<number> | ol.Extent | number[];
/** /**
* given one or an array of layers, fit to the map * given one or an array of layers, fit to the map
* @param {Array<LayerBaseVector>|Array<ol.layer.Vector>|LayerBaseVector|ol.layer.Vector} layers - array of layers or single * @param layers - array of layers or single
* @param {ol.Map} mp - the map to fit * @param mp - the map to fit
* @param {number|undefined} [zoomOut=undefined] - levels to zoom out after fit * @param [zoomOut=undefined] - levels to zoom out after fit
*/ */
export declare function fitToMap(layers: any, mp: ol.Map, zoomOut?: number): void; export declare function fitToMap(layers: ol.layer.Vector[] | LayerBaseVector[], mp: ol.Map, zoomOut?: number): void;
dist/olHelpers/extentUtil.js
+ 3
− 10
View file @ 5c6722b6
...@@ -11,9 +11,6 @@ var nm = provide_1.default('util'); ...@@ -11,9 +11,6 @@ var nm = provide_1.default('util');
*/ */
function calculateExtent(layers) { function calculateExtent(layers) {
"use strict"; "use strict";
if (layers.constructor.name != 'Array') {
layers = [layers];
}
var hasExtent = false; var hasExtent = false;
var minX = 10E100; var minX = 10E100;
var minY = 10E100; var minY = 10E100;
...@@ -46,16 +43,12 @@ exports.calculateExtent = calculateExtent; ...@@ -46,16 +43,12 @@ exports.calculateExtent = calculateExtent;
nm.calculateExtent = calculateExtent; nm.calculateExtent = calculateExtent;
/** /**
* given one or an array of layers, fit to the map * given one or an array of layers, fit to the map
* @param {Array<LayerBaseVector>|Array<ol.layer.Vector>|LayerBaseVector|ol.layer.Vector} layers - array of layers or single * @param layers - array of layers or single
* @param {ol.Map} mp - the map to fit * @param mp - the map to fit
* @param {number|undefined} [zoomOut=undefined] - levels to zoom out after fit * @param [zoomOut=undefined] - levels to zoom out after fit
*/ */
function fitToMap(layers, mp, zoomOut) { function fitToMap(layers, mp, zoomOut) {
"use strict"; "use strict";
/**
*
* @type {ol.Extent|undefined}
*/
var ext = calculateExtent(layers); var ext = calculateExtent(layers);
if (typeof ext == 'undefined') { if (typeof ext == 'undefined') {
return; return;
......
dist/olHelpers/extentUtil.js.map
+ 1
− 1
View file @ 5c6722b6
{"version":3,"file":"extentUtil.js","sourceRoot":"","sources":["../../src/olHelpers/extentUtil.ts"],"names":[],"mappings":";AAAA;;GAEG;AACH,wBAAoB,iBAAiB,CAAC,CAAA;AAItC,IAAM,EAAE,GAAG,iBAAO,CAAC,MAAM,CAAC,CAAC;AAE3B;;;;GAIG;AACH,yBAAgC,MAAM;IAClC,YAAY,CAAC;IAEb,EAAE,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,IAAI,OAAO,CAAC,CAAA,CAAC;QACpC,MAAM,GAAG,CAAC,MAAM,CAAC,CAAC;IACtB,CAAC;IAED,IAAI,SAAS,GAAG,KAAK,CAAC;IAEtB,IAAI,IAAI,GAAG,MAAM,CAAC;IAClB,IAAI,IAAI,GAAG,MAAM,CAAC;IAClB,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC;IACnB,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC;IAEnB,GAAG,CAAC,CAAY,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM,CAAC;QAAlB,IAAI,GAAG,eAAA;QAER;;;WAGG;QACH,IAAI,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC;QAGpC,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,WAAW,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;YAC/C,SAAS,GAAG,IAAI,CAAC;YACjB,IAAI,GAAG,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,SAAS,EAAE,CAAC;YAC1C,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;YACrC,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;YACrC,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;YACrC,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;QACzC,CAAC;KACJ;IAED,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;QACZ,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACpC,CAAC;IAAC,IAAI,CAAC,CAAC;QACJ,MAAM,CAAC,SAAS,CAAC;IACrB,CAAC;AACL,CAAC;AAtCe,uBAAe,kBAsC9B,CAAA;AAED,EAAE,CAAC,eAAe,GAAG,eAAe,CAAC;AAGrC;;;;;GAKG;AACH,kBAAyB,MAAM,EAAE,EAAU,EAAE,OAAgB;IACzD,YAAY,CAAC;IAEb;;;OAGG;IACH,IAAI,GAAG,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IAElC,EAAE,CAAC,CAAC,OAAO,GAAG,IAAI,WAAW,CAAC,CAAA,CAAC;QAC3B,MAAM,CAAC;IACX,CAAC;IAED,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,GAAgB,EAAE,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;IAEjD,EAAE,CAAC,CAAC,OAAO,OAAO,IAAI,QAAQ,CAAC,CAAA,CAAC;QAC5B,EAAE,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC;IAC3D,CAAC;AAEL,CAAC;AAnBe,gBAAQ,WAmBvB,CAAA;AAED,EAAE,CAAC,eAAe,GAAG,eAAe,CAAC"} {"version":3,"file":"extentUtil.js","sourceRoot":"","sources":["../../src/olHelpers/extentUtil.ts"],"names":[],"mappings":";AAAA;;GAEG;AACH,wBAAoB,iBAAiB,CAAC,CAAA;AAKtC,IAAM,EAAE,GAAG,iBAAO,CAAC,MAAM,CAAC,CAAC;AAE3B;;;;GAIG;AACH,yBAAgC,MAA2C;IACvE,YAAY,CAAC;IAEb,IAAI,SAAS,GAAG,KAAK,CAAC;IAEtB,IAAI,IAAI,GAAG,MAAM,CAAC;IAClB,IAAI,IAAI,GAAG,MAAM,CAAC;IAClB,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC;IACnB,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC;IAEnB,GAAG,CAAC,CAAY,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM,CAAC;QAAlB,IAAI,GAAG,eAAA;QAER;;;WAGG;QACH,IAAI,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC;QAGpC,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,WAAW,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;YAC/C,SAAS,GAAG,IAAI,CAAC;YACjB,IAAI,GAAG,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,SAAS,EAAE,CAAC;YAC1C,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;YACrC,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;YACrC,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;YACrC,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;QACzC,CAAC;KACJ;IAED,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;QACZ,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACpC,CAAC;IAAC,IAAI,CAAC,CAAC;QACJ,MAAM,CAAC,SAAS,CAAC;IACrB,CAAC;AACL,CAAC;AAlCe,uBAAe,kBAkC9B,CAAA;AAED,EAAE,CAAC,eAAe,GAAG,eAAe,CAAC;AAGrC;;;;;GAKG;AACH,kBAAyB,MAA2C,EAAE,EAAU,EAAE,OAAgB;IAC9F,YAAY,CAAC;IAEb,IAAI,GAAG,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IAElC,EAAE,CAAC,CAAC,OAAO,GAAG,IAAI,WAAW,CAAC,CAAA,CAAC;QAC3B,MAAM,CAAC;IACX,CAAC;IAED,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,GAAgB,EAAE,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;IAEjD,EAAE,CAAC,CAAC,OAAO,OAAO,IAAI,QAAQ,CAAC,CAAA,CAAC;QAC5B,EAAE,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC;IAC3D,CAAC;AACL,CAAC;AAde,gBAAQ,WAcvB,CAAA;AAED,EAAE,CAAC,eAAe,GAAG,eAAe,CAAC"}
\ No newline at end of file \ No newline at end of file
src/olHelpers/extentUtil.ts
+ 6
− 14
View file @ 5c6722b6
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
*/ */
import provide from '../util/provide'; import provide from '../util/provide';
import ol from 'custom-ol'; import ol from 'custom-ol';
import {LayerBaseVector} from "../layers/LayerBaseVector";
const nm = provide('util'); const nm = provide('util');
...@@ -12,13 +13,9 @@ const nm = provide('util'); ...@@ -12,13 +13,9 @@ const nm = provide('util');
* @param {Array<LayerBaseVector>|Array<ol.layer.Vector>|LayerBaseVector|ol.layer.Vector|*} layers - array of layers or single * @param {Array<LayerBaseVector>|Array<ol.layer.Vector>|LayerBaseVector|ol.layer.Vector|*} layers - array of layers or single
* @returns {ol.Extent|Array<number>|*} - collective extent * @returns {ol.Extent|Array<number>|*} - collective extent
*/ */
export function calculateExtent(layers): ol.Extent|Array<number>| ol.Extent| number[] { export function calculateExtent(layers: ol.layer.Vector[]|LayerBaseVector[]): ol.Extent|Array<number>| ol.Extent| number[] {
"use strict"; "use strict";
if (layers.constructor.name != 'Array'){
layers = [layers];
}
let hasExtent = false; let hasExtent = false;
let minX = 10E100; let minX = 10E100;
...@@ -57,17 +54,13 @@ nm.calculateExtent = calculateExtent; ...@@ -57,17 +54,13 @@ nm.calculateExtent = calculateExtent;
/** /**
* given one or an array of layers, fit to the map * given one or an array of layers, fit to the map
* @param {Array<LayerBaseVector>|Array<ol.layer.Vector>|LayerBaseVector|ol.layer.Vector} layers - array of layers or single * @param layers - array of layers or single
* @param {ol.Map} mp - the map to fit * @param mp - the map to fit
* @param {number|undefined} [zoomOut=undefined] - levels to zoom out after fit * @param [zoomOut=undefined] - levels to zoom out after fit
*/ */
export function fitToMap(layers, mp: ol.Map, zoomOut?: number){ export function fitToMap(layers: ol.layer.Vector[]|LayerBaseVector[], mp: ol.Map, zoomOut?: number){
"use strict"; "use strict";
/**
*
* @type {ol.Extent|undefined}
*/
let ext = calculateExtent(layers); let ext = calculateExtent(layers);
if (typeof ext == 'undefined'){ if (typeof ext == 'undefined'){
...@@ -79,7 +72,6 @@ export function fitToMap(layers, mp: ol.Map, zoomOut?: number){ ...@@ -79,7 +72,6 @@ export function fitToMap(layers, mp: ol.Map, zoomOut?: number){
if (typeof zoomOut == 'number'){ if (typeof zoomOut == 'number'){
mp.getView().setZoom(mp.getView().getZoom() - zoomOut); mp.getView().setZoom(mp.getView().getZoom() - zoomOut);
} }
} }
nm.calculateExtent = calculateExtent; nm.calculateExtent = calculateExtent;
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment