@here/olp-sdk-dataservice-read 2.0.0 → 3.1.0

package/lib/client/VolatileLayerClient.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- * Copyright (C) 2019-2021 HERE Europe B.V.
+ * Copyright (C) 2019-2026 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,31 +17,39 @@
  * SPDX-License-Identifier: Apache-2.0
  * License-Filename: LICENSE
  */
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VolatileLayerClient = void 0;
 const olp_sdk_core_1 = require("@here/olp-sdk-core");
 const olp_sdk_dataservice_api_1 = require("@here/olp-sdk-dataservice-api");
-const olp_sdk_dataservice_read_1 = require("@here/olp-sdk-dataservice-read");
+const MetadataCacheRepository_1 = require("../cache/MetadataCacheRepository");
+const getTile_1 = require("../utils/getTile");
+const PartitionsRequest_1 = require("./PartitionsRequest");
+const QuadKeyPartitionsRequest_1 = require("./QuadKeyPartitionsRequest");
+const QuadTreeIndexRequest_1 = require("./QuadTreeIndexRequest");
+const QueryClient_1 = require("./QueryClient");
 /**
  * Describes a voaltile layer and provides the possibility to get partitions metadata and data.
  */
 class VolatileLayerClient {
+    apiVersion = "v1";
+    /**
+     * HRN of the catalog.
+     */
+    hrn;
+    /**
+     * The ID of the layer.
+     */
+    layerId;
+    /**
+     * The [[OlpClientSettings]] instance.
+     */
+    settings;
     /**
      * Creates the [[VolatileLayerClient]] instance with VolatileLayerClientParams.
      *
      * @param params parameters for use to initialize VolatileLayerClient.
      */
     constructor(params) {
-        this.apiVersion = "v1";
         this.hrn = params.catalogHrn.toString();
         this.layerId = params.layerId;
         this.settings = params.settings;
@@ -59,16 +67,14 @@ class VolatileLayerClient {
      *
      * @return Tile data (if it exists) or the nearest parent tile data
      */
-    getAggregatedData(request, abortSignal) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const params = {
-                catalogHrn: olp_sdk_core_1.HRN.fromString(this.hrn),
-                layerId: this.layerId,
-                layerType: "volatile",
-                settings: this.settings
-            };
-            return olp_sdk_dataservice_read_1.getTile(request, params, abortSignal);
-        });
+    async getAggregatedData(request, abortSignal) {
+        const params = {
+            catalogHrn: olp_sdk_core_1.HRN.fromString(this.hrn),
+            layerId: this.layerId,
+            layerType: "volatile",
+            settings: this.settings
+        };
+        return (0, getTile_1.getTile)(request, params, abortSignal);
     }
     /**
      * Fetches partition data using one of the following methods: ID, quadkey, or data handle.
@@ -81,79 +87,73 @@ class VolatileLayerClient {
      *
      * @return The data from the requested partition.
      */
-    getData(dataRequest, abortSignal) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const dataHandle = dataRequest.getDataHandle();
-            const partitionId = dataRequest.getPartitionId();
-            if (dataHandle !== undefined || partitionId !== undefined) {
-                if (dataHandle) {
-                    return this.downloadPartition(dataHandle, abortSignal, dataRequest.getBillingTag());
-                }
-                if (partitionId) {
-                    const partitionIdDataHandle = yield this.getDataHandleByPartitionId(partitionId, dataRequest.getFetchOption(), dataRequest.getBillingTag()).catch(error => Promise.reject(error));
-                    return this.downloadPartition(partitionIdDataHandle, abortSignal, dataRequest.getBillingTag());
-                }
+    async getData(dataRequest, abortSignal) {
+        const dataHandle = dataRequest.getDataHandle();
+        const partitionId = dataRequest.getPartitionId();
+        if (dataHandle !== undefined || partitionId !== undefined) {
+            if (dataHandle) {
+                return this.downloadPartition(dataHandle, abortSignal, dataRequest.getBillingTag());
             }
-            return Promise.reject(new Error(`No data provided. Add dataHandle, partitionId or quadKey to the DataRequest object`));
-        });
-    }
-    getPartitions(request, abortSignal) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (request instanceof olp_sdk_dataservice_read_1.QuadKeyPartitionsRequest) {
-                const quadKey = request.getQuadKey();
-                if (!quadKey) {
-                    return Promise.reject(new Error("Please provide correct QuadKey"));
-                }
-                const queryClient = new olp_sdk_dataservice_read_1.QueryClient(this.settings);
-                const quadTreeIndexRequest = new olp_sdk_dataservice_read_1.QuadTreeIndexRequest(olp_sdk_core_1.HRN.fromString(this.hrn), this.layerId, "volatile")
-                    .withQuadKey(quadKey)
-                    .withDepth(request.getDepth())
-                    .withAdditionalFields(request.getAdditionalFields());
-                return queryClient.fetchQuadTreeIndex(quadTreeIndexRequest, abortSignal);
+            if (partitionId) {
+                const partitionIdDataHandle = await this.getDataHandleByPartitionId(partitionId, dataRequest.getFetchOption(), dataRequest.getBillingTag());
+                return this.downloadPartition(partitionIdDataHandle, abortSignal, dataRequest.getBillingTag());
             }
-            if (request.getPartitionIds()) {
-                const queryClient = new olp_sdk_dataservice_read_1.QueryClient(this.settings);
-                return queryClient.getPartitionsById(request, this.layerId, olp_sdk_core_1.HRN.fromString(this.hrn), abortSignal);
+        }
+        return Promise.reject(new Error(`No data provided. Add dataHandle, partitionId or quadKey to the DataRequest object`));
+    }
+    async getPartitions(request, abortSignal) {
+        if (request instanceof QuadKeyPartitionsRequest_1.QuadKeyPartitionsRequest) {
+            const quadKey = request.getQuadKey();
+            if (!quadKey) {
+                return Promise.reject(new Error("Please provide correct QuadKey"));
             }
-            const cache = new olp_sdk_dataservice_read_1.MetadataCacheRepository(this.settings.cache);
-            if (request.getFetchOption() !== olp_sdk_core_1.FetchOptions.OnlineOnly) {
-                const partitions = cache.get(request, this.hrn.toString(), this.layerId);
-                if (partitions) {
-                    const additionalFields = request.getAdditionalFields();
-                    let existFields;
-                    if (additionalFields) {
-                        existFields = additionalFields.filter((field) => {
-                            return partitions.every(partition => partition[field] !== undefined);
-                        });
-                    }
-                    if (!additionalFields ||
-                        !existFields ||
-                        additionalFields.length === existFields.length) {
-                        return Promise.resolve({ partitions });
-                    }
+            const queryClient = new QueryClient_1.QueryClient(this.settings);
+            const quadTreeIndexRequest = new QuadTreeIndexRequest_1.QuadTreeIndexRequest(olp_sdk_core_1.HRN.fromString(this.hrn), this.layerId, "volatile")
+                .withQuadKey(quadKey)
+                .withDepth(request.getDepth())
+                .withAdditionalFields(request.getAdditionalFields());
+            return queryClient.fetchQuadTreeIndex(quadTreeIndexRequest, abortSignal);
+        }
+        if (request.getPartitionIds()) {
+            const queryClient = new QueryClient_1.QueryClient(this.settings);
+            return queryClient.getPartitionsById(request, this.layerId, olp_sdk_core_1.HRN.fromString(this.hrn), abortSignal);
+        }
+        const cache = new MetadataCacheRepository_1.MetadataCacheRepository(this.settings.cache);
+        if (request.getFetchOption() !== olp_sdk_core_1.FetchOptions.OnlineOnly) {
+            const partitions = cache.get(request, this.hrn.toString(), this.layerId);
+            if (partitions) {
+                const additionalFields = request.getAdditionalFields();
+                let existFields;
+                if (additionalFields) {
+                    existFields = additionalFields.filter((field) => {
+                        return partitions.every((partition) => partition[field] !== undefined);
+                    });
+                }
+                if (!additionalFields ||
+                    !existFields ||
+                    additionalFields.length === existFields.length) {
+                    return Promise.resolve({ partitions });
                 }
             }
-            const metaRequestBilder = yield this.getRequestBuilder("metadata", olp_sdk_core_1.HRN.fromString(this.hrn)).catch(error => Promise.reject(error));
-            const metadata = yield olp_sdk_dataservice_api_1.MetadataApi.getPartitions(metaRequestBilder, {
-                layerId: this.layerId,
-                additionalFields: request.getAdditionalFields(),
-                billingTag: request.getBillingTag()
-            }).catch(error => Promise.reject(error));
-            if (request.getFetchOption() !== olp_sdk_core_1.FetchOptions.OnlineOnly &&
-                metadata.partitions.length) {
-                cache.put(request, this.hrn.toString(), this.layerId, metadata.partitions);
-            }
-            return Promise.resolve(metadata);
+        }
+        const metaRequestBilder = await this.getRequestBuilder("metadata", olp_sdk_core_1.HRN.fromString(this.hrn));
+        const metadata = await olp_sdk_dataservice_api_1.MetadataApi.getPartitions(metaRequestBilder, {
+            layerId: this.layerId,
+            additionalFields: request.getAdditionalFields(),
+            billingTag: request.getBillingTag()
         });
+        if (request.getFetchOption() !== olp_sdk_core_1.FetchOptions.OnlineOnly &&
+            metadata.partitions.length) {
+            cache.put(request, this.hrn.toString(), this.layerId, metadata.partitions);
+        }
+        return Promise.resolve(metadata);
     }
-    downloadPartition(dataHandle, abortSignal, billingTag) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const builder = yield this.getRequestBuilder("volatile-blob", olp_sdk_core_1.HRN.fromString(this.hrn), abortSignal).catch(error => Promise.reject(error));
-            return olp_sdk_dataservice_api_1.VolatileBlobApi.getVolatileBlob(builder, {
-                dataHandle,
-                layerId: this.layerId,
-                billingTag
-            });
+    async downloadPartition(dataHandle, abortSignal, billingTag) {
+        const builder = await this.getRequestBuilder("volatile-blob", olp_sdk_core_1.HRN.fromString(this.hrn), abortSignal);
+        return olp_sdk_dataservice_api_1.VolatileBlobApi.getVolatileBlob(builder, {
+            dataHandle,
+            layerId: this.layerId,
+            billingTag
         });
     }
     /**
@@ -162,10 +162,8 @@ class VolatileLayerClient {
      *
      * @returns requestBuilder
      */
-    getRequestBuilder(builderType, hrn, abortSignal) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return olp_sdk_core_1.RequestFactory.create(builderType, this.apiVersion, this.settings, hrn, abortSignal);
-        });
+    async getRequestBuilder(builderType, hrn, abortSignal) {
+        return olp_sdk_core_1.RequestFactory.create(builderType, this.apiVersion, this.settings, hrn, abortSignal);
     }
     /**
      * Fetch and returns partition metadata
@@ -173,22 +171,20 @@ class VolatileLayerClient {
      * @param fetchOption The option of caching (online only or return from cache if exist)
      * @returns A promise of partition metadata which used to get partition data
      */
-    getDataHandleByPartitionId(partitionId, fetchOption, billingTag) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const queryClient = new olp_sdk_dataservice_read_1.QueryClient(this.settings);
-            const partitionsRequest = new olp_sdk_dataservice_read_1.PartitionsRequest()
-                .withPartitionIds([partitionId])
-                .withFetchOption(fetchOption);
-            if (billingTag) {
-                partitionsRequest.withBillingTag(billingTag);
-            }
-            const metadata = yield queryClient.getPartitionsById(partitionsRequest, this.layerId, olp_sdk_core_1.HRN.fromString(this.hrn));
-            return metadata.partitions &&
-                metadata.partitions[0] &&
-                metadata.partitions[0].dataHandle
-                ? metadata.partitions[0].dataHandle
-                : Promise.reject(new olp_sdk_core_1.HttpError(olp_sdk_core_1.STATUS_CODES.NOT_FOUND, `No partition dataHandle for partition ${partitionId}. HRN: ${this.hrn}`));
-        });
+    async getDataHandleByPartitionId(partitionId, fetchOption, billingTag) {
+        const queryClient = new QueryClient_1.QueryClient(this.settings);
+        const partitionsRequest = new PartitionsRequest_1.PartitionsRequest()
+            .withPartitionIds([partitionId])
+            .withFetchOption(fetchOption);
+        if (billingTag) {
+            partitionsRequest.withBillingTag(billingTag);
+        }
+        const metadata = await queryClient.getPartitionsById(partitionsRequest, this.layerId, olp_sdk_core_1.HRN.fromString(this.hrn));
+        return metadata.partitions &&
+            metadata.partitions[0] &&
+            metadata.partitions[0].dataHandle
+            ? metadata.partitions[0].dataHandle
+            : Promise.reject(new olp_sdk_core_1.HttpError(olp_sdk_core_1.STATUS_CODES.NOT_FOUND, `No partition dataHandle for partition ${partitionId}. HRN: ${this.hrn}`));
     }
 }
 exports.VolatileLayerClient = VolatileLayerClient;

