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

Merge pull request #9702 from lutzhelm/typecheck-iiif

Browse Source 
Fix several TypeScript type check problems
This commit is contained in:
Tim Schaub
2019-06-21 07:53:59 -06:00
committed by GitHub
parent ce45a10063 d6dc7a926d
commit 3ede6e32be
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/source/IIIF.js
+8 -4
View File
@@ -23,6 +23,7 @@ import TileImage from './TileImage.js';
* for version 1, 'default' for versions 2 and 3. * for version 1, 'default' for versions 2 and 3.
* @property {number} [reprojectionErrorThreshold=0.5] Maximum allowed reprojection error (in pixels). * @property {number} [reprojectionErrorThreshold=0.5] Maximum allowed reprojection error (in pixels).
* Higher values can increase reprojection performance, but decrease precision. * Higher values can increase reprojection performance, but decrease precision.
* @property {Array<number>} [resolutions] Supported resolutions as given in IIIF 'scaleFactors'
* @property {import("../size.js").Size} size Size of the image [width, height]. * @property {import("../size.js").Size} size Size of the image [width, height].
* @property {import("../size.js").Size[]} [sizes] Supported scaled image sizes. * @property {import("../size.js").Size[]} [sizes] Supported scaled image sizes.
* Content of the IIIF info.json 'sizes' property, but as array of Size objects. * Content of the IIIF info.json 'sizes' property, but as array of Size objects.
@@ -37,7 +38,7 @@ import TileImage from './TileImage.js';
* are supported), the default tilesize is 256. * are supported), the default tilesize is 256.
* @property {number} [transition] * @property {number} [transition]
* @property {string} [url] Base URL of the IIIF Image service. * @property {string} [url] Base URL of the IIIF Image service.
* This should be the same as the IIIF Image @id. * This should be the same as the IIIF Image ID.
* @property {Versions} [version=Versions.VERSION2] Service's IIIF Image API version. * @property {Versions} [version=Versions.VERSION2] Service's IIIF Image API version.
* @property {number} [zDirection] Indicate which resolution should be used * @property {number} [zDirection] Indicate which resolution should be used
* by a renderer if the views resolution does not match any resolution of the tile source. * by a renderer if the views resolution does not match any resolution of the tile source.
@@ -63,6 +64,9 @@ class IIIF extends TileImage {
*/ */
constructor(opt_options) { constructor(opt_options) {
/**
* @type {Partial<Options>} options
*/
const options = opt_options || {}; const options = opt_options || {};
let baseUrl = options.url || ''; let baseUrl = options.url || '';
@@ -83,7 +87,7 @@ class IIIF extends TileImage {
const extent = options.extent || [0, -height, width, 0]; const extent = options.extent || [0, -height, width, 0];
const supportsListedSizes = sizes != undefined && Array.isArray(sizes) && sizes.length > 0; const supportsListedSizes = sizes != undefined && Array.isArray(sizes) && sizes.length > 0;
const supportsListedTiles = tileSize != undefined && (Number.isInteger(tileSize) && tileSize > 0 || Array.isArray(tileSize) && tileSize.length > 0); const supportsListedTiles = tileSize != undefined && (typeof tileSize === 'number' && Number.isInteger(tileSize) && tileSize > 0 || Array.isArray(tileSize) && tileSize.length > 0);
const supportsArbitraryTiling = supports != undefined && Array.isArray(supports) && const supportsArbitraryTiling = supports != undefined && Array.isArray(supports) &&
(supports.includes('regionByPx') || supports.includes('regionByPct')) && (supports.includes('regionByPx') || supports.includes('regionByPct')) &&
(supports.includes('sizeByWh') || supports.includes('sizeByH') || (supports.includes('sizeByWh') || supports.includes('sizeByH') ||
@@ -99,7 +103,7 @@ class IIIF extends TileImage {
if (supportsListedTiles || supportsArbitraryTiling) { if (supportsListedTiles || supportsArbitraryTiling) {
if (tileSize != undefined) { if (tileSize != undefined) {
if (Number.isInteger(tileSize) && tileSize > 0) { if (typeof tileSize === 'number' && Number.isInteger(tileSize) && tileSize > 0) {
tileWidth = tileSize; tileWidth = tileSize;
tileHeight = tileSize; tileHeight = tileSize;
} else if (Array.isArray(tileSize) && tileSize.length > 0) { } else if (Array.isArray(tileSize) && tileSize.length > 0) {
@@ -131,7 +135,7 @@ class IIIF extends TileImage {
resolutions.push(Math.pow(2, i)); resolutions.push(Math.pow(2, i));
} }
} else { } else {
const maxScaleFactor = Math.max([...resolutions]); const maxScaleFactor = Math.max(...resolutions);
// TODO maxScaleFactor might not be a power to 2 // TODO maxScaleFactor might not be a power to 2
maxZoom = Math.round(Math.log(maxScaleFactor) / Math.LN2); maxZoom = Math.round(Math.log(maxScaleFactor) / Math.LN2);
} }