Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Abort Signal #342

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Abort Signal #342

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/geotiff.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@ export { MultiGeoTIFF };
* @returns {Promise<GeoTIFF>} The resulting GeoTIFF file.
*/
export async function fromUrl(url, options = {}, signal) {
return GeoTIFF.fromSource(makeRemoteSource(url, options), signal);
return GeoTIFF.fromSource(makeRemoteSource(url, options), options, signal);
}

/**
Expand All @@ -693,7 +693,7 @@ export async function fromUrl(url, options = {}, signal) {
* @returns {Promise<GeoTIFF>} The resulting GeoTIFF file.
*/
export async function fromArrayBuffer(arrayBuffer, signal) {
return GeoTIFF.fromSource(makeBufferSource(arrayBuffer), signal);
return GeoTIFF.fromSource(makeBufferSource(arrayBuffer), {} , signal);
}

/**
Expand All @@ -709,7 +709,7 @@ export async function fromArrayBuffer(arrayBuffer, signal) {
* @returns {Promise<GeoTIFF>} The resulting GeoTIFF file.
*/
export async function fromFile(path, signal) {
return GeoTIFF.fromSource(makeFileSource(path), signal);
return GeoTIFF.fromSource(makeFileSource(path), {}, signal);
}

/**
Expand All @@ -723,7 +723,7 @@ export async function fromFile(path, signal) {
* @returns {Promise<GeoTIFF>} The resulting GeoTIFF file.
*/
export async function fromBlob(blob, signal) {
return GeoTIFF.fromSource(makeFileReaderSource(blob), signal);
return GeoTIFF.fromSource(makeFileReaderSource(blob),{}, signal);
}

/**
Expand All @@ -738,16 +738,16 @@ export async function fromBlob(blob, signal) {
* @returns {Promise<MultiGeoTIFF>} The resulting MultiGeoTIFF file.
*/
export async function fromUrls(mainUrl, overviewUrls = [], options = {}, signal) {
const mainFile = await GeoTIFF.fromSource(makeRemoteSource(mainUrl, options), signal);
const mainFile = await GeoTIFF.fromSource(makeRemoteSource(mainUrl), options, signal);
const overviewFiles = await Promise.all(
overviewUrls.map((url) => GeoTIFF.fromSource(makeRemoteSource(url, options))),
overviewUrls.map((url) => GeoTIFF.fromSource(makeRemoteSource(url), options, signal)),
);

return new MultiGeoTIFF(mainFile, overviewFiles);
}

/**
* Main creating function for GeoTIFF files.
* Main creating function for GeoTIFF files.
* @param {(Array)} array of pixel values
* @returns {metadata} metadata
*/
Expand Down