package/lib/client/index.js

@@ -19,7 +19,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/index.js

@@ -19,7 +19,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/utils/getTile.d.ts

@@ -1,6 +1,7 @@
 import { FetchOptions, HRN, TileKey, OlpClientSettings } from "@here/olp-sdk-core";
 import { Index as QuadTreeIndex } from "@here/olp-sdk-dataservice-api/lib/query-api";
-import { QuadTreeIndexDepth, TileRequest, TileRequestParams } from "@here/olp-sdk-dataservice-read";
+import { QuadTreeIndexDepth } from "../client/QuadTreeIndexRequest";
+import { TileRequest, TileRequestParams } from "../client/TileRequest";
 /**
  * Parameters used to get a tile.
  */
@@ -10,6 +11,10 @@ export interface GetTileParams {
     layerId: string;
     layerType: "versioned" | "volatile";
 }
+export interface TileResponse {
+    response: Response;
+    parentTileKey: TileKey | undefined;
+}
 /**
  * Fetches asynchronously data from a tile or from its nearest ancestor if not found.
  *
@@ -45,6 +50,37 @@ export interface GetTileParams {
  * @returns The blob of the requested tile or the blob of the closest parent Tile.
  */
 export declare function getTile(request: TileRequest, params: TileRequestParams, abortSignal?: AbortSignal): Promise<Response>;
+/**
+ * Same as the three-argument [[getTile]], but also resolves the tile key of
+ * the parent whose data was actually returned.
+ *
+ * @param options Pass `{ includeTileKey: true }` to receive a [[TileResponse]]
+ * instead of a plain `Response`.
+ *
+ * @returns The blob of the requested tile or the blob of the closest parent
+ * tile, together with that tile's key.
+ */
+export declare function getTile(request: TileRequest, params: TileRequestParams, abortSignal: AbortSignal | undefined, options: {
+    includeTileKey: true;
+}): Promise<TileResponse>;
+/**
+ * Same as the three-argument [[getTile]], for callers that pass an options
+ * object with `includeTileKey` disabled or omitted.
+ *
+ * @returns The blob of the requested tile or the blob of the closest parent Tile.
+ */
+export declare function getTile(request: TileRequest, params: TileRequestParams, abortSignal: AbortSignal | undefined, options: {
+    includeTileKey?: false;
+}): Promise<Response>;
+/**
+ * Same as the three-argument [[getTile]], for an `includeTileKey` flag whose
+ * value is only known at run time. Narrow the result before using it.
+ *
+ * @returns A [[TileResponse]] if the flag was `true`, otherwise the plain blob.
+ */
+export declare function getTile(request: TileRequest, params: TileRequestParams, abortSignal: AbortSignal | undefined, options: {
+    includeTileKey?: boolean;
+}): Promise<Response | TileResponse>;
 /**
  * The function should request quad tree index for the parent tile with delta 4
  * and cache the responses in cache for later calls.

package/lib/utils/getTile.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- * Copyright (C) 2020-2021 HERE Europe B.V.
+ * Copyright (C) 2020-2026 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,150 +17,139 @@
  * SPDX-License-Identifier: Apache-2.0
  * License-Filename: LICENSE
  */
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchQuadTreeIndex = exports.getTile = void 0;
+exports.getTile = getTile;
+exports.fetchQuadTreeIndex = fetchQuadTreeIndex;
 const olp_sdk_core_1 = require("@here/olp-sdk-core");
 const olp_sdk_dataservice_api_1 = require("@here/olp-sdk-dataservice-api");
-const olp_sdk_dataservice_read_1 = require("@here/olp-sdk-dataservice-read");
+const QuadTreeIndexCacheRepository_1 = require("../cache/QuadTreeIndexCacheRepository");
+const QuadTreeIndexRequest_1 = require("../client/QuadTreeIndexRequest");
+const QueryClient_1 = require("../client/QueryClient");
+async function getTile(request, params, abortSignal, options) {
+    const tileResponse = await fetchTile(request, params, abortSignal);
+    return options?.includeTileKey ? tileResponse : tileResponse.response;
+}
 /**
- * Fetches asynchronously data from a tile or from its nearest ancestor if not found.
- *
- * The tile is a geometric area represented as a HERE tile.
- * The quad tree metadata fetches the blob of needed tile from the HERE Query Service,
- * then caches it, and returns to the user.
- * To disable caching of metadata use `request.withFetchOption(FetchOptions.OnlineOnly)`.
- *
- * @param request Requests the [[TileRequest]] instance with the configured parameters.
- * @see [[TileRequest]]
- *
- * @param abortSignal The signal object that allows you to communicate with a request (such as the `fetch` request)
- * and, if required, abort it using the `AbortController` object.
- * @see the [`AbortController` documentation](https://developer.mozilla.org/en-US/docs/Web/API/AbortController).
- *
- * @example
- *
- * ```
- *  const params: GetTileParams = {
- *       settings: "% your `OlpClientSettings` instance % ",
- *       catalogHrn: "% the HRN instance of your catalog %",
- *       layerId: "% your layer ID %",
- *       layerType: "% versioned or volatile %",
- *   }
- *
- *  const request = new TileRequest();
- *
- *  const tile1 = await getTile(request.withTileKey(yourTileKey1), params);
- *  const tile2 = await getTile(request.withTileKey(yourTileKey2), params);
- *
- * ```
- *
- * @returns The blob of the requested tile or the blob of the closest parent Tile.
+ * @hidden
  */
-function getTile(request, params, abortSignal) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let catalogVersion;
-        const quadKey = request.getTileKey();
-        if (!quadKey) {
-            return Promise.reject(new Error("Please provide correct QuadKey"));
-        }
-        if (params.layerType === "versioned") {
-            catalogVersion = params.catalogVersion;
-        }
-        const blobType = params.layerType === "versioned" ? "blob" : "volatile-blob";
-        const blobRequestBuilder = yield olp_sdk_core_1.RequestFactory.create(blobType, "v1", params.settings, params.catalogHrn, abortSignal).catch(error => Promise.reject(error));
-        const delta = 4;
-        const requestedTileKey = olp_sdk_core_1.TileKey.fromRowColumnLevel(quadKey.row, quadKey.column, quadKey.level);
-        let quadTreeIndex = null;
-        if (request.getFetchOption() !== olp_sdk_core_1.FetchOptions.OnlineOnly) {
-            const cache = new olp_sdk_dataservice_read_1.QuadTreeIndexCacheRepository(params.settings.cache);
-            for (let i = 1; i <= delta; i++) {
-                const parentInCache = requestedTileKey.changedLevelBy(-i);
-                const cachedTree = cache.get({
-                    hrn: params.catalogHrn.toString(),
-                    layerId: params.layerId,
-                    depth: delta,
-                    root: parentInCache,
-                    version: catalogVersion
-                });
-                if (cachedTree) {
-                    quadTreeIndex = cachedTree;
-                }
-            }
-        }
-        const parentTileKey = requestedTileKey.changedLevelBy(-delta);
-        if (!quadTreeIndex) {
-            quadTreeIndex = yield fetchQuadTreeIndex(Object.assign(Object.assign({}, params), { catalogVersion, depth: delta, fetchOptions: request.getFetchOption(), tileKey: parentTileKey, abortSignal, billingTag: request.getBillingTag() })).catch(e => Promise.reject(e));
-        }
-        if (!quadTreeIndex.subQuads || !quadTreeIndex.subQuads.length) {
-            return Promise.resolve(new Response(null, {
+async function fetchTile(request, params, abortSignal) {
+    let catalogVersion;
+    const quadKey = request.getTileKey();
+    if (!quadKey) {
+        return Promise.reject(new Error("Please provide correct QuadKey"));
+    }
+    if (params.layerType === "versioned") {
+        catalogVersion = params.catalogVersion;
+    }
+    const blobType = params.layerType === "versioned" ? "blob" : "volatile-blob";
+    const blobRequestBuilder = await olp_sdk_core_1.RequestFactory.create(blobType, "v1", params.settings, params.catalogHrn, abortSignal);
+    const depth = 4;
+    const requestedTileKey = olp_sdk_core_1.TileKey.fromRowColumnLevel(quadKey.row, quadKey.column, quadKey.level);
+    const quadTreeIndexRoot = requestedTileKey.changedLevelBy(-depth);
+    let quadTreeIndex;
+    if (request.getFetchOption() !== olp_sdk_core_1.FetchOptions.OnlineOnly) {
+        const cache = new QuadTreeIndexCacheRepository_1.QuadTreeIndexCacheRepository(params.settings.cache);
+        quadTreeIndex = cache.get({
+            hrn: params.catalogHrn.toString(),
+            layerId: params.layerId,
+            depth,
+            root: quadTreeIndexRoot,
+            version: catalogVersion
+        });
+    }
+    if (!quadTreeIndex) {
+        quadTreeIndex = await fetchQuadTreeIndex({
+            ...params,
+            catalogVersion,
+            depth,
+            fetchOptions: request.getFetchOption(),
+            tileKey: quadTreeIndexRoot,
+            abortSignal,
+            billingTag: request.getBillingTag()
+        });
+    }
+    const subQuads = quadTreeIndex.subQuads ?? [];
+    const parentQuads = quadTreeIndex.parentQuads ?? [];
+    if (!subQuads.length && !parentQuads.length) {
+        return Promise.resolve({
+            response: new Response(null, {
                 status: 204,
                 statusText: "No Content"
-            }));
+            }),
+            parentTileKey: undefined
+        });
+    }
+    const closestParent = findClosestParent(requestedTileKey, quadTreeIndex, quadTreeIndexRoot);
+    if (!closestParent) {
+        return Promise.reject(new Error(`Error getting blob for Tile: ${requestedTileKey.toHereTile()}`));
+    }
+    return {
+        response: await olp_sdk_dataservice_api_1.BlobApi.getBlob(blobRequestBuilder, {
+            dataHandle: closestParent.parentQuad.dataHandle,
+            layerId: params.layerId,
+            billingTag: request.getBillingTag()
+        }),
+        parentTileKey: closestParent.tileKey
+    };
+}
+/**
+ * Helper function to get the closest parent quad for a given tile key.
+ * @hidden
+ */
+function findClosestParent(tileKey, quadTreeIndex, quadTreeIndexRoot) {
+    const subQuads = quadTreeIndex.subQuads ?? [];
+    const parentQuads = quadTreeIndex.parentQuads ?? [];
+    // First, iterate through the sub quad trees, starting from lowest level up to the quad tree index root
+    let currentTileKey = tileKey;
+    while (currentTileKey.level >= quadTreeIndexRoot.level) {
+        const currentDelta = currentTileKey.level - quadTreeIndexRoot.level;
+        const subHereTile = currentTileKey.getSubHereTile(currentDelta);
+        const subQuad = subQuads.find((item) => item.subQuadKey === subHereTile);
+        if (subQuad) {
+            return { parentQuad: subQuad, tileKey: currentTileKey };
         }
-        // Return the data for the requested QuadKey or for the closest parent
-        const subQuads = quadTreeIndex.subQuads;
-        let currentTileKey = requestedTileKey;
-        let currentDelta = delta;
-        for (let level = currentTileKey.level; level >= parentTileKey.level; --level) {
-            const metadata = subQuads.find(item => item.subQuadKey === currentTileKey.getSubHereTile(currentDelta));
-            if (metadata) {
-                return olp_sdk_dataservice_api_1.BlobApi.getBlob(blobRequestBuilder, {
-                    dataHandle: metadata.dataHandle,
-                    layerId: params.layerId,
-                    billingTag: request.getBillingTag()
-                });
-            }
-            try {
-                currentTileKey = currentTileKey.parent();
-                currentDelta = parentTileKey.level - currentTileKey.level;
-            }
-            catch (error) {
-                continue;
-            }
+        // Stop before requesting the parent of the quad tree index root -
+        // that root can be the global root tile (level 0), whose parent()
+        // throws rather than returning another tile.
+        if (currentTileKey.level === quadTreeIndexRoot.level) {
+            break;
         }
-        return Promise.reject(new Error(`Error getting blob for Tile: ${JSON.stringify(quadKey)}`));
-    });
+        currentTileKey = currentTileKey.parent();
+    }
+    // not found? Find the closest parent quad
+    return parentQuads.reduce((closest, parentQuad) => {
+        const tileKey = olp_sdk_core_1.TileKey.fromHereTile(parentQuad.partition);
+        return !closest || tileKey.level > closest.tileKey.level
+            ? { parentQuad, tileKey }
+            : closest;
+    }, undefined);
 }
-exports.getTile = getTile;
 /**
  * The function should request quad tree index for the parent tile with delta 4
  * and cache the responses in cache for later calls.
  * @hidden
  */
-function fetchQuadTreeIndex(params) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const cache = new olp_sdk_dataservice_read_1.QuadTreeIndexCacheRepository(params.settings.cache);
-        const queryClient = new olp_sdk_dataservice_read_1.QueryClient(params.settings);
-        const quadTreeIndexRequest = new olp_sdk_dataservice_read_1.QuadTreeIndexRequest(params.catalogHrn, params.layerId, params.layerType)
-            .withQuadKey(params.tileKey)
-            .withDepth(params.depth);
-        if (params.layerType === "versioned") {
-            quadTreeIndexRequest.withVersion(params.catalogVersion);
-        }
-        const quadTreeIndex = yield queryClient
-            .fetchQuadTreeIndex(quadTreeIndexRequest, params.abortSignal)
-            .catch(err => Promise.reject(err));
-        if (params.fetchOptions !== olp_sdk_core_1.FetchOptions.OnlineOnly &&
-            quadTreeIndex.subQuads) {
-            cache.put({
-                hrn: params.catalogHrn.toString(),
-                layerId: params.layerId,
-                depth: params.depth,
-                root: params.tileKey,
-                tree: quadTreeIndex,
-                version: params.catalogVersion
-            });
-        }
-        return Promise.resolve(quadTreeIndex);
-    });
+async function fetchQuadTreeIndex(params) {
+    const cache = new QuadTreeIndexCacheRepository_1.QuadTreeIndexCacheRepository(params.settings.cache);
+    const queryClient = new QueryClient_1.QueryClient(params.settings);
+    const quadTreeIndexRequest = new QuadTreeIndexRequest_1.QuadTreeIndexRequest(params.catalogHrn, params.layerId, params.layerType)
+        .withQuadKey(params.tileKey)
+        .withDepth(params.depth);
+    if (params.layerType === "versioned") {
+        quadTreeIndexRequest.withVersion(params.catalogVersion);
+    }
+    const quadTreeIndex = await queryClient.fetchQuadTreeIndex(quadTreeIndexRequest, params.abortSignal);
+    if (params.fetchOptions !== olp_sdk_core_1.FetchOptions.OnlineOnly &&
+        (quadTreeIndex.subQuads !== undefined ||
+            quadTreeIndex.parentQuads !== undefined)) {
+        cache.put({
+            hrn: params.catalogHrn.toString(),
+            layerId: params.layerId,
+            depth: params.depth,
+            root: params.tileKey,
+            tree: quadTreeIndex,
+            version: params.catalogVersion
+        });
+    }
+    return Promise.resolve(quadTreeIndex);
 }
-exports.fetchQuadTreeIndex = fetchQuadTreeIndex;