From 5b705a53d7aef548cc510f86f6c15dbceedb29f1 Mon Sep 17 00:00:00 2001 From: Oleksii Zubko Date: Sun, 7 Feb 2021 18:33:22 +0200 Subject: [PATCH] Remove deprecated code. Removing deprecated code which we've moved to the core component 6months ago. Adapted tests. Resolves: OLPEDGE-2466 Signed-off-by: Oleksii Zubko --- @here/olp-sdk-authentication/index.node.ts | 3 +- @here/olp-sdk-authentication/index.web.ts | 3 +- @here/olp-sdk-authentication/lib.version.ts | 24 --- @here/olp-sdk-authentication/lib/HttpError.ts | 25 --- @here/olp-sdk-dataservice-api/index.ts | 3 +- .../olp-sdk-dataservice-api/lib/HttpError.ts | 54 ----- .../test/HttpError.test.ts | 41 ---- @here/olp-sdk-dataservice-read/lib.version.ts | 24 --- .../lib/DataStoreDownloadManager.ts | 24 --- .../lib/DataStoreRequestBuilder.ts | 24 --- .../lib/DownloadManager.ts | 24 --- @here/olp-sdk-dataservice-read/lib/HRN.ts | 24 --- .../lib/cache/ApiCacheRepository.ts | 24 --- .../lib/cache/KeyValueCache.ts | 24 --- .../lib/cache/LRUCache.ts | 24 --- .../lib/cache/index.ts | 5 +- .../lib/client/DataRequest.ts | 34 +-- .../lib/client/FetchOptions.ts | 24 --- .../lib/client/OlpClientSettings.ts | 24 --- .../lib/client/QuadKeyPartitionsRequest.ts | 5 +- .../lib/client/QuadTreeIndexRequest.ts | 6 +- .../lib/client/QueryClient.ts | 7 +- .../lib/client/TileRequest.ts | 83 +------- .../lib/client/VersionedLayerClient.ts | 34 +-- .../lib/client/VolatileLayerClient.ts | 38 +--- .../lib/client/index.ts | 4 +- @here/olp-sdk-dataservice-read/lib/index.ts | 7 +- .../lib/utils/QuadKeyUtils.ts | 194 +----------------- .../lib/utils/RequestBuilderFactory.ts | 97 --------- .../lib/utils/getDataSizeUtil.ts | 24 --- .../lib/utils/getEnvLookupUrl.ts | 24 --- .../lib/utils/getTile.ts | 91 +------- .../lib/utils/index.ts | 5 +- .../test/unit/ArtifactClient.test.ts | 25 ++- .../test/unit/CatalogClient.test.ts | 8 +- .../test/unit/DataRequest.test.ts | 10 +- .../test/unit/IndexLayerClient.test.ts | 21 +- .../test/unit/QuadKeyUtils.test.ts | 49 +---- .../test/unit/QuadTreeIndexRequest.test.ts | 22 +- .../test/unit/QueryClient.test.ts | 24 +-- .../test/unit/SchemaDetailsRequest.test.ts | 5 +- .../test/unit/StatisticsClient.test.ts | 14 +- .../test/unit/StatisticsRequest.test.ts | 5 +- .../test/unit/StreamLayerClient.test.ts | 28 ++- .../test/unit/SummaryRequest.test.ts | 5 +- .../test/unit/TileRequest.test.ts | 80 +------- .../test/unit/VersionedLayerClient.test.ts | 176 ++-------------- .../test/unit/VolatileLayerClient.test.ts | 156 +------------- .../test/unit/getTile.test.ts | 16 +- tests/functional/StreamLayerReadData.test.ts | 5 +- .../api-breaks/ArtifactClient.test.ts | 12 +- .../api-breaks/CatalogClient.test.ts | 9 +- .../api-breaks/ConfigClient.test.ts | 8 +- .../api-breaks/DataRequest.test.ts | 40 +--- .../api-breaks/IndexLayerClient.test.ts | 5 +- .../api-breaks/KeyValueCache.test.ts | 2 +- .../QuadKeyPartitionsRequest.test.ts | 2 +- .../api-breaks/QuadTreeIndexRequest.test.ts | 5 +- .../api-breaks/QueryClient.test.ts | 11 +- .../api-breaks/SchemaDetailsRequest.test.ts | 5 +- .../api-breaks/StatisticsClient.test.ts | 8 +- .../api-breaks/StatisticsRequest.test.ts | 6 +- .../api-breaks/StreamLayerClient.test.ts | 5 +- .../api-breaks/SummaryRequest.test.ts | 9 +- .../api-breaks/VersionedLayerClient.test.ts | 5 +- .../api-breaks/VolatileLayerClient.test.ts | 5 +- .../umd/olp-sdk-dataservice-read-testCases.ts | 80 +------- .../ArtifactClient.test.ts | 17 +- .../CatalogClient.test.ts | 12 +- .../ConfigClient.test.ts | 13 +- .../Handling-versions.test.ts | 91 +++----- .../IndexLayerClient.test.ts | 36 ++-- .../Metadata-api.test.ts | 16 +- .../StatisticsClient.test.ts | 12 +- .../StreamLayerClient.test.ts | 5 +- .../VersionedLayerClient.test.ts | 117 +---------- .../VolatileLayerClient.test.ts | 113 +--------- .../olp-sdk-dataservice-read/getTile.test.ts | 38 ++-- tests/performance/getDataMemoryTest.ts | 5 +- tests/performance/getDataPartitionsTest.ts | 5 +- 80 files changed, 326 insertions(+), 2071 deletions(-) delete mode 100644 @here/olp-sdk-authentication/lib.version.ts delete mode 100644 @here/olp-sdk-authentication/lib/HttpError.ts delete mode 100644 @here/olp-sdk-dataservice-api/lib/HttpError.ts delete mode 100644 @here/olp-sdk-dataservice-api/test/HttpError.test.ts delete mode 100644 @here/olp-sdk-dataservice-read/lib.version.ts delete mode 100644 @here/olp-sdk-dataservice-read/lib/DataStoreDownloadManager.ts delete mode 100644 @here/olp-sdk-dataservice-read/lib/DataStoreRequestBuilder.ts delete mode 100644 @here/olp-sdk-dataservice-read/lib/DownloadManager.ts delete mode 100644 @here/olp-sdk-dataservice-read/lib/HRN.ts delete mode 100644 @here/olp-sdk-dataservice-read/lib/cache/ApiCacheRepository.ts delete mode 100644 @here/olp-sdk-dataservice-read/lib/cache/KeyValueCache.ts delete mode 100644 @here/olp-sdk-dataservice-read/lib/cache/LRUCache.ts delete mode 100644 @here/olp-sdk-dataservice-read/lib/client/FetchOptions.ts delete mode 100644 @here/olp-sdk-dataservice-read/lib/client/OlpClientSettings.ts delete mode 100644 @here/olp-sdk-dataservice-read/lib/utils/RequestBuilderFactory.ts delete mode 100644 @here/olp-sdk-dataservice-read/lib/utils/getDataSizeUtil.ts delete mode 100644 @here/olp-sdk-dataservice-read/lib/utils/getEnvLookupUrl.ts diff --git a/@here/olp-sdk-authentication/index.node.ts b/@here/olp-sdk-authentication/index.node.ts index 70d8fdc7..ad828642 100644 --- a/@here/olp-sdk-authentication/index.node.ts +++ b/@here/olp-sdk-authentication/index.node.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 HERE Europe B.V. + * Copyright (C) 2019-2021 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. @@ -23,4 +23,3 @@ export { OAuthArgs, Token } from "./lib/requestToken_common"; export * from "./lib/requestToken"; export * from "./lib/UserAuth"; export * from "./lib/loadCredentialsFromFile"; -export * from "./lib/HttpError"; diff --git a/@here/olp-sdk-authentication/index.web.ts b/@here/olp-sdk-authentication/index.web.ts index 38c0192e..c8d487c5 100644 --- a/@here/olp-sdk-authentication/index.web.ts +++ b/@here/olp-sdk-authentication/index.web.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 HERE Europe B.V. + * Copyright (C) 2019-2021 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. @@ -20,4 +20,3 @@ export { OAuthArgs, Token } from "./lib/requestToken_common"; export * from "./lib/requestToken.web"; export * from "./lib/UserAuth"; -export * from "./lib/HttpError"; diff --git a/@here/olp-sdk-authentication/lib.version.ts b/@here/olp-sdk-authentication/lib.version.ts deleted file mode 100644 index 3e0f38dd..00000000 --- a/@here/olp-sdk-authentication/lib.version.ts +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2020 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * SPDX-License-Identifier: Apache-2.0 - * License-Filename: LICENSE - */ - -/** - * @deprecated This file will be removed by 02.2021. Please use the same from the `@here/olp-sdk-core` package. - */ - -export * from "@here/olp-sdk-core/lib.version"; diff --git a/@here/olp-sdk-authentication/lib/HttpError.ts b/@here/olp-sdk-authentication/lib/HttpError.ts deleted file mode 100644 index 0862b7e9..00000000 --- a/@here/olp-sdk-authentication/lib/HttpError.ts +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) 2020 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * SPDX-License-Identifier: Apache-2.0 - * License-Filename: LICENSE - */ - -/** - * @deprecated This file will be removed by 02.2021. - * Please use the same from the `@here/olp-sdk-core` package. - */ - -export * from "@here/olp-sdk-core/lib/utils/HttpError"; diff --git a/@here/olp-sdk-dataservice-api/index.ts b/@here/olp-sdk-dataservice-api/index.ts index 6a5f7a9c..78d7eebc 100644 --- a/@here/olp-sdk-dataservice-api/index.ts +++ b/@here/olp-sdk-dataservice-api/index.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 HERE Europe B.V. + * Copyright (C) 2019-2021 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. @@ -18,7 +18,6 @@ */ export * from "./lib/RequestBuilder"; -export * from "./lib/HttpError"; import * as ArtifactApi from "./lib/artifact-api"; import * as AuthorizationAPI from "./lib/authorization-api-v1.1"; diff --git a/@here/olp-sdk-dataservice-api/lib/HttpError.ts b/@here/olp-sdk-dataservice-api/lib/HttpError.ts deleted file mode 100644 index 19ee1598..00000000 --- a/@here/olp-sdk-dataservice-api/lib/HttpError.ts +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) 2020 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * SPDX-License-Identifier: Apache-2.0 - * License-Filename: LICENSE - */ - -/** - * @deprecated This class will be removed by 02.2021. - * Please use the same from the `@here/olp-sdk-core` package. - * - * HttpError class used to be able to provide for consumers - * a more usable errors from services. Would be used in the methods - * to propagate error with http status code and with a message in - * case if something went wrong during the request. - * The HttpError class extends generic Error class from V8 and - * adds property code for http status. - */ -export class HttpError extends Error { - public readonly name: string; - - /** - * Constructs a new HttpError. - * - * @param status - * @param message - */ - constructor(public status: number, message: string) { - super(message); - this.name = "HttpError"; - } - - /** - * Returns true if the given error is a HttpError, - * false otherwise - * - * @param error The error object to check - */ - public static isHttpError(error: any): error is HttpError { - return error.name === "HttpError"; - } -} diff --git a/@here/olp-sdk-dataservice-api/test/HttpError.test.ts b/@here/olp-sdk-dataservice-api/test/HttpError.test.ts deleted file mode 100644 index 67faae01..00000000 --- a/@here/olp-sdk-dataservice-api/test/HttpError.test.ts +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2020 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * SPDX-License-Identifier: Apache-2.0 - * License-Filename: LICENSE - */ - -import * as chai from "chai"; -import { HttpError } from "../index"; - -const assert = chai.assert; -const expect = chai.expect; - -describe("HttpErrorTest", function() { - const NOT_FOUND_ERROR_CODE = 404; - const error = new HttpError(NOT_FOUND_ERROR_CODE, "Not found"); - - it("HttpError shoud be initialized", async function() { - assert.isDefined(error); - expect(error).to.be.instanceOf(Error); - expect(error).to.be.instanceOf(HttpError); - }); - - it("HttpError should have parameters status, message and name", async function() { - expect(error.status).to.be.equal(NOT_FOUND_ERROR_CODE); - expect(error.message).to.be.equal("Not found"); - expect(error.name).to.be.equal("HttpError"); - }); -}); diff --git a/@here/olp-sdk-dataservice-read/lib.version.ts b/@here/olp-sdk-dataservice-read/lib.version.ts deleted file mode 100644 index 3e0f38dd..00000000 --- a/@here/olp-sdk-dataservice-read/lib.version.ts +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2020 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * SPDX-License-Identifier: Apache-2.0 - * License-Filename: LICENSE - */ - -/** - * @deprecated This file will be removed by 02.2021. Please use the same from the `@here/olp-sdk-core` package. - */ - -export * from "@here/olp-sdk-core/lib.version"; diff --git a/@here/olp-sdk-dataservice-read/lib/DataStoreDownloadManager.ts b/@here/olp-sdk-dataservice-read/lib/DataStoreDownloadManager.ts deleted file mode 100644 index 4761bfdb..00000000 --- a/@here/olp-sdk-dataservice-read/lib/DataStoreDownloadManager.ts +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2019-2020 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * SPDX-License-Identifier: Apache-2.0 - * License-Filename: LICENSE - */ - -/** - * @deprecated This file will be removed by 02.2021. Please use the same from the `@here/olp-sdk-core` package. - */ - -export * from "@here/olp-sdk-core/lib/utils/DataStoreDownloadManager"; diff --git a/@here/olp-sdk-dataservice-read/lib/DataStoreRequestBuilder.ts b/@here/olp-sdk-dataservice-read/lib/DataStoreRequestBuilder.ts deleted file mode 100644 index 5fa8c996..00000000 --- a/@here/olp-sdk-dataservice-read/lib/DataStoreRequestBuilder.ts +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2019-2020 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * SPDX-License-Identifier: Apache-2.0 - * License-Filename: LICENSE - */ - -/** - * @deprecated This file will be removed by 02.2021. Please use the same from the `@here/olp-sdk-core` package. - */ - -export * from "@here/olp-sdk-core/lib/utils/DataStoreRequestBuilder"; diff --git a/@here/olp-sdk-dataservice-read/lib/DownloadManager.ts b/@here/olp-sdk-dataservice-read/lib/DownloadManager.ts deleted file mode 100644 index 590b353d..00000000 --- a/@here/olp-sdk-dataservice-read/lib/DownloadManager.ts +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2019-2020 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * SPDX-License-Identifier: Apache-2.0 - * License-Filename: LICENSE - */ - -/** - * @deprecated This file will be removed by 02.2021. Please use the same from the `@here/olp-sdk-core` package. - */ - -export * from "@here/olp-sdk-core/lib/utils/DownloadManager"; diff --git a/@here/olp-sdk-dataservice-read/lib/HRN.ts b/@here/olp-sdk-dataservice-read/lib/HRN.ts deleted file mode 100644 index 8d69fefb..00000000 --- a/@here/olp-sdk-dataservice-read/lib/HRN.ts +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2019-2020 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * SPDX-License-Identifier: Apache-2.0 - * License-Filename: LICENSE - */ - -/** - * @deprecated This file will be removed by 02.2021. Please use the same from the `@here/olp-sdk-core` package. - */ - -export * from "@here/olp-sdk-core/lib/utils/HRN"; diff --git a/@here/olp-sdk-dataservice-read/lib/cache/ApiCacheRepository.ts b/@here/olp-sdk-dataservice-read/lib/cache/ApiCacheRepository.ts deleted file mode 100644 index 50e90af5..00000000 --- a/@here/olp-sdk-dataservice-read/lib/cache/ApiCacheRepository.ts +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2019-2020 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * SPDX-License-Identifier: Apache-2.0 - * License-Filename: LICENSE - */ - -/** - * @deprecated This file will be removed by 02.2021. Please use the same from the `@here/olp-sdk-core` package. - */ - -export * from "@here/olp-sdk-core/lib/cache/ApiCacheRepository"; diff --git a/@here/olp-sdk-dataservice-read/lib/cache/KeyValueCache.ts b/@here/olp-sdk-dataservice-read/lib/cache/KeyValueCache.ts deleted file mode 100644 index fea11094..00000000 --- a/@here/olp-sdk-dataservice-read/lib/cache/KeyValueCache.ts +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2019-2020 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * SPDX-License-Identifier: Apache-2.0 - * License-Filename: LICENSE - */ - -/** - * @deprecated This file will be removed by 02.2021. Please use the same from the `@here/olp-sdk-core` package. - */ - -export * from "@here/olp-sdk-core/lib/cache/KeyValueCache"; diff --git a/@here/olp-sdk-dataservice-read/lib/cache/LRUCache.ts b/@here/olp-sdk-dataservice-read/lib/cache/LRUCache.ts deleted file mode 100644 index be6cb06b..00000000 --- a/@here/olp-sdk-dataservice-read/lib/cache/LRUCache.ts +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2020 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * SPDX-License-Identifier: Apache-2.0 - * License-Filename: LICENSE - */ - -/** - * @deprecated This file will be removed by 02.2021. Please use the same from the `@here/olp-sdk-core` package. - */ - -export * from "@here/olp-sdk-core/lib/cache/LRUCache"; diff --git a/@here/olp-sdk-dataservice-read/lib/cache/index.ts b/@here/olp-sdk-dataservice-read/lib/cache/index.ts index 76af6888..59a5d0fa 100644 --- a/@here/olp-sdk-dataservice-read/lib/cache/index.ts +++ b/@here/olp-sdk-dataservice-read/lib/cache/index.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2020 HERE Europe B.V. + * Copyright (C) 2019-2021 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,8 +17,5 @@ * License-Filename: LICENSE */ -export * from "./ApiCacheRepository"; export * from "./MetadataCacheRepository"; export * from "./QuadTreeIndexCacheRepository"; -export * from "./KeyValueCache"; -export * from "./LRUCache"; diff --git a/@here/olp-sdk-dataservice-read/lib/client/DataRequest.ts b/@here/olp-sdk-dataservice-read/lib/client/DataRequest.ts index 25cdc0e3..df9929ba 100644 --- a/@here/olp-sdk-dataservice-read/lib/client/DataRequest.ts +++ b/@here/olp-sdk-dataservice-read/lib/client/DataRequest.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2020 HERE Europe B.V. + * Copyright (C) 2019-2021 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. @@ -18,7 +18,7 @@ */ import { FetchOptions } from "@here/olp-sdk-core"; -import { QuadKey, validateBillingTag } from "@here/olp-sdk-dataservice-read"; +import { validateBillingTag } from "@here/olp-sdk-dataservice-read"; /** * Prepares information for calls to get data from the HERE Blob Service. @@ -26,8 +26,6 @@ import { QuadKey, validateBillingTag } from "@here/olp-sdk-dataservice-read"; export class DataRequest { private dataHandle?: string; private partitionId?: string; - private quadKey?: QuadKey; - private version?: number; private billingTag?: string; private fetchOption = FetchOptions.OnlineIfNotFound; @@ -73,34 +71,6 @@ export class DataRequest { return this; } - /** - * @deprecated This method will be removed by 02.2021. Please use [[getAggregatedData]] method - * if you need to get data using a quadkey. - * You can also use the [[getPartitions]] method to get datahandle using a quadkey. - * - * Gets a quadkey for the request. - * - * @return The [[QuadKey]] object. - */ - public getQuadKey(): QuadKey | undefined { - return this.quadKey; - } - - /** - * @deprecated This method will be removed by 02.2021. Please use [[getAggregatedData]] method - * if you need to get data using a quadkey. - * You can also use the [[getPartitions]] method to get datahandle using a quadkey. - * - * Sets the provided quadkey. - * - * @param quadKey The [[QuadKey]] object. - * @returns The updated [[DataRequest]] instance that you can use to chain methods. - */ - public withQuadKey(quadKey: QuadKey): DataRequest { - this.quadKey = quadKey; - return this; - } - /** * An optional free-form tag that is used for grouping billing records together. * diff --git a/@here/olp-sdk-dataservice-read/lib/client/FetchOptions.ts b/@here/olp-sdk-dataservice-read/lib/client/FetchOptions.ts deleted file mode 100644 index bc2f9152..00000000 --- a/@here/olp-sdk-dataservice-read/lib/client/FetchOptions.ts +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2020 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * SPDX-License-Identifier: Apache-2.0 - * License-Filename: LICENSE - */ - -/** - * @deprecated This file will be removed by 02.2021. Please use the same from the `@here/olp-sdk-core` package. - */ - -export * from "@here/olp-sdk-core/lib/utils/FetchOptions"; diff --git a/@here/olp-sdk-dataservice-read/lib/client/OlpClientSettings.ts b/@here/olp-sdk-dataservice-read/lib/client/OlpClientSettings.ts deleted file mode 100644 index 273a697a..00000000 --- a/@here/olp-sdk-dataservice-read/lib/client/OlpClientSettings.ts +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2019-2020 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * SPDX-License-Identifier: Apache-2.0 - * License-Filename: LICENSE - */ - -/** - * @deprecated This file will be removed by 02.2021. Please use the same from the `@here/olp-sdk-core` package. - */ - -export * from "@here/olp-sdk-core/lib/client/OlpClientSettings"; diff --git a/@here/olp-sdk-dataservice-read/lib/client/QuadKeyPartitionsRequest.ts b/@here/olp-sdk-dataservice-read/lib/client/QuadKeyPartitionsRequest.ts index 09c652aa..4f6d99c1 100644 --- a/@here/olp-sdk-dataservice-read/lib/client/QuadKeyPartitionsRequest.ts +++ b/@here/olp-sdk-dataservice-read/lib/client/QuadKeyPartitionsRequest.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 HERE Europe B.V. + * Copyright (C) 2019-2021 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. @@ -18,8 +18,8 @@ */ import { AdditionalFields } from "@here/olp-sdk-dataservice-api"; +import { QuadKey } from "@here/olp-sdk-core"; import { - QuadKey, QuadTreeIndexDepth, validateBillingTag } from "@here/olp-sdk-dataservice-read"; @@ -30,7 +30,6 @@ import { * This class works only with versioned and volatile layers where the partitioning scheme is HERE Tile. */ export class QuadKeyPartitionsRequest { - private version?: number; private quadKey?: QuadKey; private depth?: QuadTreeIndexDepth; private billingTag?: string; diff --git a/@here/olp-sdk-dataservice-read/lib/client/QuadTreeIndexRequest.ts b/@here/olp-sdk-dataservice-read/lib/client/QuadTreeIndexRequest.ts index 01bf73ad..1d094779 100644 --- a/@here/olp-sdk-dataservice-read/lib/client/QuadTreeIndexRequest.ts +++ b/@here/olp-sdk-dataservice-read/lib/client/QuadTreeIndexRequest.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2020 HERE Europe B.V. + * Copyright (C) 2019-2021 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,9 +17,9 @@ * License-Filename: LICENSE */ -import { HRN } from "@here/olp-sdk-core"; +import { HRN, QuadKey } from "@here/olp-sdk-core"; import { AdditionalFields } from "@here/olp-sdk-dataservice-api"; -import { QuadKey, validateBillingTag } from "@here/olp-sdk-dataservice-read"; +import { validateBillingTag } from "@here/olp-sdk-dataservice-read"; /** * The recursion depth of the quadtree. diff --git a/@here/olp-sdk-dataservice-read/lib/client/QueryClient.ts b/@here/olp-sdk-dataservice-read/lib/client/QueryClient.ts index 2c7f075c..ed68ab42 100644 --- a/@here/olp-sdk-dataservice-read/lib/client/QueryClient.ts +++ b/@here/olp-sdk-dataservice-read/lib/client/QueryClient.ts @@ -31,7 +31,6 @@ import { } from "@here/olp-sdk-dataservice-api"; import { MetadataCacheRepository, - mortonCodeFromQuadKey, PartitionsRequest, QuadTreeIndexRequest } from "@here/olp-sdk-dataservice-read"; @@ -131,7 +130,11 @@ export class QueryClient { version: 0, layerId, depth: subQuadKeysMaxLength, - quadKey: mortonCodeFromQuadKey(quadKey).toString(), + quadKey: TileKey.fromRowColumnLevel( + quadKey.row, + quadKey.column, + quadKey.level + ).toQuadKey(), billingTag: request.getBillingTag(), additionalFields: request.getAdditionalFields() }; diff --git a/@here/olp-sdk-dataservice-read/lib/client/TileRequest.ts b/@here/olp-sdk-dataservice-read/lib/client/TileRequest.ts index fb7e0680..cccc4fe1 100644 --- a/@here/olp-sdk-dataservice-read/lib/client/TileRequest.ts +++ b/@here/olp-sdk-dataservice-read/lib/client/TileRequest.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 HERE Europe B.V. + * Copyright (C) 2020-2021 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. @@ -21,10 +21,10 @@ import { FetchOptions, HRN, OlpClientSettings, - RequestFactory + QuadKey } from "@here/olp-sdk-core"; import { MetadataApi } from "@here/olp-sdk-dataservice-api"; -import { QuadKey, validateBillingTag } from "@here/olp-sdk-dataservice-read"; +import { validateBillingTag } from "@here/olp-sdk-dataservice-read"; /** * Parameters used to get a tile. @@ -68,53 +68,6 @@ export class TileRequest { private billingTag?: string; private fetchOption = FetchOptions.OnlineIfNotFound; - private catalogVersion?: number; - - /** - * @deprecated This signature will be removed by 02.2021. - * Plase use `new TileRequest()` - * - * @param params - */ - constructor(private readonly params?: TileRequestParams) { - this.catalogVersion = params && params.catalogVersion; - } - - /** - * @deprecated This method will be removed by 02.2021. - * Please call getTile with signature getTile(request: TileRequest, params: TileRequestParams, abortSignal?: AbortSignal) - * - * Gets the catalog version provided by the [[TileRequestParams]]. - * - * @return The catalog version provided by the [[TileRequestParams]]. - * If this version was not provided, the latest version is fetched and used. - */ - public async getCatalogVersion(): Promise { - if (this.catalogVersion !== undefined) { - return Promise.resolve(this.catalogVersion); - } - - this.catalogVersion = await this.getCatalogLatestVersion().catch(err => - Promise.reject(err) - ); - return this.catalogVersion !== undefined - ? Promise.resolve(this.catalogVersion) - : Promise.reject( - new Error("Error getting the latest version of catalog") - ); - } - - /** - * @deprecated This method will be removed by 02.2021. - * Please call getTile with signature getTile(request: TileRequest, params: TileRequestParams, abortSignal?: AbortSignal) - * - * Gets the tile request parameters. - * - * @return The [[TileRequestParams]] instance. - */ - public getParams(): TileRequestParams { - return this.params as TileRequestParams; - } /** * A geometric area represented as a HERE tile. @@ -184,34 +137,4 @@ export class TileRequest { public getFetchOption(): FetchOptions { return this.fetchOption; } - - /** - * @deprecated This method will be removed by 02.2021. - * Gets the latest available catalog version. - * - * @return The latest available catalog version. - */ - private async getCatalogLatestVersion(): Promise { - if (!this.params) { - return Promise.reject( - "Using deprecated method, please use getVersionOfCatalog()" - ); - } - const request = await RequestFactory.create( - "metadata", - "v1", - this.params.settings, - this.params.catalogHrn - ).catch(error => - Promise.reject( - `Erorr creating request object for metadata service: ${error}` - ) - ); - - const latestVersion = await MetadataApi.latestVersion(request, { - startVersion: -1 - }).catch(error => Promise.reject(error)); - - return Promise.resolve(latestVersion.version); - } } diff --git a/@here/olp-sdk-dataservice-read/lib/client/VersionedLayerClient.ts b/@here/olp-sdk-dataservice-read/lib/client/VersionedLayerClient.ts index 15d4a4eb..da0e18a3 100644 --- a/@here/olp-sdk-dataservice-read/lib/client/VersionedLayerClient.ts +++ b/@here/olp-sdk-dataservice-read/lib/client/VersionedLayerClient.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2020 HERE Europe B.V. + * Copyright (C) 2019-2021 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. @@ -180,38 +180,6 @@ export class VersionedLayerClient { ); } - const quadKey = dataRequest.getQuadKey(); - if (quadKey) { - const quadKeyPartitionsRequest = new QuadKeyPartitionsRequest().withQuadKey( - quadKey - ); - - const quadTreeIndexResponse = await this.getPartitions( - quadKeyPartitionsRequest - ).catch(error => Promise.reject(error)); - - if ( - quadTreeIndexResponse.status && - quadTreeIndexResponse.status === STATUS_CODES.BAD_REQUEST - ) { - return Promise.reject(quadTreeIndexResponse); - } - - return quadTreeIndexResponse.subQuads && - quadTreeIndexResponse.subQuads.length - ? this.downloadPartition( - quadTreeIndexResponse.subQuads[0].dataHandle, - abortSignal, - dataRequest.getBillingTag() - ) - : Promise.reject( - new HttpError( - STATUS_CODES.NO_CONTENT, - `No dataHandle for quadKey {column: ${quadKey.column}, row: ${quadKey.row}, level: ${quadKey.level}}. HRN: ${this.hrn}` - ) - ); - } - return Promise.reject( new Error( `No data provided. Add dataHandle, partitionId or quadKey to the DataRequest object` diff --git a/@here/olp-sdk-dataservice-read/lib/client/VolatileLayerClient.ts b/@here/olp-sdk-dataservice-read/lib/client/VolatileLayerClient.ts index 9449af8f..7653cb95 100644 --- a/@here/olp-sdk-dataservice-read/lib/client/VolatileLayerClient.ts +++ b/@here/olp-sdk-dataservice-read/lib/client/VolatileLayerClient.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2020 HERE Europe B.V. + * Copyright (C) 2019-2021 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. @@ -129,13 +129,8 @@ export class VolatileLayerClient { ): Promise { const dataHandle = dataRequest.getDataHandle(); const partitionId = dataRequest.getPartitionId(); - const quadKey = dataRequest.getQuadKey(); - if ( - dataHandle !== undefined || - partitionId !== undefined || - quadKey !== undefined - ) { + if (dataHandle !== undefined || partitionId !== undefined) { if (dataHandle) { return this.downloadPartition( dataHandle, @@ -157,35 +152,6 @@ export class VolatileLayerClient { dataRequest.getBillingTag() ); } - - if (quadKey) { - const quadKeyPartitionsRequest = new QuadKeyPartitionsRequest().withQuadKey( - quadKey - ); - const quadTreeIndex = await this.getPartitions( - quadKeyPartitionsRequest - ).catch(error => Promise.reject(error)); - - if ( - quadTreeIndex.status && - quadTreeIndex.status === STATUS_CODES.BAD_REQUEST - ) { - return Promise.reject(quadTreeIndex); - } - - return quadTreeIndex.subQuads && quadTreeIndex.subQuads.length - ? this.downloadPartition( - quadTreeIndex.subQuads[0].dataHandle, - abortSignal, - dataRequest.getBillingTag() - ) - : Promise.reject( - new HttpError( - STATUS_CODES.NO_CONTENT, - `No dataHandle for quadKey {column: ${quadKey.column}, row: ${quadKey.row}, level: ${quadKey.level}}. HRN: ${this.hrn}` - ) - ); - } } return Promise.reject( diff --git a/@here/olp-sdk-dataservice-read/lib/client/index.ts b/@here/olp-sdk-dataservice-read/lib/client/index.ts index ab35a3fd..6aa45924 100644 --- a/@here/olp-sdk-dataservice-read/lib/client/index.ts +++ b/@here/olp-sdk-dataservice-read/lib/client/index.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2020 HERE Europe B.V. + * Copyright (C) 2019-2021 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. @@ -27,7 +27,6 @@ export * from "./VersionedLayerClient"; export * from "./VolatileLayerClient"; export * from "./ConfigClient"; export * from "./CatalogsRequest"; -export * from "./OlpClientSettings"; export * from "./SchemaDetailsRequest"; export * from "./ArtifactClient"; export * from "./PartitionsRequest"; @@ -44,5 +43,4 @@ export * from "./SubscribeRequest"; export * from "./PollRequest"; export * from "./UnsubscribeRequest"; export * from "./SeekRequest"; -export * from "./FetchOptions"; export * from "./TileRequest"; diff --git a/@here/olp-sdk-dataservice-read/lib/index.ts b/@here/olp-sdk-dataservice-read/lib/index.ts index 1d749737..963c0e04 100644 --- a/@here/olp-sdk-dataservice-read/lib/index.ts +++ b/@here/olp-sdk-dataservice-read/lib/index.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 HERE Europe B.V. + * Copyright (C) 2019-2021 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. @@ -20,8 +20,3 @@ export * from "./utils"; export * from "./client"; export * from "./cache"; - -export * from "./DataStoreRequestBuilder"; -export * from "./DataStoreDownloadManager"; -export * from "./DownloadManager"; -export * from "./HRN"; diff --git a/@here/olp-sdk-dataservice-read/lib/utils/QuadKeyUtils.ts b/@here/olp-sdk-dataservice-read/lib/utils/QuadKeyUtils.ts index 2e1e2ec5..3dadcc5c 100644 --- a/@here/olp-sdk-dataservice-read/lib/utils/QuadKeyUtils.ts +++ b/@here/olp-sdk-dataservice-read/lib/utils/QuadKeyUtils.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2020 HERE Europe B.V. + * Copyright (C) 2019-2021 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,198 +17,10 @@ * License-Filename: LICENSE */ -/** - * @deprecated This interface will be removed by 02.2021. Please use the same from the `@here/olp-sdk-core` package. - * Addresses a tile in a quadtree. - * - * A quadkey is defined by a row, a column, and a level. The tree has a root at level 0 that contains one - * single tile. On every level, each tile is divided into four children (hence, the name "quadtree"). - * - * Within each [[level]], a tile is addressed with a [[row]] and [[column]]. The number - * of rows and columns in each level is 2 to the power of the level. This means that on level 0, only - * one tile exists, so there is 1 column and 1 row. On level 1, 4 tiles exist in 2 rows and 2 columns. - * On level 2, we have 16 tiles in 4 rows and 4 columns. And so on. - * - * @note As the JavaScript number type can hold 53 bits in its mantissa, only levels up to 26 can be - * represented in the number representation returned by [[`mortonCodeFromQuadKey`]]. - */ -export interface QuadKey { - /** The row that contains the tile. */ - readonly row: number; - /** The column that contains the tile. */ - readonly column: number; - /** The level that contains the tile. */ - readonly level: number; -} - -/** @hidden */ -// tslint:disable:no-magic-numbers -const powerOfTwo = [ - 0x1, - 0x2, - 0x4, - 0x8, - 0x10, - 0x20, - 0x40, - 0x80, - 0x100, - 0x200, - 0x400, - 0x800, - 0x1000, - 0x2000, - 0x4000, - 0x8000, - 0x10000, - 0x20000, - 0x40000, - 0x80000, - 0x100000, - 0x200000, - 0x400000, - 0x800000, - 0x1000000, - 0x2000000, - 0x4000000, - 0x8000000, - 0x10000000, - 0x20000000, - 0x40000000, - 0x80000000, - 0x100000000, - 0x200000000, - 0x400000000, - 0x800000000, - 0x1000000000, - 0x2000000000, - 0x4000000000, - 0x8000000000, - 0x10000000000, - 0x20000000000, - 0x40000000000, - 0x80000000000, - 0x100000000000, - 0x200000000000, - 0x400000000000, - 0x800000000000, - 0x1000000000000, - 0x2000000000000, - 0x4000000000000, - 0x8000000000000, - 0x10000000000000 // Math.pow(2, 52), highest bit that can be set correctly. -]; -// tslint:enable:no-magic-numbers - -/** - * @deprecated This function will be removed by 08.2021. - * Please use the same method from [[TileKey]] class, imported from `@here/olp-sdk-core` package. - * - * Creates a quadkey from a numeric or string Morton code representation. - * - * @param code The Morton code that you want to convert. - * @returns The [[QuadKey]] instance. - */ -export function quadKeyFromMortonCode(code: number | string): QuadKey { - if (typeof code === "string") { - code = parseInt(code, 10); - } - - let level = 0; - let row = 0; - let column = 0; - // tslint:disable:no-bitwise - while (code > 1) { - const mask: number = 1 << level; - if (code & 0x1) { - column |= mask; - } - if (code & 0x2) { - row |= mask; - } - level++; - // tslint:disable-next-line:no-magic-numbers - code = (code - (code & 0x3)) / 4; - } - // tslint:enable:no-bitwise - return { row, column, level } as QuadKey; -} - -/** - * @deprecated This function will be removed by 02.2021. - * Please use the same method from [[TileKey]] class, imported from `@here/olp-sdk-core` package. - * - * Converts a quadkey into a Morton code numeric representation. - * - * @param key The quadkey that you need to convert to the Morton code. - * @returns The number representing the Morton code of [[QuadKey]]. - */ -export function mortonCodeFromQuadKey(key: QuadKey): number { - let column = key.column; - let row = key.row; - // tslint:disable:no-bitwise - let result = powerOfTwo[key.level << 1]; - for (let i = 0; i < key.level; ++i) { - if (column & 0x1) { - result += powerOfTwo[2 * i]; - } - if (row & 0x1) { - result += powerOfTwo[2 * i + 1]; - } - column >>>= 1; - row >>>= 1; - } - // tslint:enable:no-bitwise - return result; -} - -/** - * @deprecated This function will be removed by 02.2021. - * Please use the same method from [[TileKey]] class, imported from `@here/olp-sdk-core` package. - * - * Computes a new quadkey that is a result of appending the `subKey` (relative) quadkey to the current quadkey. - * - * This function treats the current quadkey as a root for a relative quadkey. - * The quadkey level of the result is computed as the current level plus the relative level. - * @param root The current quadkey. - * @param subKey The relative quadkey. - * @returns The [[QuadKey]] instance. - */ -export function addQuadKeys(root: QuadKey, subKey: QuadKey): QuadKey { - // tslint:disable:no-bitwise - const row = (root.row << subKey.level) + subKey.row; - const column = (root.column << subKey.level) + subKey.column; - // tslint:enable:no-bitwise - const level = root.level + subKey.level; - return { row, column, level } as QuadKey; -} - -/** - * @deprecated This function will be removed by 02.2021. - * Please use the same method from [[TileKey]] class, imported from `@here/olp-sdk-core` package. - * - * Computes a new quadkey that is the parent of the current quadkey. - * - * If the result level is negative, the root quadkey is returned. - * @param key The current quadkey. - * @param delta The numeric difference between the current level and the ancestor level. - * @note If the ancestor level is not specified, the function returns the first ancestor. - * @returns The [[QuadKey]] instance. - */ -export function computeParentKey(key: QuadKey, delta: number = 1): QuadKey { - if (delta < 0) { - throw new Error("Operation is not supported"); - } - // tslint:disable:no-bitwise - const row = key.row >>> delta; - const column = key.column >>> delta; - // tslint:enable:no-bitwise - const level = Math.max(0, key.level - delta); - return { row, column, level } as QuadKey; -} +import { QuadKey } from "@here/olp-sdk-core"; /** - * @deprecated This function will be removed by 02.2021. + * @deprecated This function will be removed by 08.2021. * Please use the same method from [[TileKey]] class, imported from `@here/olp-sdk-core` package. * * Checks if a quadkey is valid. diff --git a/@here/olp-sdk-dataservice-read/lib/utils/RequestBuilderFactory.ts b/@here/olp-sdk-dataservice-read/lib/utils/RequestBuilderFactory.ts deleted file mode 100644 index 37e5ed9b..00000000 --- a/@here/olp-sdk-dataservice-read/lib/utils/RequestBuilderFactory.ts +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright (C) 2019-2020 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * SPDX-License-Identifier: Apache-2.0 - * License-Filename: LICENSE - */ - -/** - * @deprecated This file will be removed by 02.2021. Please use the same from the `@here/olp-sdk-core` package. - */ - -import { - ApiCacheRepository, - ApiName, - DataStoreRequestBuilder, - getEnvLookUpUrl, - HRN, - HttpError, - OlpClientSettings, - RequestFactory as CoreRequestFactory -} from "@here/olp-sdk-core"; -import { LookupApi } from "@here/olp-sdk-dataservice-api"; -const MILLISECONDS_IN_SECOND = 1000; - -/** - * @deprecated This class will be removed by 02.2021. Please use the same from the `@here/olp-sdk-core` package. - * A helper utils that makes the `Request` object with the base URLs of the API Lookup Service, token callback, and download manager. - * - * Also, you can use it to get the base URLs of the API Lookup Service. - */ -export class RequestFactory { - /** - * Factory method for building [[DataStoreRequestBuilder]]. - * - * @param serviceName The name of the service in the API. - * @param serviceVersion The version of the service. - * @param settings The [[OlpClientSettings]] instance. - * @param hrn A HERE Resource Name ([[HRN]]) of the catalog. - * @param abortSignal A signal object that allows you to communicate with a request (such as the `fetch` request) - * and, if required, abort it using the `AbortController` object. - * - * For more information, see the [`AbortController` documentation](https://developer.mozilla.org/en-US/docs/Web/API/AbortController). - * - * @returns The Promise with constructed [[DataStoreRequestBuilder]]. - */ - public static async create( - serviceName: ApiName, - serviceVersion: string, - settings: OlpClientSettings, - hrn?: HRN, - abortSignal?: AbortSignal - ): Promise { - return CoreRequestFactory.create( - serviceName, - serviceVersion, - settings, - hrn, - abortSignal - ); - } - - /** - * Gets a base URL of the API service that supports caching. - * - * @param serviceName The name of the API service. - * @param serviceVersion The version of the service. - * @param settings The [[OlpClientSettings]] instance. - * @param hrn The [[HRN]] of the catalog. - * - * @return The Promise with the base URL of the service. - */ - public static async getBaseUrl( - serviceName: ApiName, - serviceVersion: string, - settings: OlpClientSettings, - hrn?: HRN - ): Promise { - return CoreRequestFactory.getBaseUrl( - serviceName, - serviceVersion, - settings, - hrn - ); - } -} diff --git a/@here/olp-sdk-dataservice-read/lib/utils/getDataSizeUtil.ts b/@here/olp-sdk-dataservice-read/lib/utils/getDataSizeUtil.ts deleted file mode 100644 index 77191511..00000000 --- a/@here/olp-sdk-dataservice-read/lib/utils/getDataSizeUtil.ts +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2020 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * SPDX-License-Identifier: Apache-2.0 - * License-Filename: LICENSE - */ - -/** - * @deprecated This file will be removed by 02.2021. Please use the same from the `@here/olp-sdk-core` package. - */ - -export * from "@here/olp-sdk-core/lib/utils/getDataSizeUtil"; diff --git a/@here/olp-sdk-dataservice-read/lib/utils/getEnvLookupUrl.ts b/@here/olp-sdk-dataservice-read/lib/utils/getEnvLookupUrl.ts deleted file mode 100644 index 2413c76a..00000000 --- a/@here/olp-sdk-dataservice-read/lib/utils/getEnvLookupUrl.ts +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2019 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * SPDX-License-Identifier: Apache-2.0 - * License-Filename: LICENSE - */ - -/** - * @deprecated This file will be removed by 02.2021. Please use the same from the `@here/olp-sdk-core` package. - */ - -export * from "@here/olp-sdk-core/lib/utils/getEnvLookupUrl"; diff --git a/@here/olp-sdk-dataservice-read/lib/utils/getTile.ts b/@here/olp-sdk-dataservice-read/lib/utils/getTile.ts index 421c6cae..2edd2da6 100644 --- a/@here/olp-sdk-dataservice-read/lib/utils/getTile.ts +++ b/@here/olp-sdk-dataservice-read/lib/utils/getTile.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 HERE Europe B.V. + * Copyright (C) 2020-2021 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,12 +17,17 @@ * License-Filename: LICENSE */ -import { FetchOptions, HRN, RequestFactory, TileKey } from "@here/olp-sdk-core"; +import { + FetchOptions, + HRN, + RequestFactory, + TileKey, + OlpClientSettings, + ApiName +} from "@here/olp-sdk-core"; import { BlobApi } from "@here/olp-sdk-dataservice-api"; import { Index as QuadTreeIndex } from "@here/olp-sdk-dataservice-api/lib/query-api"; import { - ApiName, - OlpClientSettings, QuadTreeIndexCacheRepository, QuadTreeIndexDepth, QuadTreeIndexRequest, @@ -78,59 +83,7 @@ export async function getTile( request: TileRequest, params: TileRequestParams, abortSignal?: AbortSignal -): Promise; - -/** - * @deprecated This signature will be removed by 02.2021. - * Use the following signature instead: - * `getTile(request: TileRequest, params: TileRequestParams, abortSignal?: AbortSignal): Promise`. - * - * Gets the tile by the key. - * - * The tile is a geometric area represented as a HERE tile. - * The quadtree metadata fetches the blob of needed tile from the Query Service API, - * 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: TileRequestParams = { - * settings: "% your `OlpClientSettings` instance % ", - * catalogHrn: "% the HRN instance of your catalog %", - * layerId: "% your layer ID %", - * layerType: "% versioned or volatile %", - * catalogVersion: "% the catalog version; for versioned layers, the latest version is used by default %" - * } - * - * const request = new TileRequest(params); - * - * const tile1 = await getTile(request.withTileKey(yourTileKey1)); - * const tile2 = await getTile(request.withTileKey(yourTileKey2)); - * - * ``` - * - * @returns The blob of the requested Tile or the blob of the closest parent Tile. - */ -export async function getTile( - request: TileRequest, - abortSignal?: AbortSignal -): Promise; - -export async function getTile( - request: TileRequest, - paramsOrSignal?: TileRequestParams | AbortSignal, - signal?: AbortSignal ): Promise { - let params: TileRequestParams | undefined; - let abortSignal: AbortSignal | undefined; let catalogVersion: number | undefined; const quadKey = request.getTileKey(); @@ -138,30 +91,8 @@ export async function getTile( return Promise.reject(new Error("Please provide correct QuadKey")); } - if ( - !paramsOrSignal || - (paramsOrSignal && paramsOrSignal instanceof AbortSignal) - ) { - // usind deprecated - params = request.getParams(); - abortSignal = paramsOrSignal; - if (params.layerType === "versioned") { - catalogVersion = await request.getCatalogVersion(); - } - } else { - params = paramsOrSignal; - abortSignal = signal; - if (params.layerType === "versioned") { - catalogVersion = params.catalogVersion; - } - } - - if (!params) { - return Promise.reject( - new Error( - `Error getting params. Please use signature getTile(request: TileRequest, params: TileRequestParams, abortSignal?: AbortSignal)` - ) - ); + if (params.layerType === "versioned") { + catalogVersion = params.catalogVersion; } const blobType: ApiName = diff --git a/@here/olp-sdk-dataservice-read/lib/utils/index.ts b/@here/olp-sdk-dataservice-read/lib/utils/index.ts index 0239dddb..23dc173b 100644 --- a/@here/olp-sdk-dataservice-read/lib/utils/index.ts +++ b/@here/olp-sdk-dataservice-read/lib/utils/index.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 HERE Europe B.V. + * Copyright (C) 2019-2021 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. @@ -18,9 +18,6 @@ */ export * from "./QuadKeyUtils"; -export * from "./RequestBuilderFactory"; -export * from "./getEnvLookupUrl"; export * from "./validateBillingTag"; export * from "./validatePartitionsIdsList"; -export * from "./getDataSizeUtil"; export * from "./getTile"; diff --git a/@here/olp-sdk-dataservice-read/test/unit/ArtifactClient.test.ts b/@here/olp-sdk-dataservice-read/test/unit/ArtifactClient.test.ts index 394464be..24ecfca5 100644 --- a/@here/olp-sdk-dataservice-read/test/unit/ArtifactClient.test.ts +++ b/@here/olp-sdk-dataservice-read/test/unit/ArtifactClient.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2020 HERE Europe B.V. + * Copyright (C) 2019-2021 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. @@ -23,7 +23,7 @@ import sinonChai = require("sinon-chai"); import * as dataServiceRead from "@here/olp-sdk-dataservice-read"; import { ArtifactApi } from "@here/olp-sdk-dataservice-api"; -import { HttpError, RequestFactory } from "@here/olp-sdk-core"; +import * as dataserviceCore from "@here/olp-sdk-core"; chai.use(sinonChai); @@ -32,11 +32,11 @@ const expect = chai.expect; describe("ArtifactClient", function() { let sandbox: sinon.SinonSandbox; - let olpClientSettingsStub: sinon.SinonStubbedInstance; + let olpClientSettingsStub: sinon.SinonStubbedInstance; let getArtifactUsingGETStub: sinon.SinonStub; let getSchemaUsingGETStub: sinon.SinonStub; let getBaseUrlRequestStub: sinon.SinonStub; - const mockedHRN = dataServiceRead.HRN.fromString( + const mockedHRN = dataserviceCore.HRN.fromString( "hrn:here:data:::mocked-hrn" ); const mockedLayerId = "mocked-layed-id"; @@ -48,9 +48,12 @@ describe("ArtifactClient", function() { beforeEach(function() { olpClientSettingsStub = sandbox.createStubInstance( - dataServiceRead.OlpClientSettings + dataserviceCore.OlpClientSettings + ); + getBaseUrlRequestStub = sandbox.stub( + dataserviceCore.RequestFactory, + "getBaseUrl" ); - getBaseUrlRequestStub = sandbox.stub(RequestFactory, "getBaseUrl"); getArtifactUsingGETStub = sandbox.stub( ArtifactApi, "getArtifactUsingGET" @@ -99,7 +102,10 @@ describe("ArtifactClient", function() { it("Should method getSchema return HttpError when ArtifactClient API crashes", async function() { const NOT_FOUND_ERROR_CODE = 404; - const mockedError = new HttpError(NOT_FOUND_ERROR_CODE, "Not found"); + const mockedError = new dataserviceCore.HttpError( + NOT_FOUND_ERROR_CODE, + "Not found" + ); const mockedSchema: Response = new Response(null, { statusText: "mocked response" @@ -185,7 +191,10 @@ describe("ArtifactClient", function() { it("Should method getSchemaDetails return HttpError when ArtifactClient crashes", async function() { const NOT_FOUND_ERROR_CODE = 404; - const mockedError = new HttpError(NOT_FOUND_ERROR_CODE, "Not found"); + const mockedError = new dataserviceCore.HttpError( + NOT_FOUND_ERROR_CODE, + "Not found" + ); const mockedSchema: ArtifactApi.GetSchemaResponse = { variants: [ diff --git a/@here/olp-sdk-dataservice-read/test/unit/CatalogClient.test.ts b/@here/olp-sdk-dataservice-read/test/unit/CatalogClient.test.ts index 88612607..c4b1e85a 100644 --- a/@here/olp-sdk-dataservice-read/test/unit/CatalogClient.test.ts +++ b/@here/olp-sdk-dataservice-read/test/unit/CatalogClient.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2020 HERE Europe B.V. + * Copyright (C) 2019-2021 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. @@ -47,16 +47,14 @@ describe("CatalogClient", function() { let catalogClient: dataServiceRead.CatalogClient; let getBaseUrlRequestStub: sinon.SinonStub; const fakeURL = "http://fake-base.url"; - const mockedHRN = dataServiceRead.HRN.fromString( - "hrn:here:data:::live-weather-na" - ); + const mockedHRN = core.HRN.fromString("hrn:here:data:::live-weather-na"); before(function() { sandbox = sinon.createSandbox(); let settings = sandbox.createStubInstance(core.OlpClientSettings); catalogClient = new dataServiceRead.CatalogClient( mockedHRN, - (settings as unknown) as dataServiceRead.OlpClientSettings + (settings as unknown) as core.OlpClientSettings ); }); diff --git a/@here/olp-sdk-dataservice-read/test/unit/DataRequest.test.ts b/@here/olp-sdk-dataservice-read/test/unit/DataRequest.test.ts index 4a095305..093ab01f 100644 --- a/@here/olp-sdk-dataservice-read/test/unit/DataRequest.test.ts +++ b/@here/olp-sdk-dataservice-read/test/unit/DataRequest.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 HERE Europe B.V. + * Copyright (C) 2019-2021 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,7 +17,6 @@ * License-Filename: LICENSE */ -import sinon = require("sinon"); import * as chai from "chai"; import sinonChai = require("sinon-chai"); @@ -32,7 +31,6 @@ describe("DataRequest", function() { const billingTag = "billingTag"; const mockedDataHandle = "43d76b9f-e934-40e5-9ce4-91d88a30f1c6"; const mockedPartitionId = "123123123"; - const mockedVersion = 42; const mockedQuadKey = { row: 42, column: 42, @@ -54,7 +52,6 @@ describe("DataRequest", function() { const dataRequestWithLayerId = dataRequest.withPartitionId( mockedPartitionId ); - const dataRequestWithDataLevel = dataRequest.withQuadKey(mockedQuadKey); const dataRequestWithBillTag = dataRequest.withBillingTag(billingTag); expect(dataRequestWithCatalogHrn.getDataHandle()).to.be.equal( @@ -63,9 +60,6 @@ describe("DataRequest", function() { expect(dataRequestWithLayerId.getPartitionId()).to.be.equal( mockedPartitionId ); - expect(dataRequestWithDataLevel.getQuadKey()).to.be.equal( - mockedQuadKey - ); expect(dataRequestWithBillTag.getBillingTag()).to.be.equal(billingTag); }); @@ -73,12 +67,10 @@ describe("DataRequest", function() { const dataRequest = new DataRequest() .withDataHandle(mockedDataHandle) .withPartitionId(mockedPartitionId) - .withQuadKey(mockedQuadKey) .withBillingTag(billingTag); expect(dataRequest.getDataHandle()).to.be.equal(mockedDataHandle); expect(dataRequest.getPartitionId()).to.be.equal(mockedPartitionId); - expect(dataRequest.getQuadKey()).to.be.equal(mockedQuadKey); expect(dataRequest.getBillingTag()).to.be.equal(billingTag); }); }); diff --git a/@here/olp-sdk-dataservice-read/test/unit/IndexLayerClient.test.ts b/@here/olp-sdk-dataservice-read/test/unit/IndexLayerClient.test.ts index 63a1d0f7..78854625 100644 --- a/@here/olp-sdk-dataservice-read/test/unit/IndexLayerClient.test.ts +++ b/@here/olp-sdk-dataservice-read/test/unit/IndexLayerClient.test.ts @@ -22,7 +22,7 @@ import * as chai from "chai"; import sinonChai = require("sinon-chai"); import * as dataServiceRead from "../../lib"; -import { HttpError, RequestFactory } from "@here/olp-sdk-core"; +import * as core from "@here/olp-sdk-core"; import { IndexApi, BlobApi } from "@here/olp-sdk-dataservice-api"; chai.use(sinonChai); @@ -36,22 +36,18 @@ describe("IndexLayerClient", function() { let getIndexStub: sinon.SinonStub; let getBaseUrlRequestStub: sinon.SinonStub; let indexLayerClient: dataServiceRead.IndexLayerClient; - const mockedHRN = dataServiceRead.HRN.fromString( - "hrn:here:data:::mocked-hrn" - ); + const mockedHRN = core.HRN.fromString("hrn:here:data:::mocked-hrn"); const mockedLayerId = "mocked-layed-id"; const fakeURL = "http://fake-base.url"; before(function() { sandbox = sinon.createSandbox(); - let settings = sandbox.createStubInstance( - dataServiceRead.OlpClientSettings - ); + let settings = sandbox.createStubInstance(core.OlpClientSettings); const indexLayerClientParams = { catalogHrn: mockedHRN, layerId: mockedLayerId, - settings: (settings as unknown) as dataServiceRead.OlpClientSettings + settings: (settings as unknown) as core.OlpClientSettings }; indexLayerClient = new dataServiceRead.IndexLayerClient( indexLayerClientParams @@ -61,7 +57,7 @@ describe("IndexLayerClient", function() { beforeEach(function() { getBlobStub = sandbox.stub(BlobApi, "getBlob"); getIndexStub = sandbox.stub(IndexApi, "performQuery"); - getBaseUrlRequestStub = sandbox.stub(RequestFactory, "getBaseUrl"); + getBaseUrlRequestStub = sandbox.stub(core.RequestFactory, "getBaseUrl"); getBaseUrlRequestStub.callsFake(() => Promise.resolve(fakeURL)); }); @@ -126,7 +122,10 @@ describe("IndexLayerClient", function() { it("Should method getPartitions with IndexQueryRequest return HttpError when IndexApi crashes", async function() { const TEST_ERROR_CODE = 404; - const mockedHttpError = new HttpError(TEST_ERROR_CODE, "Test Error"); + const mockedHttpError = new core.HttpError( + TEST_ERROR_CODE, + "Test Error" + ); getIndexStub.callsFake( (builder: any, params: any): Promise => { @@ -312,7 +311,7 @@ describe("IndexLayerClient", function() { it("Should HttpError be handled", async function() { const TEST_ERROR_CODE = 404; - const mockedError = new HttpError(TEST_ERROR_CODE, "Test Error"); + const mockedError = new core.HttpError(TEST_ERROR_CODE, "Test Error"); const mockedModel = { id: "8c0e5ac9-b036-4365-8820-dfcba64588fc", diff --git a/@here/olp-sdk-dataservice-read/test/unit/QuadKeyUtils.test.ts b/@here/olp-sdk-dataservice-read/test/unit/QuadKeyUtils.test.ts index 4b21bb6a..5c908aee 100644 --- a/@here/olp-sdk-dataservice-read/test/unit/QuadKeyUtils.test.ts +++ b/@here/olp-sdk-dataservice-read/test/unit/QuadKeyUtils.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2020 HERE Europe B.V. + * Copyright (C) 2019-2021 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. @@ -21,53 +21,6 @@ import { assert } from "chai"; import * as utils from "../../lib/utils/QuadKeyUtils"; describe("QuadKeyUtils", function() { - it("Can be constructed from root morton code", function() { - const tile = utils.quadKeyFromMortonCode("0"); - assert.strictEqual(tile.row, 0, "Row mismatch"); - assert.strictEqual(tile.column, 0, "Column mismatch"); - assert.strictEqual(tile.level, 0, "Level mismatch"); - }); - - it("Can be constructed from morton code", function() { - const tile = utils.quadKeyFromMortonCode("22893"); - assert.strictEqual(tile.row, 38, "Row mismatch"); - assert.strictEqual(tile.column, 91, "Column mismatch"); - assert.strictEqual(tile.level, 7, "Level mismatch"); - }); - - it("Check the tile parents", function() { - const tile = { row: 3, column: 3, level: 2 }; - const parent_1 = utils.computeParentKey(tile, 1); - assert.strictEqual(parent_1.row, 1, "Row mismatch"); - assert.strictEqual(parent_1.column, 1, "Column mismatch"); - assert.strictEqual(parent_1.level, 1, "Level mismatch"); - const parent_2 = utils.computeParentKey(tile, 2); - assert.strictEqual(parent_2.row, 0, "Row mismatch"); - assert.strictEqual(parent_2.column, 0, "Column mismatch"); - assert.strictEqual(parent_2.level, 0, "Level mismatch"); - const parent_3 = utils.computeParentKey(tile, 3); - assert.strictEqual(parent_3.row, 0, "Row mismatch"); - assert.strictEqual(parent_3.column, 0, "Column mismatch"); - assert.strictEqual(parent_3.level, 0, "Level mismatch"); - }); - - it("Check the tile parents with delta 4", function() { - const tile = { row: 3275, column: 8085, level: 13 }; - const parent = utils.computeParentKey(tile, 4); - assert.strictEqual(parent.row, 204, "Row mismatch"); - assert.strictEqual(parent.column, 505, "Column mismatch"); - assert.strictEqual(parent.level, 9, "Level mismatch"); - }); - - it("Subtile can be added to the root tile", function() { - const rootTile = { row: 1, column: 1, level: 1 }; - const subTile = { row: 38, column: 91, level: 7 }; - const result = utils.addQuadKeys(rootTile, subTile); - assert.strictEqual(result.row, 166, "Row mismatch"); - assert.strictEqual(result.column, 219, "Column mismatch"); - assert.strictEqual(result.level, 8, "Level mismatch"); - }); - it("Tile is not valid if the row/column is out of bounds", function() { const invalid_tile_1 = { row: 5, column: 1, level: 1 }; assert.isFalse(utils.isValid(invalid_tile_1)); diff --git a/@here/olp-sdk-dataservice-read/test/unit/QuadTreeIndexRequest.test.ts b/@here/olp-sdk-dataservice-read/test/unit/QuadTreeIndexRequest.test.ts index 1743d28f..cbcd2954 100644 --- a/@here/olp-sdk-dataservice-read/test/unit/QuadTreeIndexRequest.test.ts +++ b/@here/olp-sdk-dataservice-read/test/unit/QuadTreeIndexRequest.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 HERE Europe B.V. + * Copyright (C) 2019-2021 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. @@ -22,6 +22,7 @@ import * as chai from "chai"; import sinonChai = require("sinon-chai"); import * as dataServiceRead from "../../lib"; +import { HRN } from "@here/olp-sdk-core"; chai.use(sinonChai); @@ -30,17 +31,14 @@ const expect = chai.expect; describe("QuadTreeIndexRequest", function() { const billingTag = "billingTag"; - const mockedHRN = dataServiceRead.HRN.fromString( - "hrn:here:data:::mocked-hrn" - ); + const mockedHRN = HRN.fromString("hrn:here:data:::mocked-hrn"); const mockedLayerId = "mocked-layed-id"; const mockedVersion = 42; const mockedLayerType = "volatile"; - const mockedDepth = 3; const mockedQuadKey = { row: 1, - column: 2, - level: 3 + column: 1, + level: 1 }; it("Should initialize", function() { @@ -74,9 +72,13 @@ describe("QuadTreeIndexRequest", function() { const quadTreeRequestWithBillTag = quadTreeRequest.withBillingTag( billingTag ); - const quadTreeRequestWithAddFields = quadTreeRequest.withAdditionalFields( - ["dataSize", "checksum", "compressedDataSize", "crc"] - ); + + quadTreeRequest.withAdditionalFields([ + "dataSize", + "checksum", + "compressedDataSize", + "crc" + ]); expect(quadTreeRequestWithVersion.getVersion()).to.be.equal( mockedVersion diff --git a/@here/olp-sdk-dataservice-read/test/unit/QueryClient.test.ts b/@here/olp-sdk-dataservice-read/test/unit/QueryClient.test.ts index ea0c687d..b7f11c6a 100644 --- a/@here/olp-sdk-dataservice-read/test/unit/QueryClient.test.ts +++ b/@here/olp-sdk-dataservice-read/test/unit/QueryClient.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 HERE Europe B.V. + * Copyright (C) 2019-2021 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. @@ -23,7 +23,7 @@ import sinonChai = require("sinon-chai"); import * as dataServiceRead from "../../lib"; import { MetadataApi, QueryApi } from "@here/olp-sdk-dataservice-api"; -import { RequestFactory } from "@here/olp-sdk-core"; +import * as core from "@here/olp-sdk-core"; chai.use(sinonChai); @@ -35,12 +35,10 @@ describe("QueryClient", function() { let getVersionStub: sinon.SinonStub; let getPartitionsByIdStub: sinon.SinonStub; let quadTreeIndexVolatileStub: sinon.SinonStub; - let olpClientSettingsStub: sinon.SinonStubbedInstance; + let olpClientSettingsStub: sinon.SinonStubbedInstance; let getBaseUrlRequestStub: sinon.SinonStub; - const mockedHRN = dataServiceRead.HRN.fromString( - "hrn:here:data:::mocked-hrn" - ); + const mockedHRN = core.HRN.fromString("hrn:here:data:::mocked-hrn"); const mockedLayerId = "mocked-layed-id"; const mockedLayerType = "volatile"; const fakeURL = "http://fake-base.url"; @@ -56,7 +54,7 @@ describe("QueryClient", function() { beforeEach(function() { olpClientSettingsStub = sandbox.createStubInstance( - dataServiceRead.OlpClientSettings + core.OlpClientSettings ); quadTreeIndexVolatileStub = sandbox.stub( QueryApi, @@ -64,7 +62,7 @@ describe("QueryClient", function() { ); getVersionStub = sandbox.stub(MetadataApi, "latestVersion"); getPartitionsByIdStub = sandbox.stub(QueryApi, "getPartitionsById"); - getBaseUrlRequestStub = sandbox.stub(RequestFactory, "getBaseUrl"); + getBaseUrlRequestStub = sandbox.stub(core.RequestFactory, "getBaseUrl"); getBaseUrlRequestStub.callsFake(() => Promise.resolve(fakeURL)); }); @@ -230,9 +228,7 @@ describe("QueryClient", function() { it("Should method getPartitionsById provide data with all parameters", async function() { const mockedIds = ["1", "2", "13", "42"]; const mockedLayerId = "fake-layer-id"; - const mockedHRN = dataServiceRead.HRN.fromString( - "hrn:here:data:::mocked-hrn" - ); + const mockedHRN = core.HRN.fromString("hrn:here:data:::mocked-hrn"); const mockedPartitionsResponse = { partitions: [ { @@ -248,7 +244,7 @@ describe("QueryClient", function() { }; const queryClient = new dataServiceRead.QueryClient( - new dataServiceRead.OlpClientSettings({ + new core.OlpClientSettings({ environment: "mocked-env", getToken: () => Promise.resolve("Mocked-token") }) @@ -278,9 +274,7 @@ describe("QueryClient", function() { it("Should method getPartitionsById return error if partitionIds list is not provided", async function() { const mockedErrorResponse = "Please provide correct partitionIds list"; const mockedLayerId = "fake-layer-id"; - const mockedHRN = dataServiceRead.HRN.fromString( - "hrn:here:data:::mocked-hrn" - ); + const mockedHRN = core.HRN.fromString("hrn:here:data:::mocked-hrn"); const queryClient = new dataServiceRead.QueryClient( olpClientSettingsStub as any ); diff --git a/@here/olp-sdk-dataservice-read/test/unit/SchemaDetailsRequest.test.ts b/@here/olp-sdk-dataservice-read/test/unit/SchemaDetailsRequest.test.ts index 7c1fefdd..295d3b55 100644 --- a/@here/olp-sdk-dataservice-read/test/unit/SchemaDetailsRequest.test.ts +++ b/@here/olp-sdk-dataservice-read/test/unit/SchemaDetailsRequest.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 HERE Europe B.V. + * Copyright (C) 2019-2021 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. @@ -21,7 +21,8 @@ import sinon = require("sinon"); import * as chai from "chai"; import sinonChai = require("sinon-chai"); -import { HRN, SchemaDetailsRequest } from "../../lib"; +import { SchemaDetailsRequest } from "../../lib"; +import { HRN } from "@here/olp-sdk-core"; chai.use(sinonChai); diff --git a/@here/olp-sdk-dataservice-read/test/unit/StatisticsClient.test.ts b/@here/olp-sdk-dataservice-read/test/unit/StatisticsClient.test.ts index c75dd6e7..78ad28ef 100644 --- a/@here/olp-sdk-dataservice-read/test/unit/StatisticsClient.test.ts +++ b/@here/olp-sdk-dataservice-read/test/unit/StatisticsClient.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 HERE Europe B.V. + * Copyright (C) 2019-2021 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. @@ -23,7 +23,7 @@ import sinonChai = require("sinon-chai"); import * as dataServiceRead from "../../lib"; import { CoverageApi } from "@here/olp-sdk-dataservice-api"; -import { RequestFactory } from "@here/olp-sdk-core"; +import * as core from "@here/olp-sdk-core"; chai.use(sinonChai); @@ -31,15 +31,13 @@ const assert = chai.assert; describe("StatistiscClient", function() { let sandbox: sinon.SinonSandbox; - let olpClientSettingsStub: sinon.SinonStubbedInstance; + let olpClientSettingsStub: sinon.SinonStubbedInstance; let getDataCoverageSummaryStub: sinon.SinonStub; let getStatisticsBitMapStub: sinon.SinonStub; let getStatisticsSizeMapStub: sinon.SinonStub; let getStatisticsTimeMapStub: sinon.SinonStub; let getBaseUrlRequestStub: sinon.SinonStub; - const mockedHRN = dataServiceRead.HRN.fromString( - "hrn:here:data:::mocked-hrn" - ); + const mockedHRN = core.HRN.fromString("hrn:here:data:::mocked-hrn"); const mockedLayerId = "mocked-layed-id"; const fakeURL = "http://fake-base.url"; @@ -49,9 +47,9 @@ describe("StatistiscClient", function() { beforeEach(function() { olpClientSettingsStub = sandbox.createStubInstance( - dataServiceRead.OlpClientSettings + core.OlpClientSettings ); - getBaseUrlRequestStub = sandbox.stub(RequestFactory, "getBaseUrl"); + getBaseUrlRequestStub = sandbox.stub(core.RequestFactory, "getBaseUrl"); getDataCoverageSummaryStub = sandbox.stub( CoverageApi, "getDataCoverageSummary" diff --git a/@here/olp-sdk-dataservice-read/test/unit/StatisticsRequest.test.ts b/@here/olp-sdk-dataservice-read/test/unit/StatisticsRequest.test.ts index 3587c104..62af6b10 100644 --- a/@here/olp-sdk-dataservice-read/test/unit/StatisticsRequest.test.ts +++ b/@here/olp-sdk-dataservice-read/test/unit/StatisticsRequest.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 HERE Europe B.V. + * Copyright (C) 2019-2021 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. @@ -21,7 +21,8 @@ import sinon = require("sinon"); import * as chai from "chai"; import sinonChai = require("sinon-chai"); -import { CoverageDataType, HRN, StatisticsRequest } from "../../lib"; +import { CoverageDataType, StatisticsRequest } from "../../lib"; +import { HRN } from "@here/olp-sdk-core"; chai.use(sinonChai); diff --git a/@here/olp-sdk-dataservice-read/test/unit/StreamLayerClient.test.ts b/@here/olp-sdk-dataservice-read/test/unit/StreamLayerClient.test.ts index 0e4b97cc..f378bf8e 100644 --- a/@here/olp-sdk-dataservice-read/test/unit/StreamLayerClient.test.ts +++ b/@here/olp-sdk-dataservice-read/test/unit/StreamLayerClient.test.ts @@ -22,7 +22,7 @@ import * as chai from "chai"; import sinonChai = require("sinon-chai"); import * as dataServiceRead from "../../lib"; -import { HttpError, RequestFactory } from "@here/olp-sdk-core"; +import * as core from "@here/olp-sdk-core"; import { BlobApi, StreamApi } from "@here/olp-sdk-dataservice-api"; @@ -71,24 +71,22 @@ describe("StreamLayerClient", function() { let getBlobStub: sinon.SinonStub; let seekOffsetsStub: sinon.SinonStub; let streamLayerClient: StreamLayerClientTest; - const mockedHRN = dataServiceRead.HRN.fromString( - "hrn:here:data:::mocked-hrn" - ); + const mockedHRN = core.HRN.fromString("hrn:here:data:::mocked-hrn"); const mockedLayerId = "mocked-layed-id"; const fakeURL = "http://fake-base.url"; - let settings: dataServiceRead.OlpClientSettings; + let settings: core.OlpClientSettings; let params: { - catalogHrn: dataServiceRead.HRN; + catalogHrn: core.HRN; layerId: string; - settings: dataServiceRead.OlpClientSettings; + settings: core.OlpClientSettings; }; before(function() { sandbox = sinon.createSandbox(); settings = (sandbox.createStubInstance( - dataServiceRead.OlpClientSettings - ) as unknown) as dataServiceRead.OlpClientSettings; + core.OlpClientSettings + ) as unknown) as core.OlpClientSettings; params = { catalogHrn: mockedHRN, layerId: mockedLayerId, @@ -104,7 +102,7 @@ describe("StreamLayerClient", function() { commitOffsetsStub = sandbox.stub(StreamApi, "doCommitOffsets"); unsubscribeStub = sandbox.stub(StreamApi, "deleteSubscription"); seekOffsetsStub = sandbox.stub(StreamApi, "seekToOffset"); - getBaseUrlRequestStub = sandbox.stub(RequestFactory, "getBaseUrl"); + getBaseUrlRequestStub = sandbox.stub(core.RequestFactory, "getBaseUrl"); getBaseUrlRequestStub.callsFake(() => Promise.resolve(fakeURL)); }); @@ -120,7 +118,7 @@ describe("StreamLayerClient", function() { assert.equal(streamLayerClient.getLatyerId(), mockedLayerId); assert.equal(streamLayerClient.getCatalogHrn(), mockedHRN); expect(streamLayerClient.getSettings()).be.instanceOf( - dataServiceRead.OlpClientSettings + core.OlpClientSettings ); }); @@ -242,13 +240,11 @@ describe("StreamLayerClient", function() { } ); - let settings = sandbox.createStubInstance( - dataServiceRead.OlpClientSettings - ); + let settings = sandbox.createStubInstance(core.OlpClientSettings); const params = { catalogHrn: mockedHRN, layerId: mockedLayerId, - settings: (settings as unknown) as dataServiceRead.OlpClientSettings + settings: (settings as unknown) as core.OlpClientSettings }; const subscribtionId = await streamLayerClient.subscribe( new dataServiceRead.SubscribeRequest().withMode("serial") @@ -382,7 +378,7 @@ describe("StreamLayerClient", function() { it("Should HttpError be handled", async function() { const TEST_ERROR_CODE = 404; - const mockedError = new HttpError(TEST_ERROR_CODE, "Test Error"); + const mockedError = new core.HttpError(TEST_ERROR_CODE, "Test Error"); const mockedMessage = { metaData: { diff --git a/@here/olp-sdk-dataservice-read/test/unit/SummaryRequest.test.ts b/@here/olp-sdk-dataservice-read/test/unit/SummaryRequest.test.ts index 5f7d423a..933011a5 100644 --- a/@here/olp-sdk-dataservice-read/test/unit/SummaryRequest.test.ts +++ b/@here/olp-sdk-dataservice-read/test/unit/SummaryRequest.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 HERE Europe B.V. + * Copyright (C) 2019-2021 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. @@ -21,7 +21,8 @@ import sinon = require("sinon"); import * as chai from "chai"; import sinonChai = require("sinon-chai"); -import { HRN, SummaryRequest } from "../../lib"; +import { SummaryRequest } from "../../lib"; +import { HRN } from "@here/olp-sdk-core"; chai.use(sinonChai); diff --git a/@here/olp-sdk-dataservice-read/test/unit/TileRequest.test.ts b/@here/olp-sdk-dataservice-read/test/unit/TileRequest.test.ts index 7b9a2a43..30750813 100644 --- a/@here/olp-sdk-dataservice-read/test/unit/TileRequest.test.ts +++ b/@here/olp-sdk-dataservice-read/test/unit/TileRequest.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 HERE Europe B.V. + * Copyright (C) 2020-2021 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. @@ -22,6 +22,7 @@ import * as chai from "chai"; import sinonChai = require("sinon-chai"); import * as dataServiceRead from "../../lib"; +import { FetchOptions } from "@here/olp-sdk-core"; chai.use(sinonChai); @@ -29,10 +30,6 @@ const assert = chai.assert; const expect = chai.expect; describe("TileRequest", function() { - const mockedHRN = dataServiceRead.HRN.fromString( - "hrn:here:data:::mocked-hrn" - ); - const mockedLayerId = "mocked-layed-id"; const mockedQuadKey = { row: 1, column: 2, @@ -41,22 +38,7 @@ describe("TileRequest", function() { const mockedBillingTag = "billing-tag"; - const mockedSettings: dataServiceRead.OlpClientSettings = new dataServiceRead.OlpClientSettings( - { - environment: "test-env", - getToken: () => Promise.resolve("test-token") - } - ); - - const tileRequestParams: dataServiceRead.TileRequestParams = { - catalogHrn: mockedHRN, - layerId: mockedLayerId, - layerType: "versioned", - settings: mockedSettings, - catalogVersion: 12 - }; - - const request = new dataServiceRead.TileRequest(tileRequestParams); + const request = new dataServiceRead.TileRequest(); it("Should initialize", function() { assert.isDefined(request); @@ -67,62 +49,10 @@ describe("TileRequest", function() { request .withTileKey(mockedQuadKey) .withBillingTag(mockedBillingTag) - .withFetchOption(dataServiceRead.FetchOptions.OnlineOnly); + .withFetchOption(FetchOptions.OnlineOnly); expect(request.getTileKey()).to.be.equal(mockedQuadKey); - expect(request.getFetchOption()).to.be.equal( - dataServiceRead.FetchOptions.OnlineOnly - ); + expect(request.getFetchOption()).to.be.equal(FetchOptions.OnlineOnly); expect(request.getBillingTag()).to.be.equal(mockedBillingTag); - expect(request.getParams()).to.be.equal(tileRequestParams); - expect(await request.getCatalogVersion()).to.be.equal(12); - }); - - it("Should fetch the latest version of catalog", async function() { - // @ts-ignore - class TileRequestTest extends dataServiceRead.TileRequest { - constructor(params: dataServiceRead.TileRequestParams) { - super(params); - } - - private async getCatalogLatestVersion(): Promise { - return Promise.resolve(32); - } - } - const tileRequestParams: dataServiceRead.TileRequestParams = { - catalogHrn: mockedHRN, - layerId: mockedLayerId, - layerType: "versioned", - settings: mockedSettings - }; - - const request = new TileRequestTest(tileRequestParams); - const version = await request.getCatalogVersion(); - - expect(version).to.be.equal(32); - }); - - it("Should be rejected with version error", async function() { - // @ts-ignore - class TileRequestTest extends dataServiceRead.TileRequest { - constructor(params: dataServiceRead.TileRequestParams) { - super(params); - } - - private async getCatalogLatestVersion(): Promise { - return Promise.reject("error getting version"); - } - } - const tileRequestParams: dataServiceRead.TileRequestParams = { - catalogHrn: mockedHRN, - layerId: mockedLayerId, - layerType: "versioned", - settings: mockedSettings - }; - - const request = new TileRequestTest(tileRequestParams); - await request.getCatalogVersion().catch(err => { - expect(err).to.be.equal("error getting version"); - }); }); }); diff --git a/@here/olp-sdk-dataservice-read/test/unit/VersionedLayerClient.test.ts b/@here/olp-sdk-dataservice-read/test/unit/VersionedLayerClient.test.ts index 9e99736b..2cc39d3d 100644 --- a/@here/olp-sdk-dataservice-read/test/unit/VersionedLayerClient.test.ts +++ b/@here/olp-sdk-dataservice-read/test/unit/VersionedLayerClient.test.ts @@ -24,7 +24,7 @@ import sinonChai = require("sinon-chai"); import * as dataServiceRead from "@here/olp-sdk-dataservice-read"; import { BlobApi, MetadataApi, QueryApi } from "@here/olp-sdk-dataservice-api"; import { Index } from "@here/olp-sdk-dataservice-api/lib/query-api"; -import { RequestFactory } from "@here/olp-sdk-core"; +import * as core from "@here/olp-sdk-core"; chai.use(sinonChai); @@ -40,9 +40,7 @@ describe("VersionedLayerClient", function() { let getVersionStub: sinon.SinonStub; let getBaseUrlRequestStub: sinon.SinonStub; let versionedLayerClient: dataServiceRead.VersionedLayerClient; - const mockedHRN = dataServiceRead.HRN.fromString( - "hrn:here:data:::mocked-hrn" - ); + const mockedHRN = core.HRN.fromString("hrn:here:data:::mocked-hrn"); const mockedLayerId = "mocked-layed-id"; const fakeURL = "http://fake-base.url"; const mockedPartitionsAddFields = { @@ -67,7 +65,7 @@ describe("VersionedLayerClient", function() { before(function() { sandbox = sinon.createSandbox(); - let settings = new dataServiceRead.OlpClientSettings({ + let settings = new core.OlpClientSettings({ environment: "here", getToken: () => Promise.resolve("token") }); @@ -96,7 +94,7 @@ describe("VersionedLayerClient", function() { getPartitionsByIdStub = sandbox.stub(QueryApi, "getPartitionsById"); getQuadTreeIndexStub = sandbox.stub(QueryApi, "quadTreeIndex"); getVersionStub = sandbox.stub(MetadataApi, "latestVersion"); - getBaseUrlRequestStub = sandbox.stub(RequestFactory, "getBaseUrl"); + getBaseUrlRequestStub = sandbox.stub(core.RequestFactory, "getBaseUrl"); getBaseUrlRequestStub.callsFake(() => Promise.resolve(fakeURL)); }); @@ -225,58 +223,6 @@ describe("VersionedLayerClient", function() { assert.isTrue(response.ok); }); - it("Should method getData provide data with quadKey", async function() { - const mockedBlobData = new Response("mocked-blob-response"); - const mockedVersion = { - version: 42 - }; - const mockedQuadKeyTreeData = { - subQuads: [ - { - version: 12, - subQuadKey: "1", - dataHandle: "c9116bb9-7d00-44bf-9b26-b4ab4c274665" - } - ], - parentQuads: [ - { - version: 12, - partition: "23618403", - dataHandle: "da51785a-54b0-40cd-95ac-760f56fe5457" - } - ] - }; - - getQuadTreeIndexStub.callsFake( - (builder: any, params: any): Promise => { - return Promise.resolve(mockedQuadKeyTreeData); - } - ); - getBlobStub.callsFake( - (builder: any, params: any): Promise => { - return Promise.resolve(mockedBlobData); - } - ); - getVersionStub.callsFake( - ( - builder: any, - params: any - ): Promise => { - return Promise.resolve(mockedVersion); - } - ); - - const dataRequest = new dataServiceRead.DataRequest().withQuadKey( - dataServiceRead.quadKeyFromMortonCode("23618403") - ); - - const response = await versionedLayerClient.getData( - (dataRequest as unknown) as dataServiceRead.DataRequest - ); - assert.isDefined(response); - assert.isTrue(response.ok); - }); - it("Should method getData return Error without dataRequest parameters", async function() { const mockedErrorResponse = "No data provided. Add dataHandle, partitionId or quadKey to the DataRequest object"; @@ -355,62 +301,6 @@ describe("VersionedLayerClient", function() { }); }); - it("Should method getData return Error with correct quadKey and wrong version parameter", async function() { - const dataRequest = new dataServiceRead.DataRequest().withQuadKey( - dataServiceRead.quadKeyFromMortonCode("23618403") - ); - - const mockedPartitionsIdData = { - status: 400, - title: "Bad request", - detail: [ - { - name: "version", - error: "Invalid version: latest known version is 181" - } - ] - }; - - getQuadTreeIndexStub.callsFake((builder: any, params: any): any => { - return Promise.resolve(mockedPartitionsIdData); - }); - - const response = await versionedLayerClient - .getData((dataRequest as unknown) as dataServiceRead.DataRequest) - .catch(error => { - assert.isDefined(error); - assert.equal(error, mockedPartitionsIdData); - }); - }); - - it("Should method getData return Error with incorrect quadKey", async function() { - const errorMessage = - "No dataHandle for quadKey {column: 15, row: 1, level: 5}. HRN: hrn:here:data:::mocked-hrn"; - const ERROR_STATUS = 204; - const mockedQuadKeyTreeData = { - subQuads: [], - parentQuads: [] - }; - - getQuadTreeIndexStub.callsFake( - (builder: any, params: any): Promise => { - return Promise.resolve(mockedQuadKeyTreeData); - } - ); - - const dataRequest = new dataServiceRead.DataRequest().withQuadKey( - dataServiceRead.quadKeyFromMortonCode("1111") - ); - - const response = await versionedLayerClient - .getData((dataRequest as unknown) as dataServiceRead.DataRequest) - .catch(error => { - assert.isDefined(error); - assert.equal(error.message, errorMessage); - assert.equal(error.status, ERROR_STATUS); - }); - }); - it("Should be aborted fetching by abort signal", async function() { const mockedBlobData = new Response("mocked-blob-response"); const mockedPartitionsIdData = { @@ -697,7 +587,7 @@ describe("VersionedLayerClient", function() { ); const quadKeyPartitionsRequest = new dataServiceRead.QuadKeyPartitionsRequest() - .withQuadKey(dataServiceRead.quadKeyFromMortonCode("23618403")) + .withQuadKey(core.TileKey.fromMortonCode(23618403)) .withAdditionalFields([ "dataSize", "checksum", @@ -813,34 +703,6 @@ describe("VersionedLayerClient", function() { }); }); - it("Should getPartitions with quadKey error be handled", async function() { - const mockedErrorResponse = "Bad response"; - const quadRrequest = new dataServiceRead.DataRequest().withQuadKey( - dataServiceRead.quadKeyFromMortonCode("23618403") - ); - - getVersionStub.callsFake(() => - Promise.reject({ - status: 400, - statusText: "Bad response" - }) - ); - - getQuadTreeIndexStub.callsFake(() => - Promise.reject({ - status: 400, - statusText: "Bad response" - }) - ); - - const data = await versionedLayerClient - .getData(quadRrequest) - .catch(error => { - assert.isDefined(error); - assert.equal(mockedErrorResponse, error.statusText); - }); - }); - it("Should getPartitions error be handled if error getting latest layer version", async function() { getVersionStub.callsFake(() => Promise.reject({ @@ -923,7 +785,7 @@ describe("VersionedLayerClient", function() { getPartitionIds: () => undefined, getAdditionalFields: () => undefined, getVersion: () => undefined, - getFetchOption: () => dataServiceRead.FetchOptions.OnlineOnly + getFetchOption: () => core.FetchOptions.OnlineOnly } as any); }); @@ -945,7 +807,7 @@ describe("VersionedLayerClient", function() { getPartitionIds: () => undefined, getAdditionalFields: () => undefined, getVersion: () => undefined, - getFetchOption: () => dataServiceRead.FetchOptions.OnlineOnly + getFetchOption: () => core.FetchOptions.OnlineOnly } as any); }); @@ -980,11 +842,9 @@ describe("VersionedLayerClient", function() { } } - QueryClientStub.callsFake( - (settings: dataServiceRead.OlpClientSettings) => { - return new MockedQueryClient(); - } - ); + QueryClientStub.callsFake((settings: core.OlpClientSettings) => { + return new MockedQueryClient(); + }); const partitionsRequest = new dataServiceRead.PartitionsRequest() .withPartitionIds(["23605706"]) @@ -1001,10 +861,10 @@ describe("VersionedLayerClient with locked version 0 in constructor", function() let sandbox: sinon.SinonSandbox; let client: dataServiceRead.VersionedLayerClient; - const mockedCatalogHRH = dataServiceRead.HRN.fromString( + const mockedCatalogHRH = core.HRN.fromString( "hrn:here:data:::example-catalog" ); - const mockedSettings = new dataServiceRead.OlpClientSettings({ + const mockedSettings = new core.OlpClientSettings({ environment: "mocked-env", getToken: () => Promise.resolve("mocked-token") }); @@ -1054,15 +914,13 @@ describe("VersionedLayerClient with locked version 0 in constructor", function() } } - QueryClientStub.callsFake( - (settings: dataServiceRead.OlpClientSettings) => { - return new MockedQueryClient(); - } - ); + QueryClientStub.callsFake((settings: core.OlpClientSettings) => { + return new MockedQueryClient(); + }); await client.getPartitions( new dataServiceRead.QuadKeyPartitionsRequest().withQuadKey( - dataServiceRead.quadKeyFromMortonCode(1000) + core.TileKey.fromMortonCode(1000) ) ); }); @@ -1112,7 +970,7 @@ describe("VersionedLayerClient with locked version 0 in constructor", function() builderType: any, hrn?: any, abortSignal?: AbortSignal - ): Promise { + ): Promise { return Promise.resolve(new Response()) as any; } } diff --git a/@here/olp-sdk-dataservice-read/test/unit/VolatileLayerClient.test.ts b/@here/olp-sdk-dataservice-read/test/unit/VolatileLayerClient.test.ts index cb7f977f..639c3261 100644 --- a/@here/olp-sdk-dataservice-read/test/unit/VolatileLayerClient.test.ts +++ b/@here/olp-sdk-dataservice-read/test/unit/VolatileLayerClient.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2020 HERE Europe B.V. + * Copyright (C) 2019-2021 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. @@ -27,7 +27,7 @@ import { QueryApi, VolatileBlobApi } from "@here/olp-sdk-dataservice-api"; -import { RequestFactory } from "@here/olp-sdk-core"; +import * as core from "@here/olp-sdk-core"; chai.use(sinonChai); @@ -43,9 +43,7 @@ describe("VolatileLayerClient", function() { let getQuadTreeIndexStub: sinon.SinonStub; let getBaseUrlRequestStub: sinon.SinonStub; let volatileLayerClient: dataServiceRead.VolatileLayerClient; - const mockedHRN = dataServiceRead.HRN.fromString( - "hrn:here:data:::mocked-hrn" - ); + const mockedHRN = core.HRN.fromString("hrn:here:data:::mocked-hrn"); const mockedLayerId = "mocked-layed-id"; const fakeURL = "http://fake-base.url"; @@ -71,7 +69,7 @@ describe("VolatileLayerClient", function() { before(function() { sandbox = sinon.createSandbox(); - let settings = new dataServiceRead.OlpClientSettings({ + let settings = new core.OlpClientSettings({ environment: "here", getToken: () => Promise.resolve("token") }); @@ -92,7 +90,7 @@ describe("VolatileLayerClient", function() { getVersionStub = sandbox.stub(MetadataApi, "latestVersion"); getPartitionsByIdStub = sandbox.stub(QueryApi, "getPartitionsById"); getQuadTreeIndexStub = sandbox.stub(QueryApi, "quadTreeIndexVolatile"); - getBaseUrlRequestStub = sandbox.stub(RequestFactory, "getBaseUrl"); + getBaseUrlRequestStub = sandbox.stub(core.RequestFactory, "getBaseUrl"); getBaseUrlRequestStub.callsFake(() => Promise.resolve(fakeURL)); }); @@ -293,7 +291,7 @@ describe("VolatileLayerClient", function() { ); const quadKeyPartitionsRequest = new dataServiceRead.QuadKeyPartitionsRequest() - .withQuadKey(dataServiceRead.quadKeyFromMortonCode("23618403")) + .withQuadKey(core.TileKey.fromMortonCode(23618403)) .withAdditionalFields([ "dataSize", "checksum", @@ -384,75 +382,6 @@ describe("VolatileLayerClient", function() { assert.isTrue(response.ok); }); - it("Should method getData provide data with quadKey", async function() { - const mockedBlobData = new Response("mocked-blob-response"); - const mockedVersion = { - version: 42 - }; - - const mockedQuadKeyTreeData = { - subQuads: [ - { - version: 12, - subQuadKey: "1", - dataHandle: "c9116bb9-7d00-44bf-9b26-b4ab4c274665" - } - ], - parentQuads: [ - { - version: 12, - partition: "23618403", - dataHandle: "da51785a-54b0-40cd-95ac-760f56fe5457" - } - ] - }; - - getQuadTreeIndexStub.callsFake( - (builder: any, params: any): Promise => { - return Promise.resolve(mockedQuadKeyTreeData); - } - ); - getVersionStub.callsFake( - ( - builder: any, - params: any - ): Promise => { - return Promise.resolve(mockedVersion); - } - ); - const mockedPartitions = { - partitions: [ - { - version: 1, - partition: "42", - dataHandle: "3C3BE24A341D82321A9BA9075A7EF498.123" - }, - { - version: 42, - partition: "42", - dataHandle: "3C3BE24A341D82321A9BA9075A7EF498.123" - } - ] - }; - getPartitionsStub.callsFake( - (builder: any, params: any): Promise => { - return Promise.resolve(mockedPartitions); - } - ); - getBlobStub.callsFake( - (builder: any, params: any): Promise => { - return Promise.resolve(mockedBlobData); - } - ); - - const dataRequest = new dataServiceRead.DataRequest().withQuadKey( - dataServiceRead.quadKeyFromMortonCode("23618403") - ); - - const response = await volatileLayerClient.getData(dataRequest as any); - assert.isDefined(response); - }); - it("Should method getData return Error without dataRequest parameters", async function() { const mockedErrorResponse = { message: @@ -469,9 +398,7 @@ describe("VolatileLayerClient", function() { }); it("Should method getData return Error with correct partitionId and wrong layerId", async function() { - let settings = sandbox.createStubInstance( - dataServiceRead.OlpClientSettings - ); + let settings = sandbox.createStubInstance(core.OlpClientSettings); const volatileClient = new dataServiceRead.VolatileLayerClient({ catalogHrn: mockedHRN, layerId: mockedLayerId, @@ -505,46 +432,6 @@ describe("VolatileLayerClient", function() { }); }); - it("Should method getData return Error with incorrect quadKey", async function() { - const errorMessage = - "No dataHandle for quadKey {column: 15, row: 1, level: 5}. HRN: hrn:here:data:::mocked-hrn"; - const ERROR_STATUS = 204; - const mockedQuadKeyTreeData = { - subQuads: [], - parentQuads: [] - }; - const mockedVersion = { - version: 42 - }; - - getQuadTreeIndexStub.callsFake( - (builder: any, params: any): Promise => { - return Promise.resolve(mockedQuadKeyTreeData); - } - ); - - getVersionStub.callsFake( - ( - builder: any, - params: any - ): Promise => { - return Promise.resolve(mockedVersion); - } - ); - - const dataRequest = new dataServiceRead.DataRequest().withQuadKey( - dataServiceRead.quadKeyFromMortonCode("1111") - ); - - const response = await volatileLayerClient - .getData((dataRequest as unknown) as dataServiceRead.DataRequest) - .catch(error => { - assert.isDefined(error); - assert.equal(error.message, errorMessage); - assert.equal(error.status, ERROR_STATUS); - }); - }); - it("Should baseUrl error be handled", async function() { const mockedErrorResponse = "Bad response"; const dataRequest = new dataServiceRead.DataRequest().withDataHandle( @@ -589,27 +476,6 @@ describe("VolatileLayerClient", function() { }); }); - it("Should getPartitions with quadKey error be handled", async function() { - const mockedErrorResponse = "Bad response"; - - const quadRrequest = new dataServiceRead.DataRequest().withQuadKey( - dataServiceRead.quadKeyFromMortonCode("23618403") - ); - - getQuadTreeIndexStub.callsFake(() => - Promise.reject({ - status: 400, - statusText: "Bad response" - }) - ); - - const data = await volatileLayerClient - .getData(quadRrequest) - .catch(error => { - assert.isDefined(error); - }); - }); - it("VolatileLayerClient instance should be initialized with VolatileLayerClientParams", async function() { assert.isDefined(volatileLayerClient); assert.equal(volatileLayerClient["hrn"], "hrn:here:data:::mocked-hrn"); @@ -640,11 +506,9 @@ describe("VolatileLayerClient", function() { } } - QueryClientStub.callsFake( - (settings: dataServiceRead.OlpClientSettings) => { - return new MockedQueryClient(); - } - ); + QueryClientStub.callsFake((settings: core.OlpClientSettings) => { + return new MockedQueryClient(); + }); const partitionsRequest = new dataServiceRead.PartitionsRequest() .withPartitionIds(["23605706"]) diff --git a/@here/olp-sdk-dataservice-read/test/unit/getTile.test.ts b/@here/olp-sdk-dataservice-read/test/unit/getTile.test.ts index c9d53f41..a1fdf5e6 100644 --- a/@here/olp-sdk-dataservice-read/test/unit/getTile.test.ts +++ b/@here/olp-sdk-dataservice-read/test/unit/getTile.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 HERE Europe B.V. + * Copyright (C) 2020-2021 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. @@ -31,15 +31,15 @@ describe("getTile", function() { } }); - const request = new TileRequest({ - settings, - catalogHrn: HRN.fromString("hrn:here:data:::mocked-hrn"), - layerId: "mocked-layer-id", - layerType: "versioned" - }); + const request = new TileRequest(); it("Should throw an error if not tile key", async function() { - const tile = await getTile(request).catch(err => err.message); + const tile = await getTile(request, { + settings, + catalogHrn: HRN.fromString("hrn:here:data:::mocked-hrn"), + layerId: "mocked-layer-id", + layerType: "versioned" + }).catch(err => err.message); assert.isTrue(tile === "Please provide correct QuadKey"); }); }); diff --git a/tests/functional/StreamLayerReadData.test.ts b/tests/functional/StreamLayerReadData.test.ts index c11ab9cf..d3c1c750 100644 --- a/tests/functional/StreamLayerReadData.test.ts +++ b/tests/functional/StreamLayerReadData.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 HERE Europe B.V. + * Copyright (C) 2020-2021 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. @@ -38,14 +38,13 @@ const MOCKED_SUBSCRIBTION_ID = "882990694"; import "@here/olp-sdk-fetch"; import { - OlpClientSettings, StreamLayerClient, - HRN, SubscribeRequest, PollRequest, UnsubscribeRequest, SeekRequest } from "@here/olp-sdk-dataservice-read"; +import { HRN, OlpClientSettings } from "@here/olp-sdk-core"; describe("Stream Layer Client Read Data", async function() { const olpClientSettings = new OlpClientSettings({ diff --git a/tests/integration/api-breaks/ArtifactClient.test.ts b/tests/integration/api-breaks/ArtifactClient.test.ts index abc90c9d..93125d29 100644 --- a/tests/integration/api-breaks/ArtifactClient.test.ts +++ b/tests/integration/api-breaks/ArtifactClient.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 HERE Europe B.V. + * Copyright (C) 2020-2021 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. @@ -20,12 +20,10 @@ import sinon = require("sinon"); import * as chai from "chai"; import sinonChai = require("sinon-chai"); -import { - ArtifactClient, - OlpClientSettings -} from "@here/olp-sdk-dataservice-read"; +import { ArtifactClient } from "@here/olp-sdk-dataservice-read"; import * as dataServiceRead from "@here/olp-sdk-dataservice-read"; import * as dataServiceApi from "@here/olp-sdk-dataservice-api"; +import * as dataserviceCore from "@here/olp-sdk-core"; chai.use(sinonChai); @@ -34,7 +32,7 @@ const expect = chai.expect; describe("ArtifactClient", function() { class ArtifactClientTest extends ArtifactClient { - constructor(settings: OlpClientSettings) { + constructor(settings: dataserviceCore.OlpClientSettings) { super(settings); } @@ -58,7 +56,7 @@ describe("ArtifactClient", function() { } } - let settings = new OlpClientSettings({ + let settings = new dataserviceCore.OlpClientSettings({ environment: "here", getToken: () => Promise.resolve("mocked-token") }); diff --git a/tests/integration/api-breaks/CatalogClient.test.ts b/tests/integration/api-breaks/CatalogClient.test.ts index 5a4fa388..c402f708 100644 --- a/tests/integration/api-breaks/CatalogClient.test.ts +++ b/tests/integration/api-breaks/CatalogClient.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 HERE Europe B.V. + * Copyright (C) 2020-2021 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. @@ -20,13 +20,10 @@ import sinon = require("sinon"); import * as chai from "chai"; import sinonChai = require("sinon-chai"); -import { - CatalogClient, - HRN, - OlpClientSettings -} from "@here/olp-sdk-dataservice-read"; +import { CatalogClient } from "@here/olp-sdk-dataservice-read"; import * as dataServiceRead from "@here/olp-sdk-dataservice-read"; import * as dataServiceApi from "@here/olp-sdk-dataservice-api"; +import { HRN, OlpClientSettings } from "@here/olp-sdk-core"; chai.use(sinonChai); diff --git a/tests/integration/api-breaks/ConfigClient.test.ts b/tests/integration/api-breaks/ConfigClient.test.ts index 6f85138a..759c2910 100644 --- a/tests/integration/api-breaks/ConfigClient.test.ts +++ b/tests/integration/api-breaks/ConfigClient.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 HERE Europe B.V. + * Copyright (C) 2020-2021 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. @@ -20,12 +20,10 @@ import sinon = require("sinon"); import * as chai from "chai"; import sinonChai = require("sinon-chai"); -import { - ConfigClient, - OlpClientSettings -} from "@here/olp-sdk-dataservice-read"; +import { ConfigClient } from "@here/olp-sdk-dataservice-read"; import * as dataServiceRead from "@here/olp-sdk-dataservice-read"; import * as dataServiceApi from "@here/olp-sdk-dataservice-api"; +import { OlpClientSettings } from "@here/olp-sdk-core"; chai.use(sinonChai); diff --git a/tests/integration/api-breaks/DataRequest.test.ts b/tests/integration/api-breaks/DataRequest.test.ts index a3625e71..dcc63560 100644 --- a/tests/integration/api-breaks/DataRequest.test.ts +++ b/tests/integration/api-breaks/DataRequest.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 HERE Europe B.V. + * Copyright (C) 2020-2021 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. @@ -19,11 +19,7 @@ import * as chai from "chai"; import sinonChai = require("sinon-chai"); -import { - DataRequest, - QuadKey, - validateBillingTag -} from "@here/olp-sdk-dataservice-read"; +import { DataRequest } from "@here/olp-sdk-dataservice-read"; chai.use(sinonChai); @@ -48,18 +44,6 @@ describe("DataRequest", function() { return this; } - getQuadKey(): QuadKey | undefined { - return { - row: 5, - column: 5, - level: 5 - }; - } - - withQuadKey(quadKey: QuadKey): DataRequest { - return this; - } - getVersion(): number | undefined { return 5; } @@ -82,8 +66,6 @@ describe("DataRequest", function() { assert.isDefined(request); expect(request).to.be.instanceOf(DataRequest); - assert.isFunction(request.withQuadKey); - assert.isFunction(request.getQuadKey); assert.isFunction(request.withPartitionId); assert.isFunction(request.getPartitionId); assert.isFunction(request.withDataHandle); @@ -106,24 +88,6 @@ describe("DataRequest", function() { assert.isDefined(response); }); - it("Test withQuadKey method with quadKey", async function() { - const request = new DataRequestTest(); - - const response = request.withQuadKey({ - row: 5, - column: 5, - level: 5 - }); - assert.isDefined(response); - }); - - it("Test getQuadKey method without params", async function() { - const request = new DataRequestTest(); - - const response = request.getQuadKey(); - assert.isDefined(response); - }); - it("Test withPartitionId method with id", async function() { const request = new DataRequestTest(); diff --git a/tests/integration/api-breaks/IndexLayerClient.test.ts b/tests/integration/api-breaks/IndexLayerClient.test.ts index fe6ea8f0..81268572 100644 --- a/tests/integration/api-breaks/IndexLayerClient.test.ts +++ b/tests/integration/api-breaks/IndexLayerClient.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 HERE Europe B.V. + * Copyright (C) 2020-2021 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. @@ -21,12 +21,11 @@ import * as chai from "chai"; import sinonChai = require("sinon-chai"); import { IndexLayerClient, - OlpClientSettings, - HRN, IndexLayerClientParams, IndexQueryRequest } from "@here/olp-sdk-dataservice-read"; import { IndexApi } from "@here/olp-sdk-dataservice-api"; +import { HRN, OlpClientSettings } from "@here/olp-sdk-core"; chai.use(sinonChai); diff --git a/tests/integration/api-breaks/KeyValueCache.test.ts b/tests/integration/api-breaks/KeyValueCache.test.ts index 7c403c01..f573e43b 100644 --- a/tests/integration/api-breaks/KeyValueCache.test.ts +++ b/tests/integration/api-breaks/KeyValueCache.test.ts @@ -20,7 +20,7 @@ import * as chai from "chai"; import sinonChai = require("sinon-chai"); -import { KeyValueCache } from "@here/olp-sdk-dataservice-read"; +import { KeyValueCache } from "@here/olp-sdk-core"; chai.use(sinonChai); diff --git a/tests/integration/api-breaks/QuadKeyPartitionsRequest.test.ts b/tests/integration/api-breaks/QuadKeyPartitionsRequest.test.ts index aa8d63c2..ef2d4597 100644 --- a/tests/integration/api-breaks/QuadKeyPartitionsRequest.test.ts +++ b/tests/integration/api-breaks/QuadKeyPartitionsRequest.test.ts @@ -22,9 +22,9 @@ import sinonChai = require("sinon-chai"); import { AdditionalFields } from "@here/olp-sdk-dataservice-api"; import { QuadKeyPartitionsRequest, - QuadKey, QuadTreeIndexDepth } from "@here/olp-sdk-dataservice-read"; +import { QuadKey } from "@here/olp-sdk-core"; chai.use(sinonChai); diff --git a/tests/integration/api-breaks/QuadTreeIndexRequest.test.ts b/tests/integration/api-breaks/QuadTreeIndexRequest.test.ts index 365a130a..6c934cef 100644 --- a/tests/integration/api-breaks/QuadTreeIndexRequest.test.ts +++ b/tests/integration/api-breaks/QuadTreeIndexRequest.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 HERE Europe B.V. + * Copyright (C) 2020-2021 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. @@ -20,12 +20,11 @@ import * as chai from "chai"; import sinonChai = require("sinon-chai"); import { - HRN, - QuadKey, QuadTreeIndexDepth, QuadTreeIndexRequest } from "@here/olp-sdk-dataservice-read"; import { AdditionalFields } from "@here/olp-sdk-dataservice-api"; +import { QuadKey, HRN } from "@here/olp-sdk-core"; chai.use(sinonChai); diff --git a/tests/integration/api-breaks/QueryClient.test.ts b/tests/integration/api-breaks/QueryClient.test.ts index fc0d0587..7facabe5 100644 --- a/tests/integration/api-breaks/QueryClient.test.ts +++ b/tests/integration/api-breaks/QueryClient.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 HERE Europe B.V. + * Copyright (C) 2020-2021 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. @@ -20,9 +20,10 @@ import sinon = require("sinon"); import * as chai from "chai"; import sinonChai = require("sinon-chai"); -import { QueryClient, OlpClientSettings } from "@here/olp-sdk-dataservice-read"; +import { QueryClient } from "@here/olp-sdk-dataservice-read"; import * as dataServiceRead from "@here/olp-sdk-dataservice-read"; import * as dataServiceApi from "@here/olp-sdk-dataservice-api"; +import { HRN, OlpClientSettings } from "@here/olp-sdk-core"; chai.use(sinonChai); @@ -48,7 +49,7 @@ describe("QueryClient", function() { public async getPartitionsById( request: dataServiceRead.PartitionsRequest, layerId: string, - hrn: dataServiceRead.HRN, + hrn: HRN, abortSignal?: AbortSignal ): Promise { return { @@ -63,9 +64,7 @@ describe("QueryClient", function() { getToken: () => Promise.resolve("mocked-token") }); - const testCatalogHrn = dataServiceRead.HRN.fromString( - "hrn:here:data:::mocked-hrn" - ); + const testCatalogHrn = HRN.fromString("hrn:here:data:::mocked-hrn"); it("Shoud be initialized with arguments", async function() { const queryClient = new QueryClient(settings); diff --git a/tests/integration/api-breaks/SchemaDetailsRequest.test.ts b/tests/integration/api-breaks/SchemaDetailsRequest.test.ts index c4270811..3f7f4337 100644 --- a/tests/integration/api-breaks/SchemaDetailsRequest.test.ts +++ b/tests/integration/api-breaks/SchemaDetailsRequest.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 HERE Europe B.V. + * Copyright (C) 2020-2021 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. @@ -19,7 +19,8 @@ import * as chai from "chai"; import sinonChai = require("sinon-chai"); -import { HRN, SchemaDetailsRequest } from "@here/olp-sdk-dataservice-read"; +import { SchemaDetailsRequest } from "@here/olp-sdk-dataservice-read"; +import { HRN } from "@here/olp-sdk-core"; chai.use(sinonChai); diff --git a/tests/integration/api-breaks/StatisticsClient.test.ts b/tests/integration/api-breaks/StatisticsClient.test.ts index 9e41072e..c0789a2b 100644 --- a/tests/integration/api-breaks/StatisticsClient.test.ts +++ b/tests/integration/api-breaks/StatisticsClient.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 HERE Europe B.V. + * Copyright (C) 2020-2021 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. @@ -20,12 +20,10 @@ import sinon = require("sinon"); import * as chai from "chai"; import sinonChai = require("sinon-chai"); -import { - StatisticsClient, - OlpClientSettings -} from "@here/olp-sdk-dataservice-read"; +import { StatisticsClient } from "@here/olp-sdk-dataservice-read"; import * as dataServiceRead from "@here/olp-sdk-dataservice-read"; import * as dataServiceApi from "@here/olp-sdk-dataservice-api"; +import { OlpClientSettings } from "@here/olp-sdk-core"; chai.use(sinonChai); diff --git a/tests/integration/api-breaks/StatisticsRequest.test.ts b/tests/integration/api-breaks/StatisticsRequest.test.ts index f6c2c6a5..b4c72570 100644 --- a/tests/integration/api-breaks/StatisticsRequest.test.ts +++ b/tests/integration/api-breaks/StatisticsRequest.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 HERE Europe B.V. + * Copyright (C) 2020-2021 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. @@ -19,8 +19,8 @@ import * as chai from "chai"; import sinonChai = require("sinon-chai"); -import { HRN, StatisticsRequest } from "@here/olp-sdk-dataservice-read"; -import { AdditionalFields } from "@here/olp-sdk-dataservice-api"; +import { StatisticsRequest } from "@here/olp-sdk-dataservice-read"; +import { HRN } from "@here/olp-sdk-core"; chai.use(sinonChai); diff --git a/tests/integration/api-breaks/StreamLayerClient.test.ts b/tests/integration/api-breaks/StreamLayerClient.test.ts index 6368ca6c..fb022fc5 100644 --- a/tests/integration/api-breaks/StreamLayerClient.test.ts +++ b/tests/integration/api-breaks/StreamLayerClient.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 HERE Europe B.V. + * Copyright (C) 2020-2021 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. @@ -21,8 +21,6 @@ import * as chai from "chai"; import sinonChai = require("sinon-chai"); import { StreamLayerClient, - OlpClientSettings, - HRN, StreamLayerClientParams, PollRequest, SeekRequest, @@ -30,6 +28,7 @@ import { UnsubscribeRequest } from "@here/olp-sdk-dataservice-read"; import { StreamApi } from "@here/olp-sdk-dataservice-api"; +import { HRN, OlpClientSettings } from "@here/olp-sdk-core"; chai.use(sinonChai); diff --git a/tests/integration/api-breaks/SummaryRequest.test.ts b/tests/integration/api-breaks/SummaryRequest.test.ts index 6d53fda9..32b3e1e5 100644 --- a/tests/integration/api-breaks/SummaryRequest.test.ts +++ b/tests/integration/api-breaks/SummaryRequest.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 HERE Europe B.V. + * Copyright (C) 2020-2021 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. @@ -21,8 +21,7 @@ import * as chai from "chai"; import sinonChai = require("sinon-chai"); import { SummaryRequest } from "@here/olp-sdk-dataservice-read"; -import * as dataServiceRead from "@here/olp-sdk-dataservice-read"; -import * as dataServiceApi from "@here/olp-sdk-dataservice-api"; +import { HRN } from "@here/olp-sdk-core"; chai.use(sinonChai); @@ -30,9 +29,7 @@ const assert = chai.assert; const expect = chai.expect; describe("SummaryRequest", function() { - const testCatalogHrn = dataServiceRead.HRN.fromString( - "hrn:here:data:::mocked-hrn" - ); + const testCatalogHrn = HRN.fromString("hrn:here:data:::mocked-hrn"); it("Shoud be initialized with arguments", async function() { const client = new SummaryRequest(); diff --git a/tests/integration/api-breaks/VersionedLayerClient.test.ts b/tests/integration/api-breaks/VersionedLayerClient.test.ts index e7c2f57b..833e4679 100644 --- a/tests/integration/api-breaks/VersionedLayerClient.test.ts +++ b/tests/integration/api-breaks/VersionedLayerClient.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 HERE Europe B.V. + * Copyright (C) 2020-2021 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. @@ -21,14 +21,13 @@ import * as chai from "chai"; import sinonChai = require("sinon-chai"); import { VersionedLayerClient, - OlpClientSettings, - HRN, VersionedLayerClientParams, QuadKeyPartitionsRequest, DataRequest, PartitionsRequest } from "@here/olp-sdk-dataservice-read"; import { QueryApi, MetadataApi } from "@here/olp-sdk-dataservice-api"; +import { HRN, OlpClientSettings } from "@here/olp-sdk-core"; chai.use(sinonChai); diff --git a/tests/integration/api-breaks/VolatileLayerClient.test.ts b/tests/integration/api-breaks/VolatileLayerClient.test.ts index 91b7d1a8..65c10d83 100644 --- a/tests/integration/api-breaks/VolatileLayerClient.test.ts +++ b/tests/integration/api-breaks/VolatileLayerClient.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 HERE Europe B.V. + * Copyright (C) 2020-2021 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. @@ -21,14 +21,13 @@ import * as chai from "chai"; import sinonChai = require("sinon-chai"); import { VolatileLayerClient, - OlpClientSettings, - HRN, VolatileLayerClientParams, QuadKeyPartitionsRequest, DataRequest, PartitionsRequest } from "@here/olp-sdk-dataservice-read"; import { QueryApi, MetadataApi } from "@here/olp-sdk-dataservice-api"; +import { HRN, OlpClientSettings } from "@here/olp-sdk-core"; chai.use(sinonChai); diff --git a/tests/integration/bundles/umd/olp-sdk-dataservice-read-testCases.ts b/tests/integration/bundles/umd/olp-sdk-dataservice-read-testCases.ts index 2b0ecb0c..02079875 100644 --- a/tests/integration/bundles/umd/olp-sdk-dataservice-read-testCases.ts +++ b/tests/integration/bundles/umd/olp-sdk-dataservice-read-testCases.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 HERE Europe B.V. + * Copyright (C) 2019-2021 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. @@ -25,18 +25,6 @@ export const OlpSdkDataserviceReadTestCases: { it: string; callback: () => void; }[] = [ - { - it: "OlpClientSettings should be defined", - callback: function() { - assert(Module.OlpClientSettings !== undefined); - } - }, - { - it: "RequestFactory should be defined", - callback: function() { - assert(Module.RequestFactory !== undefined); - } - }, { it: "StatisticsRequest should be defined", callback: function() { @@ -61,42 +49,12 @@ export const OlpSdkDataserviceReadTestCases: { assert(Module.VolatileLayerClient !== undefined); } }, - { - it: "addQuadKeys should be defined", - callback: function() { - assert(Module.addQuadKeys !== undefined); - } - }, - { - it: "computeParentKey should be defined", - callback: function() { - assert(Module.computeParentKey !== undefined); - } - }, - { - it: "getEnvLookUpUrl should be defined", - callback: function() { - assert(Module.getEnvLookUpUrl !== undefined); - } - }, { it: "isValid should be defined", callback: function() { assert(Module.isValid !== undefined); } }, - { - it: "mortonCodeFromQuadKey should be defined", - callback: function() { - assert(Module.mortonCodeFromQuadKey !== undefined); - } - }, - { - it: "quadKeyFromMortonCode should be defined", - callback: function() { - assert(Module.quadKeyFromMortonCode !== undefined); - } - }, { it: "validateBillingTag should be defined", callback: function() { @@ -109,12 +67,6 @@ export const OlpSdkDataserviceReadTestCases: { assert(Module.validatePartitionsIdsList !== undefined); } }, - { - it: "ApiCacheRepository should be defined", - callback: function() { - assert(Module.ApiCacheRepository !== undefined); - } - }, { it: "ArtifactClient should be defined", callback: function() { @@ -157,36 +109,6 @@ export const OlpSdkDataserviceReadTestCases: { assert(Module.DataRequest !== undefined); } }, - { - it: "DataStoreDownloadManager should be defined", - callback: function() { - assert(Module.DataStoreDownloadManager !== undefined); - } - }, - { - it: "DataStoreRequestBuilder should be defined", - callback: function() { - assert(Module.DataStoreRequestBuilder !== undefined); - } - }, - { - it: "HRN should be defined", - callback: function() { - assert(Module.HRN !== undefined); - } - }, - { - it: "KeyValueCache should be defined", - callback: function() { - assert(Module.KeyValueCache !== undefined); - } - }, - { - it: "LayerVersionsRequest should be defined", - callback: function() { - assert(Module.LayerVersionsRequest !== undefined); - } - }, { it: "PartitionsRequest should be defined", callback: function() { diff --git a/tests/integration/olp-sdk-dataservice-read/ArtifactClient.test.ts b/tests/integration/olp-sdk-dataservice-read/ArtifactClient.test.ts index 61316a8a..c4558c64 100644 --- a/tests/integration/olp-sdk-dataservice-read/ArtifactClient.test.ts +++ b/tests/integration/olp-sdk-dataservice-read/ArtifactClient.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 HERE Europe B.V. + * Copyright (C) 2020-2021 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. @@ -21,15 +21,12 @@ import * as sinon from "sinon"; import * as chai from "chai"; import sinonChai = require("sinon-chai"); import { - OlpClientSettings, ArtifactClient, SchemaRequest, - SchemaDetailsRequest, - HRN + SchemaDetailsRequest } from "@here/olp-sdk-dataservice-read"; import { FetchMock } from "../FetchMock"; -import { LIB_VERSION } from "@here/olp-sdk-dataservice-read/lib.version"; -import { HttpError } from "@here/olp-sdk-core"; +import * as core from "@here/olp-sdk-core"; chai.use(sinonChai); @@ -41,7 +38,7 @@ describe("ArtifactClient", function() { let sandbox: sinon.SinonSandbox; let fetchStub: sinon.SinonStub; let artifactClient: ArtifactClient; - let settings: OlpClientSettings; + let settings: core.OlpClientSettings; before(function() { sandbox = sinon.createSandbox(); @@ -57,7 +54,7 @@ describe("ArtifactClient", function() { fetchStub.callsFake(fetchMock.fetch()); // Setup Artifact Client with new OlpClientSettings. - settings = new OlpClientSettings({ + settings = new core.OlpClientSettings({ environment: "here", getToken: () => Promise.resolve("test-token-string") }); @@ -147,7 +144,9 @@ describe("ArtifactClient", function() { fetchMock.withMockedResponses(mockedResponses); const request = new SchemaDetailsRequest().withSchema( - HRN.fromString("hrn:here:schema:::com.here.schema.mock:test_v2:2.38.0") + core.HRN.fromString( + "hrn:here:schema:::com.here.schema.mock:test_v2:2.38.0" + ) ); const response = await artifactClient.getSchemaDetails(request); diff --git a/tests/integration/olp-sdk-dataservice-read/CatalogClient.test.ts b/tests/integration/olp-sdk-dataservice-read/CatalogClient.test.ts index f4e90ff5..3461249f 100644 --- a/tests/integration/olp-sdk-dataservice-read/CatalogClient.test.ts +++ b/tests/integration/olp-sdk-dataservice-read/CatalogClient.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2020 HERE Europe B.V. + * Copyright (C) 2019-2021 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. @@ -21,15 +21,13 @@ import * as sinon from "sinon"; import * as chai from "chai"; import sinonChai = require("sinon-chai"); import { - OlpClientSettings, - HRN, CatalogVersionRequest, CatalogClient, CatalogRequest, LayerVersionsRequest } from "@here/olp-sdk-dataservice-read"; import { FetchMock } from "../FetchMock"; -import { LIB_VERSION } from "@here/olp-sdk-core"; +import * as core from "@here/olp-sdk-core"; chai.use(sinonChai); @@ -41,7 +39,7 @@ describe("CatalogClient", function() { let sandbox: sinon.SinonSandbox; let fetchStub: sinon.SinonStub; let catalogClient: CatalogClient; - let settings: OlpClientSettings; + let settings: core.OlpClientSettings; const headers = new Headers(); headers.append("cache-control", "max-age=3600"); @@ -59,12 +57,12 @@ describe("CatalogClient", function() { fetchStub.callsFake(fetchMock.fetch()); // Setup Catalog Client with new OlpClientSettings. - settings = new OlpClientSettings({ + settings = new core.OlpClientSettings({ environment: "here", getToken: () => Promise.resolve("test-token-string") }); catalogClient = new CatalogClient( - HRN.fromString("hrn:here:data:::test-hrn"), + core.HRN.fromString("hrn:here:data:::test-hrn"), settings ); }); diff --git a/tests/integration/olp-sdk-dataservice-read/ConfigClient.test.ts b/tests/integration/olp-sdk-dataservice-read/ConfigClient.test.ts index 066a1ef6..e1e27db2 100644 --- a/tests/integration/olp-sdk-dataservice-read/ConfigClient.test.ts +++ b/tests/integration/olp-sdk-dataservice-read/ConfigClient.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 HERE Europe B.V. + * Copyright (C) 2020-2021 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. @@ -20,17 +20,10 @@ import * as sinon from "sinon"; import * as chai from "chai"; import sinonChai = require("sinon-chai"); -import { - OlpClientSettings, - ConfigClient, - SchemaRequest, - SchemaDetailsRequest, - HRN, - CatalogsRequest -} from "@here/olp-sdk-dataservice-read"; +import { ConfigClient, CatalogsRequest } from "@here/olp-sdk-dataservice-read"; import { FetchMock } from "../FetchMock"; import { ConfigApi } from "@here/olp-sdk-dataservice-api"; -import { LIB_VERSION } from "@here/olp-sdk-core"; +import { OlpClientSettings } from "@here/olp-sdk-core"; chai.use(sinonChai); diff --git a/tests/integration/olp-sdk-dataservice-read/Handling-versions.test.ts b/tests/integration/olp-sdk-dataservice-read/Handling-versions.test.ts index ee9ca434..d1460acd 100644 --- a/tests/integration/olp-sdk-dataservice-read/Handling-versions.test.ts +++ b/tests/integration/olp-sdk-dataservice-read/Handling-versions.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 HERE Europe B.V. + * Copyright (C) 2019-2021 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. @@ -21,19 +21,16 @@ import * as sinon from "sinon"; import * as chai from "chai"; import sinonChai = require("sinon-chai"); import { - OlpClientSettings, - HRN, PartitionsRequest, VersionedLayerClient, QuadKeyPartitionsRequest, - quadKeyFromMortonCode, DataRequest, CatalogClient, LayerVersionsRequest, CatalogVersionRequest } from "@here/olp-sdk-dataservice-read"; import { FetchMock } from "../FetchMock"; -import { SENT_WITH_PARAM } from "@here/olp-sdk-core/lib"; +import * as core from "@here/olp-sdk-core"; chai.use(sinonChai); const expect = chai.expect; @@ -42,7 +39,7 @@ describe("Handling versions in the requests classes and clients", function() { let fetchMock: FetchMock; let sandbox: sinon.SinonSandbox; let fetchStub: sinon.SinonStub; - let settings: OlpClientSettings; + let settings: core.OlpClientSettings; const headers = new Headers(); headers.append("cache-control", "max-age=3600"); @@ -61,7 +58,7 @@ describe("Handling versions in the requests classes and clients", function() { fetchStub.callsFake(fetchMock.fetch()); // Setup Catalog Client with new OlpClientSettings. - settings = new OlpClientSettings({ + settings = new core.OlpClientSettings({ environment: "here", getToken: () => Promise.resolve("test-token-string") }); @@ -112,7 +109,7 @@ describe("Handling versions in the requests classes and clients", function() { fetchMock.withMockedResponses(mockedResponses); const client = new VersionedLayerClient({ - catalogHrn: HRN.fromString("hrn:here:data::olp-here:rib-2"), + catalogHrn: core.HRN.fromString("hrn:here:data::olp-here:rib-2"), layerId: "topology-geometry", version: 142, settings @@ -128,7 +125,7 @@ describe("Handling versions in the requests classes and clients", function() { expect(callsToApi.length).equals(2); // First to lookup api, second to the Query API. expect(callToQueryApi.args[0]).equals( "https://query.data.api.platform.here.com/query/v1/layers/topology-geometry/partitions?partition=23605706&version=142&" + - SENT_WITH_PARAM + core.SENT_WITH_PARAM ); }); @@ -180,7 +177,7 @@ describe("Handling versions in the requests classes and clients", function() { }; mockedResponses.set( - `https://query.data.api.platform.here.com/query/v1/layers/topology-geometry/versions/142/quadkeys/23605706/depths/0`, + `https://query.data.api.platform.here.com/query/v1/layers/topology-geometry/versions/142/quadkeys/122003013022/depths/0`, new Response(JSON.stringify(mockedPartitions), { headers }) ); @@ -188,14 +185,14 @@ describe("Handling versions in the requests classes and clients", function() { fetchMock.withMockedResponses(mockedResponses); const client = new VersionedLayerClient({ - catalogHrn: HRN.fromString("hrn:here:data::olp-here:rib-2"), + catalogHrn: core.HRN.fromString("hrn:here:data::olp-here:rib-2"), layerId: "topology-geometry", version: 142, settings }); const rq = new QuadKeyPartitionsRequest().withQuadKey( - quadKeyFromMortonCode(23605706) + core.TileKey.fromMortonCode(23605706) ); await client.getPartitions(rq); @@ -205,8 +202,8 @@ describe("Handling versions in the requests classes and clients", function() { expect(callsToApi.length).equals(2); // First to lookup api, second to the Query API. expect(callToQueryApi.args[0]).equals( - "https://query.data.api.platform.here.com/query/v1/layers/topology-geometry/versions/142/quadkeys/23605706/depths/0?" + - SENT_WITH_PARAM + "https://query.data.api.platform.here.com/query/v1/layers/topology-geometry/versions/142/quadkeys/122003013022/depths/0?" + + core.SENT_WITH_PARAM ); }); @@ -268,7 +265,7 @@ describe("Handling versions in the requests classes and clients", function() { }; mockedResponses.set( - `https://query.data.api.platform.here.com/query/v1/layers/topology-geometry/versions/142/quadkeys/23605706/depths/0`, + `https://query.data.api.platform.here.com/query/v1/layers/topology-geometry/versions/142/quadkeys/122003013022/depths/0`, new Response(JSON.stringify(mockedPartitions), { headers }) ); @@ -281,24 +278,11 @@ describe("Handling versions in the requests classes and clients", function() { fetchMock.withMockedResponses(mockedResponses); const client = new VersionedLayerClient({ - catalogHrn: HRN.fromString("hrn:here:data::olp-here:rib-2"), + catalogHrn: core.HRN.fromString("hrn:here:data::olp-here:rib-2"), layerId: "topology-geometry", version: 142, settings }); - - const rq = new DataRequest().withQuadKey(quadKeyFromMortonCode(23605706)); - - await client.getData(rq); - - const callsToApi = fetchStub.getCalls(); - const callToQueryApi = callsToApi[1]; - - expect(callsToApi.length).equals(3); // 1 - lookup api, 1 - the Query API, 1 - blob API - expect(callToQueryApi.args[0]).equals( - "https://query.data.api.platform.here.com/query/v1/layers/topology-geometry/versions/142/quadkeys/23605706/depths/0?" + - SENT_WITH_PARAM - ); }); it("Should use locked version 142 for getData with DataRequest.withPartitionId('23605706');", async function() { @@ -361,7 +345,7 @@ describe("Handling versions in the requests classes and clients", function() { fetchMock.withMockedResponses(mockedResponses); const client = new VersionedLayerClient({ - catalogHrn: HRN.fromString("hrn:here:data::olp-here:rib-2"), + catalogHrn: core.HRN.fromString("hrn:here:data::olp-here:rib-2"), layerId: "topology-geometry", version: 142, settings @@ -377,7 +361,7 @@ describe("Handling versions in the requests classes and clients", function() { expect(callsToApi.length).equals(3); // 1 - lookup api, 1 - the Query API, 1 - blob API expect(callToQueryApi.args[0]).equals( "https://query.data.api.platform.here.com/query/v1/layers/topology-geometry/partitions?partition=23605706&version=142&" + - SENT_WITH_PARAM + core.SENT_WITH_PARAM ); }); @@ -441,7 +425,7 @@ describe("Handling versions in the requests classes and clients", function() { fetchMock.withMockedResponses(mockedResponses); const client = new VersionedLayerClient({ - catalogHrn: HRN.fromString("hrn:here:data::olp-here:rib-2"), + catalogHrn: core.HRN.fromString("hrn:here:data::olp-here:rib-2"), layerId: "topology-geometry", settings }); @@ -458,7 +442,7 @@ describe("Handling versions in the requests classes and clients", function() { expect(client["version"]).equals(0); expect(callToQueryApi.args[0]).equals( "https://query.data.api.platform.here.com/query/v1/layers/topology-geometry/partitions?partition=23605706&version=0&" + - SENT_WITH_PARAM + core.SENT_WITH_PARAM ); }); @@ -525,7 +509,7 @@ describe("Handling versions in the requests classes and clients", function() { ); mockedResponses.set( - `https://query.data.api.platform.here.com/query/v1/layers/topology-geometry/versions/0/quadkeys/23605706/depths/0`, + `https://query.data.api.platform.here.com/query/v1/layers/topology-geometry/versions/0/quadkeys/122003013022/depths/0`, new Response(JSON.stringify(mockedPartitions), { headers }) ); @@ -533,13 +517,13 @@ describe("Handling versions in the requests classes and clients", function() { fetchMock.withMockedResponses(mockedResponses); const client = new VersionedLayerClient({ - catalogHrn: HRN.fromString("hrn:here:data::olp-here:rib-2"), + catalogHrn: core.HRN.fromString("hrn:here:data::olp-here:rib-2"), layerId: "topology-geometry", settings }); const rq = new QuadKeyPartitionsRequest().withQuadKey( - quadKeyFromMortonCode(23605706) + core.TileKey.fromMortonCode(23605706) ); await client.getPartitions(rq); @@ -551,8 +535,8 @@ describe("Handling versions in the requests classes and clients", function() { expect(client["version"]).equals(0); expect(callToQueryApi.args[0]).equals( - "https://query.data.api.platform.here.com/query/v1/layers/topology-geometry/versions/0/quadkeys/23605706/depths/0?" + - SENT_WITH_PARAM + "https://query.data.api.platform.here.com/query/v1/layers/topology-geometry/versions/0/quadkeys/122003013022/depths/0?" + + core.SENT_WITH_PARAM ); }); @@ -629,7 +613,7 @@ describe("Handling versions in the requests classes and clients", function() { ); mockedResponses.set( - `https://query.data.api.platform.here.com/query/v1/layers/topology-geometry/versions/0/quadkeys/23605706/depths/0`, + `https://query.data.api.platform.here.com/query/v1/layers/topology-geometry/versions/0/quadkeys/122003013022/depths/0`, new Response(JSON.stringify(mockedPartitions), { headers }) ); @@ -642,25 +626,10 @@ describe("Handling versions in the requests classes and clients", function() { fetchMock.withMockedResponses(mockedResponses); const client = new VersionedLayerClient({ - catalogHrn: HRN.fromString("hrn:here:data::olp-here:rib-2"), + catalogHrn: core.HRN.fromString("hrn:here:data::olp-here:rib-2"), layerId: "topology-geometry", settings }); - - const rq = new DataRequest().withQuadKey(quadKeyFromMortonCode(23605706)); - - await client.getData(rq); - - const callsToApi = fetchStub.getCalls(); - const callToQueryApi = callsToApi[2]; - - expect(callsToApi.length).equals(4); // 1 - lookup api, 1 - Metadata API, 1 - the Query API, 1 - blob API - - expect(client["version"]).equals(0); - expect(callToQueryApi.args[0]).equals( - "https://query.data.api.platform.here.com/query/v1/layers/topology-geometry/versions/0/quadkeys/23605706/depths/0?" + - SENT_WITH_PARAM - ); }); it("Should use latest version for getData with DataRequest.withPartitionId('23605706') and lock it;", async function() { @@ -738,7 +707,7 @@ describe("Handling versions in the requests classes and clients", function() { fetchMock.withMockedResponses(mockedResponses); const client = new VersionedLayerClient({ - catalogHrn: HRN.fromString("hrn:here:data::olp-here:rib-2"), + catalogHrn: core.HRN.fromString("hrn:here:data::olp-here:rib-2"), layerId: "topology-geometry", settings }); @@ -755,7 +724,7 @@ describe("Handling versions in the requests classes and clients", function() { expect(client["version"]).equals(0); expect(callToQueryApi.args[0]).equals( "https://query.data.api.platform.here.com/query/v1/layers/topology-geometry/partitions?partition=23605706&version=0&" + - SENT_WITH_PARAM + core.SENT_WITH_PARAM ); }); @@ -802,7 +771,7 @@ describe("Handling versions in the requests classes and clients", function() { fetchMock.withMockedResponses(mockedResponses); const client = new CatalogClient( - HRN.fromString("hrn:here:data::olp-here:rib-2"), + core.HRN.fromString("hrn:here:data::olp-here:rib-2"), settings ); @@ -817,7 +786,7 @@ describe("Handling versions in the requests classes and clients", function() { expect(callToMetadataApi.args[0]).equals( "https://metadata.data.api.platform.here.com/metadata/v1/layerVersions?version=0&" + - SENT_WITH_PARAM + core.SENT_WITH_PARAM ); }); @@ -873,7 +842,7 @@ describe("Handling versions in the requests classes and clients", function() { fetchMock.withMockedResponses(mockedResponses); const client = new CatalogClient( - HRN.fromString("hrn:here:data::olp-here:rib-2"), + core.HRN.fromString("hrn:here:data::olp-here:rib-2"), settings ); @@ -888,7 +857,7 @@ describe("Handling versions in the requests classes and clients", function() { expect(callToMetadataApi.args[0]).equals( "https://metadata.data.api.platform.here.com/metadata/v1/versions?startVersion=-1&endVersion=0&" + - SENT_WITH_PARAM + core.SENT_WITH_PARAM ); }); }); diff --git a/tests/integration/olp-sdk-dataservice-read/IndexLayerClient.test.ts b/tests/integration/olp-sdk-dataservice-read/IndexLayerClient.test.ts index 4e38b39b..e7b87dd5 100644 --- a/tests/integration/olp-sdk-dataservice-read/IndexLayerClient.test.ts +++ b/tests/integration/olp-sdk-dataservice-read/IndexLayerClient.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2020 HERE Europe B.V. + * Copyright (C) 2019-2021 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. @@ -21,14 +21,12 @@ import * as sinon from "sinon"; import * as chai from "chai"; import sinonChai = require("sinon-chai"); import { - OlpClientSettings, - HRN, IndexLayerClient, IndexQueryRequest } from "@here/olp-sdk-dataservice-read"; import { FetchMock } from "../FetchMock"; import { Buffer } from "buffer"; -import { LIB_VERSION } from "@here/olp-sdk-core"; +import * as core from "@here/olp-sdk-core"; chai.use(sinonChai); @@ -40,7 +38,7 @@ describe("IndexLayerClient", function() { let sandbox: sinon.SinonSandbox; let fetchStub: sinon.SinonStub; - const testHRN = HRN.fromString("hrn:here:data:::test-hrn"); + const testHRN = core.HRN.fromString("hrn:here:data:::test-hrn"); const testLayerId = "test-layed-id"; before(function() { @@ -58,12 +56,12 @@ describe("IndexLayerClient", function() { }); it("Should be initialized with settings", async function() { - const settings = new OlpClientSettings({ + const settings = new core.OlpClientSettings({ environment: "here", getToken: () => Promise.resolve("test-token-string") }); const indexClient = new IndexLayerClient({ - catalogHrn: HRN.fromString("hrn:here:data:::test-hrn"), + catalogHrn: core.HRN.fromString("hrn:here:data:::test-hrn"), layerId: "test-layed-id", settings }); @@ -72,13 +70,13 @@ describe("IndexLayerClient", function() { }); it("Should initialization error be handled", function() { - const settings = new OlpClientSettings({ + const settings = new core.OlpClientSettings({ environment: "here", getToken: () => Promise.resolve("test-token-string") }); try { const indexClient = new IndexLayerClient({ - catalogHrn: HRN.fromString("hrn:here:data:::test-hrn"), + catalogHrn: core.HRN.fromString("hrn:here:data:::test-hrn"), layerId: "", settings }); @@ -151,12 +149,12 @@ describe("IndexLayerClient", function() { fetchMock.withMockedResponses(mockedResponses); // Setup Layer Client with new OlpClientSettings. - const settings = new OlpClientSettings({ + const settings = new core.OlpClientSettings({ environment: "here", getToken: () => Promise.resolve("test-token-string") }); const indexClient = new IndexLayerClient({ - catalogHrn: HRN.fromString("hrn:here:data:::test-hrn"), + catalogHrn: core.HRN.fromString("hrn:here:data:::test-hrn"), layerId: "test-layed-id", settings }); @@ -182,12 +180,12 @@ describe("IndexLayerClient", function() { }); it("Should getPartitions() method handle errors", async function() { - const settings = new OlpClientSettings({ + const settings = new core.OlpClientSettings({ environment: "here", getToken: () => Promise.resolve("test-token-string") }); const indexClient = new IndexLayerClient({ - catalogHrn: HRN.fromString("hrn:here:data:::test-hrn"), + catalogHrn: core.HRN.fromString("hrn:here:data:::test-hrn"), layerId: "test-layed-id", settings }); @@ -198,12 +196,12 @@ describe("IndexLayerClient", function() { }); it("Should getData() method handle errors", async function() { - const settings = new OlpClientSettings({ + const settings = new core.OlpClientSettings({ environment: "here", getToken: () => Promise.resolve("test-token-string") }); const indexClient = new IndexLayerClient({ - catalogHrn: HRN.fromString("hrn:here:data:::test-hrn"), + catalogHrn: core.HRN.fromString("hrn:here:data:::test-hrn"), layerId: "test-layed-id", settings }); @@ -253,12 +251,12 @@ describe("IndexLayerClient", function() { // Setup the fetch to use mocked responses. fetchMock.withMockedResponses(mockedResponses); - const settings = new OlpClientSettings({ + const settings = new core.OlpClientSettings({ environment: "here", getToken: () => Promise.resolve("test-token-string") }); const indexClient = new IndexLayerClient({ - catalogHrn: HRN.fromString("hrn:here:data:::test-hrn"), + catalogHrn: core.HRN.fromString("hrn:here:data:::test-hrn"), layerId: "test-layed-id", settings }); @@ -270,13 +268,13 @@ describe("IndexLayerClient", function() { }); it("Should be initialized with IndexLayerClientParams", async function() { - const settings = new OlpClientSettings({ + const settings = new core.OlpClientSettings({ environment: "here", getToken: () => Promise.resolve("test-token-string") }); const indexLayerClientParams = { - catalogHrn: HRN.fromString("hrn:here:data:::test-hrn"), + catalogHrn: core.HRN.fromString("hrn:here:data:::test-hrn"), layerId: "test-layed-id", settings: settings }; diff --git a/tests/integration/olp-sdk-dataservice-read/Metadata-api.test.ts b/tests/integration/olp-sdk-dataservice-read/Metadata-api.test.ts index 3a688cea..e66f0d54 100644 --- a/tests/integration/olp-sdk-dataservice-read/Metadata-api.test.ts +++ b/tests/integration/olp-sdk-dataservice-read/Metadata-api.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 HERE Europe B.V. + * Copyright (C) 2019-2021 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. @@ -20,13 +20,9 @@ import * as sinon from "sinon"; import * as chai from "chai"; import sinonChai = require("sinon-chai"); -import { - OlpClientSettings, - HRN, - RequestFactory -} from "@here/olp-sdk-dataservice-read"; import { MetadataApi } from "@here/olp-sdk-dataservice-api"; import { FetchMock } from "../FetchMock"; +import * as core from "@here/olp-sdk-core"; chai.use(sinonChai); const expect = chai.expect; @@ -35,7 +31,7 @@ describe("CatalogClient", function() { let fetchMock: FetchMock; let sandbox: sinon.SinonSandbox; let fetchStub: sinon.SinonStub; - let settings: OlpClientSettings; + let settings: core.OlpClientSettings; before(function() { sandbox = sinon.createSandbox(); @@ -51,7 +47,7 @@ describe("CatalogClient", function() { fetchStub.callsFake(fetchMock.fetch()); // Setup Catalog Client with new OlpClientSettings. - settings = new OlpClientSettings({ + settings = new core.OlpClientSettings({ environment: "here", getToken: () => Promise.resolve("test-token-string") }); @@ -110,11 +106,11 @@ describe("CatalogClient", function() { // Setup the fetch to use mocked responses. fetchMock.withMockedResponses(mockedResponses); - const requestBuilder = await RequestFactory.create( + const requestBuilder = await core.RequestFactory.create( "metadata", "v1", settings, - HRN.fromString("hrn:here:data::olp-here:rib-2") + core.HRN.fromString("hrn:here:data::olp-here:rib-2") ); const partitions = await MetadataApi.getPartitions(requestBuilder, { diff --git a/tests/integration/olp-sdk-dataservice-read/StatisticsClient.test.ts b/tests/integration/olp-sdk-dataservice-read/StatisticsClient.test.ts index 72cd2eac..5482a00a 100644 --- a/tests/integration/olp-sdk-dataservice-read/StatisticsClient.test.ts +++ b/tests/integration/olp-sdk-dataservice-read/StatisticsClient.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2020 HERE Europe B.V. + * Copyright (C) 2019-2021 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. @@ -21,15 +21,13 @@ import * as sinon from "sinon"; import * as chai from "chai"; import sinonChai = require("sinon-chai"); import { - OlpClientSettings, - HRN, StatisticsClient, SummaryRequest, StatisticsRequest, CoverageDataType } from "@here/olp-sdk-dataservice-read"; import { FetchMock } from "../FetchMock"; -import { LIB_VERSION } from "@here/olp-sdk-core"; +import * as core from "@here/olp-sdk-core"; chai.use(sinonChai); @@ -42,9 +40,9 @@ describe("StatisticsClient", function() { let fetchStub: sinon.SinonStub; let statisticsClient: StatisticsClient; - let settings: OlpClientSettings; + let settings: core.OlpClientSettings; - const mockedHRN = HRN.fromString("hrn:here:data:::mocked-hrn"); + const mockedHRN = core.HRN.fromString("hrn:here:data:::mocked-hrn"); const mockedLayerId = "mocked-layed-id"; before(function() { @@ -61,7 +59,7 @@ describe("StatisticsClient", function() { fetchStub.callsFake(fetchMock.fetch()); // Setup Statistics Client with new OlpClientSettings. - settings = new OlpClientSettings({ + settings = new core.OlpClientSettings({ environment: "here", getToken: () => Promise.resolve("test-token-string") }); diff --git a/tests/integration/olp-sdk-dataservice-read/StreamLayerClient.test.ts b/tests/integration/olp-sdk-dataservice-read/StreamLayerClient.test.ts index 48761e67..7f584103 100644 --- a/tests/integration/olp-sdk-dataservice-read/StreamLayerClient.test.ts +++ b/tests/integration/olp-sdk-dataservice-read/StreamLayerClient.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 HERE Europe B.V. + * Copyright (C) 2020-2021 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. @@ -21,8 +21,6 @@ import * as sinon from "sinon"; import * as chai from "chai"; import sinonChai = require("sinon-chai"); import { - OlpClientSettings, - HRN, StreamLayerClient, SubscribeRequest, PollRequest, @@ -32,6 +30,7 @@ import { import { FetchMock } from "../FetchMock"; import { Buffer } from "buffer"; import { Message } from "@here/olp-sdk-dataservice-api/lib/stream-api"; +import { HRN, OlpClientSettings } from "@here/olp-sdk-core"; chai.use(sinonChai); diff --git a/tests/integration/olp-sdk-dataservice-read/VersionedLayerClient.test.ts b/tests/integration/olp-sdk-dataservice-read/VersionedLayerClient.test.ts index a55b42fc..347ecde1 100644 --- a/tests/integration/olp-sdk-dataservice-read/VersionedLayerClient.test.ts +++ b/tests/integration/olp-sdk-dataservice-read/VersionedLayerClient.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2020 HERE Europe B.V. + * Copyright (C) 2019-2021 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. @@ -22,18 +22,20 @@ import * as chai from "chai"; import sinonChai = require("sinon-chai"); import { VersionedLayerClient, - OlpClientSettings, - HRN, PartitionsRequest, DataRequest, - quadKeyFromMortonCode, QuadKeyPartitionsRequest, - FetchOptions, TileRequest } from "@here/olp-sdk-dataservice-read"; import { FetchMock } from "../FetchMock"; import { Buffer } from "buffer"; -import { LIB_VERSION } from "@here/olp-sdk-core"; +import { + FetchOptions, + HRN, + LIB_VERSION, + OlpClientSettings, + TileKey +} from "@here/olp-sdk-core"; chai.use(sinonChai); @@ -522,103 +524,6 @@ describe("VersionedLayerClient", function() { expect(fetchStub.callCount).to.be.equal(4); }); - it("Shoud be fetched data with QuadKey", async function() { - const mockedResponses = new Map(); - const mockedQuadKey = quadKeyFromMortonCode("23618403"); - const mockedData = Buffer.alloc(42); - const mockedQuadKeyTreeData = { - subQuads: [ - { - version: 12, - subQuadKey: "1", - dataHandle: "c9116bb9-7d00-44bf-9b26-b4ab4c274665" - } - ], - parentQuads: [ - { - version: 12, - partition: "23618403", - dataHandle: "da51785a-54b0-40cd-95ac-760f56fe5457" - } - ] - }; - - mockedResponses.set( - `https://query.data.api.platform.here.com/query/v1/layers/test-layed-id/versions/42/quadkeys/23618403/depths/0`, - new Response(JSON.stringify(mockedQuadKeyTreeData), { headers }) - ); - - mockedResponses.set( - `https://metadata.data.api.platform.here.com/metadata/v1/versions/latest?startVersion=-1`, - new Response(JSON.stringify({ version: 42 }), { headers }) - ); - - // Set the response from lookup api with the info about Metadata service. - mockedResponses.set( - `https://api-lookup.data.api.platform.here.com/lookup/v1/resources/hrn:here:data:::test-hrn/apis`, - new Response( - JSON.stringify([ - { - api: "metadata", - version: "v1", - baseURL: "https://metadata.data.api.platform.here.com/metadata/v1", - parameters: { - additionalProp1: "string", - additionalProp2: "string", - additionalProp3: "string" - } - }, - { - api: "blob", - version: "v1", - baseURL: "https://blob.data.api.platform.here.com/blob/v1", - parameters: { - additionalProp1: "string", - additionalProp2: "string", - additionalProp3: "string" - } - }, - { - api: "query", - version: "v1", - baseURL: "https://query.data.api.platform.here.com/query/v1", - parameters: { - additionalProp1: "string", - additionalProp2: "string", - additionalProp3: "string" - } - } - ]), - { headers } - ) - ); - - // Set the response of mocked partitions from metadata service. - mockedResponses.set( - `https://blob.data.api.platform.here.com/blob/v1/layers/test-layed-id/data/c9116bb9-7d00-44bf-9b26-b4ab4c274665`, - new Response(mockedData, { headers }) - ); - - // Setup the fetch to use mocked responses. - fetchMock.withMockedResponses(mockedResponses); - - const settings = new OlpClientSettings({ - environment: "here", - getToken: () => Promise.resolve("test-token-string") - }); - const layerClient = new VersionedLayerClient({ - catalogHrn: testHRN, - layerId: testLayerId, - settings - }); - const request = new DataRequest().withQuadKey(mockedQuadKey); - - const data = await layerClient.getData(request); - - assert.isDefined(data); - expect(fetchStub.callCount).to.be.equal(4); - }); - it("Shoud read partitions metadata by QuadKey for specific VersionLayer", async function() { const mockedResponses = new Map(); @@ -663,7 +568,7 @@ describe("VersionedLayerClient", function() { // Set the response with mocked partitions mockedResponses.set( - `https://query.data.api.platform.here.com/query/v1/layers/test-layed-id/versions/42/quadkeys/70/depths/3`, + `https://query.data.api.platform.here.com/query/v1/layers/test-layed-id/versions/42/quadkeys/012/depths/3`, new Response( JSON.stringify({ parentQuads: [ @@ -906,7 +811,7 @@ describe("VersionedLayerClient", function() { // Set the response of mocked partitions with additional fields. mockedResponses.set( - `https://query.data.api.platform.here.com/query/v1/layers/test-layed-id/versions/30/quadkeys/70/depths/0?additionalFields=dataSize,checksum,compressedDataSize`, + `https://query.data.api.platform.here.com/query/v1/layers/test-layed-id/versions/30/quadkeys/012/depths/0?additionalFields=dataSize,checksum,compressedDataSize`, new Response(JSON.stringify(mockedPartitions), { headers }) ); @@ -980,7 +885,7 @@ describe("VersionedLayerClient", function() { ); mockedResponses.set( - `https://query.data.api.platform.here.com/hrn:here:data:::test-hrn/v1/layers/mocked-layer/versions/123/quadkeys/24414/depths/4`, + `https://query.data.api.platform.here.com/hrn:here:data:::test-hrn/v1/layers/mocked-layer/versions/123/quadkeys/1331132/depths/4`, new Response( `{"subQuads":[{"subQuadKey":"64","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"65","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"66","version":309,"dataHandle":"2297193A99F513DA23F40D0021CB01D0.309"},{"subQuadKey":"67","version":309,"dataHandle":"D63FA9E9CD89638BCCCF729BB7AD1CB8.309"},{"subQuadKey":"68","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"69","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"70","version":309,"dataHandle":"2297193A99F513DA23F40D0021CB01D0.309"},{"subQuadKey":"71","version":309,"dataHandle":"D63FA9E9CD89638BCCCF729BB7AD1CB8.309"},{"subQuadKey":"72","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"73","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"74","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"75","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"76","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"77","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"78","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"79","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"80","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"81","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"82","version":309,"dataHandle":"2297193A99F513DA23F40D0021CB01D0.309"},{"subQuadKey":"83","version":309,"dataHandle":"D63FA9E9CD89638BCCCF729BB7AD1CB8.309"},{"subQuadKey":"84","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"85","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"86","version":309,"dataHandle":"2297193A99F513DA23F40D0021CB01D0.309"},{"subQuadKey":"87","version":309,"dataHandle":"D63FA9E9CD89638BCCCF729BB7AD1CB8.309"},{"subQuadKey":"88","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"89","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"90","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"91","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"92","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"93","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"94","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"95","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"96","version":309,"dataHandle":"91682A4ABCAC3AB95758CF1E01444373.309"},{"subQuadKey":"97","version":309,"dataHandle":"7D068B97290AC948DC84BEBF10DD2079.309"},{"subQuadKey":"98","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"99","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"100","version":309,"dataHandle":"91682A4ABCAC3AB95758CF1E01444373.309"},{"subQuadKey":"101","version":309,"dataHandle":"7D068B97290AC948DC84BEBF10DD2079.309"},{"subQuadKey":"102","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"103","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"104","version":309,"dataHandle":"3BC6E551388E7E9449A6376CB0DB9254.309"},{"subQuadKey":"105","version":309,"dataHandle":"235A730981B48E30E04CA20457E3AC05.309"},{"subQuadKey":"106","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"107","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"108","version":309,"dataHandle":"3BC6E551388E7E9449A6376CB0DB9254.309"},{"subQuadKey":"109","version":309,"dataHandle":"235A730981B48E30E04CA20457E3AC05.309"},{"subQuadKey":"110","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"111","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"112","version":309,"dataHandle":"91682A4ABCAC3AB95758CF1E01444373.309"},{"subQuadKey":"113","version":309,"dataHandle":"7D068B97290AC948DC84BEBF10DD2079.309"},{"subQuadKey":"114","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"115","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"116","version":309,"dataHandle":"91682A4ABCAC3AB95758CF1E01444373.309"},{"subQuadKey":"117","version":309,"dataHandle":"7D068B97290AC948DC84BEBF10DD2079.309"},{"subQuadKey":"118","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"119","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"120","version":309,"dataHandle":"3BC6E551388E7E9449A6376CB0DB9254.309"},{"subQuadKey":"121","version":309,"dataHandle":"235A730981B48E30E04CA20457E3AC05.309"},{"subQuadKey":"122","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"123","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"124","version":309,"dataHandle":"3BC6E551388E7E9449A6376CB0DB9254.309"},{"subQuadKey":"125","version":309,"dataHandle":"235A730981B48E30E04CA20457E3AC05.309"},{"subQuadKey":"126","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"127","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"1","version":309,"dataHandle":"9E835327487159C24CC3BD9ABC1D9D8D.309"},{"subQuadKey":"16","version":309,"dataHandle":"DE6CE7A31E7272C8037B3E5344769A1A.309"},{"subQuadKey":"17","version":309,"dataHandle":"DE6CE7A31E7272C8037B3E5344769A1A.309"},{"subQuadKey":"18","version":309,"dataHandle":"C9522D8AA448785FCBC3B05E763B5477.309"},{"subQuadKey":"19","version":309,"dataHandle":"C9522D8AA448785FCBC3B05E763B5477.309"},{"subQuadKey":"20","version":309,"dataHandle":"DE6CE7A31E7272C8037B3E5344769A1A.309"},{"subQuadKey":"21","version":309,"dataHandle":"DE6CE7A31E7272C8037B3E5344769A1A.309"},{"subQuadKey":"22","version":309,"dataHandle":"C9522D8AA448785FCBC3B05E763B5477.309"},{"subQuadKey":"23","version":309,"dataHandle":"C9522D8AA448785FCBC3B05E763B5477.309"},{"subQuadKey":"24","version":309,"dataHandle":"65435B35BBE9825D5A75F8CF77F8B683.309"},{"subQuadKey":"25","version":309,"dataHandle":"65435B35BBE9825D5A75F8CF77F8B683.309"},{"subQuadKey":"26","version":309,"dataHandle":"AA64D744612B79BDF0FB9B1D311F28FD.309"},{"subQuadKey":"27","version":309,"dataHandle":"AA64D744612B79BDF0FB9B1D311F28FD.309"},{"subQuadKey":"28","version":309,"dataHandle":"65435B35BBE9825D5A75F8CF77F8B683.309"},{"subQuadKey":"29","version":309,"dataHandle":"65435B35BBE9825D5A75F8CF77F8B683.309"},{"subQuadKey":"30","version":309,"dataHandle":"AA64D744612B79BDF0FB9B1D311F28FD.309"},{"subQuadKey":"31","version":309,"dataHandle":"AA64D744612B79BDF0FB9B1D311F28FD.309"},{"subQuadKey":"256","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"257","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"258","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"259","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"260","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"261","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"262","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"263","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"264","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"265","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"266","version":309,"dataHandle":"44B55F66BD0CC98BD2EEB22B0946B923.309"},{"subQuadKey":"267","version":309,"dataHandle":"436735897B05C80C449B1D654541DE5E.309"},{"subQuadKey":"268","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"269","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"270","version":309,"dataHandle":"436735897B05C80C449B1D654541DE5E.309"},{"subQuadKey":"271","version":309,"dataHandle":"BB918FD0A2C3D0C13486DC20E70FE5D1.309"},{"subQuadKey":"272","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"273","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"274","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"275","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"276","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"277","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"278","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"279","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"280","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"281","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"282","version":309,"dataHandle":"44B55F66BD0CC98BD2EEB22B0946B923.309"},{"subQuadKey":"283","version":309,"dataHandle":"436735897B05C80C449B1D654541DE5E.309"},{"subQuadKey":"284","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"285","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"286","version":309,"dataHandle":"436735897B05C80C449B1D654541DE5E.309"},{"subQuadKey":"287","version":309,"dataHandle":"BB918FD0A2C3D0C13486DC20E70FE5D1.309"},{"subQuadKey":"288","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"289","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"290","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"291","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"292","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"293","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"294","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"295","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"296","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"297","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"298","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"299","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"300","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"301","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"302","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"303","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"304","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"305","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"306","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"307","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"308","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"309","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"310","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"311","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"312","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"313","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"314","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"315","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"316","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"317","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"318","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"319","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"320","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"321","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"322","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"323","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"324","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"325","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"326","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"327","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"328","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"329","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"330","version":309,"dataHandle":"44B55F66BD0CC98BD2EEB22B0946B923.309"},{"subQuadKey":"331","version":309,"dataHandle":"436735897B05C80C449B1D654541DE5E.309"},{"subQuadKey":"332","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"333","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"334","version":309,"dataHandle":"436735897B05C80C449B1D654541DE5E.309"},{"subQuadKey":"335","version":309,"dataHandle":"BB918FD0A2C3D0C13486DC20E70FE5D1.309"},{"subQuadKey":"336","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"337","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"338","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"339","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"340","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"341","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"342","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"343","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"344","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"345","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"346","version":309,"dataHandle":"44B55F66BD0CC98BD2EEB22B0946B923.309"},{"subQuadKey":"347","version":309,"dataHandle":"436735897B05C80C449B1D654541DE5E.309"},{"subQuadKey":"348","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"349","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"350","version":309,"dataHandle":"436735897B05C80C449B1D654541DE5E.309"},{"subQuadKey":"351","version":309,"dataHandle":"BB918FD0A2C3D0C13486DC20E70FE5D1.309"},{"subQuadKey":"352","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"353","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"354","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"355","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"356","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"357","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"358","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"359","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"360","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"361","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"362","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"363","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"364","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"365","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"366","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"367","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"368","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"369","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"370","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"371","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"372","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"373","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"374","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"375","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"376","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"377","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"378","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"379","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"380","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"381","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"382","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"383","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"384","version":309,"dataHandle":"B0D537F52AC1C17A27A339824C3853F9.309"},{"subQuadKey":"385","version":309,"dataHandle":"8EE1A707C5CB22DA4AC554EA1CF954D7.309"},{"subQuadKey":"386","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"387","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"388","version":309,"dataHandle":"8EE1A707C5CB22DA4AC554EA1CF954D7.309"},{"subQuadKey":"389","version":309,"dataHandle":"A2FA393A124DDB2EEAF962D41F33E85F.309"},{"subQuadKey":"390","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"391","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"392","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"393","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"394","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"395","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"396","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"397","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"398","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"399","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"400","version":309,"dataHandle":"B0D537F52AC1C17A27A339824C3853F9.309"},{"subQuadKey":"401","version":309,"dataHandle":"8EE1A707C5CB22DA4AC554EA1CF954D7.309"},{"subQuadKey":"402","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"403","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"404","version":309,"dataHandle":"8EE1A707C5CB22DA4AC554EA1CF954D7.309"},{"subQuadKey":"405","version":309,"dataHandle":"A2FA393A124DDB2EEAF962D41F33E85F.309"},{"subQuadKey":"406","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"407","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"408","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"409","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"410","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"411","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"412","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"413","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"414","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"415","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"416","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"417","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"418","version":309,"dataHandle":"F357AFDE030AA20DF6960B48EB625CA3.309"},{"subQuadKey":"419","version":309,"dataHandle":"33FCF2B9A0A070C97A1372C355C56E9D.309"},{"subQuadKey":"420","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"421","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"422","version":309,"dataHandle":"33FCF2B9A0A070C97A1372C355C56E9D.309"},{"subQuadKey":"423","version":309,"dataHandle":"5F74311EA37E90F55EC09D98F93EDA0C.309"},{"subQuadKey":"424","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"425","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"426","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"427","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"428","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"429","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"430","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"431","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"432","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"433","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"434","version":309,"dataHandle":"F357AFDE030AA20DF6960B48EB625CA3.309"},{"subQuadKey":"435","version":309,"dataHandle":"33FCF2B9A0A070C97A1372C355C56E9D.309"},{"subQuadKey":"436","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"437","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"438","version":309,"dataHandle":"33FCF2B9A0A070C97A1372C355C56E9D.309"},{"subQuadKey":"439","version":309,"dataHandle":"5F74311EA37E90F55EC09D98F93EDA0C.309"},{"subQuadKey":"440","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"441","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"442","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"443","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"444","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"445","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"446","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"447","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"448","version":309,"dataHandle":"B0D537F52AC1C17A27A339824C3853F9.309"},{"subQuadKey":"449","version":309,"dataHandle":"8EE1A707C5CB22DA4AC554EA1CF954D7.309"},{"subQuadKey":"450","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"451","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"452","version":309,"dataHandle":"8EE1A707C5CB22DA4AC554EA1CF954D7.309"},{"subQuadKey":"453","version":309,"dataHandle":"A2FA393A124DDB2EEAF962D41F33E85F.309"},{"subQuadKey":"454","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"455","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"456","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"457","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"458","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"459","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"460","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"461","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"462","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"463","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"464","version":309,"dataHandle":"B0D537F52AC1C17A27A339824C3853F9.309"},{"subQuadKey":"465","version":309,"dataHandle":"8EE1A707C5CB22DA4AC554EA1CF954D7.309"},{"subQuadKey":"466","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"467","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"468","version":309,"dataHandle":"8EE1A707C5CB22DA4AC554EA1CF954D7.309"},{"subQuadKey":"469","version":309,"dataHandle":"A2FA393A124DDB2EEAF962D41F33E85F.309"},{"subQuadKey":"470","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"471","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"472","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"473","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"474","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"475","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"476","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"477","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"478","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"479","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"480","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"481","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"482","version":309,"dataHandle":"F357AFDE030AA20DF6960B48EB625CA3.309"},{"subQuadKey":"483","version":309,"dataHandle":"33FCF2B9A0A070C97A1372C355C56E9D.309"},{"subQuadKey":"484","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"485","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"486","version":309,"dataHandle":"33FCF2B9A0A070C97A1372C355C56E9D.309"},{"subQuadKey":"487","version":309,"dataHandle":"5F74311EA37E90F55EC09D98F93EDA0C.309"},{"subQuadKey":"488","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"489","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"490","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"491","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"492","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"493","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"494","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"495","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"496","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"497","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"498","version":309,"dataHandle":"F357AFDE030AA20DF6960B48EB625CA3.309"},{"subQuadKey":"499","version":309,"dataHandle":"33FCF2B9A0A070C97A1372C355C56E9D.309"},{"subQuadKey":"500","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"501","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"502","version":309,"dataHandle":"33FCF2B9A0A070C97A1372C355C56E9D.309"},{"subQuadKey":"503","version":309,"dataHandle":"5F74311EA37E90F55EC09D98F93EDA0C.309"},{"subQuadKey":"504","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"505","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"506","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"507","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"508","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"509","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"510","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"511","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"4","version":309,"dataHandle":"8941BA72534EA59DC78AA066874F3F46.309"},{"subQuadKey":"5","version":309,"dataHandle":"8941BA72534EA59DC78AA066874F3F46.309"},{"subQuadKey":"6","version":309,"dataHandle":"0357B7D8E5E267C27A40375EEFD8CBDF.309"},{"subQuadKey":"7","version":309,"dataHandle":"0357B7D8E5E267C27A40375EEFD8CBDF.309"}],"parentQuads":[{"partition":"1525","version":309,"dataHandle":"5FA96A639F78245CCA052E6CA1B2E356.309"},{"partition":"23","version":311,"dataHandle":"E49841168CC61793C19635AB788B19F0.311"},{"partition":"381","version":309,"dataHandle":"B5496E024A5BBDB0AE8A7BD38614BB81.309"},{"partition":"5","version":311,"dataHandle":"48FBFF69B74F5B5CEEAE0D410ACF3783.311"},{"partition":"6103","version":309,"dataHandle":"B003789C316D46D70BDB0B4D02AE654A.309"},{"partition":"95","version":309,"dataHandle":"A46A7D44C6DB3C2880A0076FAE4098AF.309"}]}` ) diff --git a/tests/integration/olp-sdk-dataservice-read/VolatileLayerClient.test.ts b/tests/integration/olp-sdk-dataservice-read/VolatileLayerClient.test.ts index 3d62e263..b93ff8b9 100644 --- a/tests/integration/olp-sdk-dataservice-read/VolatileLayerClient.test.ts +++ b/tests/integration/olp-sdk-dataservice-read/VolatileLayerClient.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2020 HERE Europe B.V. + * Copyright (C) 2019-2021 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. @@ -22,17 +22,19 @@ import * as chai from "chai"; import sinonChai = require("sinon-chai"); import { VolatileLayerClient, - OlpClientSettings, - HRN, PartitionsRequest, DataRequest, - quadKeyFromMortonCode, QuadKeyPartitionsRequest, TileRequest } from "@here/olp-sdk-dataservice-read"; import { FetchMock } from "../FetchMock"; import { Buffer } from "buffer"; -import { LIB_VERSION } from "@here/olp-sdk-core"; +import { + HRN, + LIB_VERSION, + OlpClientSettings, + TileKey +} from "@here/olp-sdk-core"; chai.use(sinonChai); @@ -423,101 +425,6 @@ describe("VolatileLayerClient", function() { expect(fetchStub.callCount).to.be.equal(2); }); - it("Shoud be fetched data with QuadKey", async function() { - const mockedResponses = new Map(); - const mockedQuadKey = quadKeyFromMortonCode("23618403"); - const mockedData = Buffer.alloc(42); - - // Set the response from lookup api with the info about Metadata service. - mockedResponses.set( - `https://api-lookup.data.api.platform.here.com/lookup/v1/resources/hrn:here:data:::test-hrn/apis`, - new Response( - JSON.stringify([ - { - api: "metadata", - version: "v1", - baseURL: "https://metadata.data.api.platform.here.com/metadata/v1", - parameters: { - additionalProp1: "string", - additionalProp2: "string", - additionalProp3: "string" - } - }, - { - api: "query", - version: "v1", - baseURL: "https://query.data.api.platform.here.com/query/v1", - parameters: { - additionalProp1: "string", - additionalProp2: "string", - additionalProp3: "string" - } - }, - { - api: "volatile-blob", - version: "v1", - baseURL: - "https://volatile-blob.data.api.platform.here.com/volatile-blob/v1", - parameters: { - additionalProp1: "string", - additionalProp2: "string", - additionalProp3: "string" - } - } - ]), - { headers } - ) - ); - - mockedResponses.set( - `https://query.data.api.platform.here.com/query/v1/layers/test-layed-id/quadkeys/23618403/depths/0`, - new Response( - JSON.stringify({ - subQuads: [ - { - version: 12, - subQuadKey: "1", - dataHandle: "c9116bb9-7d00-44bf-9b26-b4ab4c274665" - } - ], - parentQuads: [ - { - version: 12, - partition: "23618403", - dataHandle: "da51785a-54b0-40cd-95ac-760f56fe5457" - } - ] - }), - { headers } - ) - ); - - // Set the response of mocked partitions from metadata service. - mockedResponses.set( - `https://volatile-blob.data.api.platform.here.com/volatile-blob/v1/layers/test-layed-id/data/c9116bb9-7d00-44bf-9b26-b4ab4c274665`, - new Response(mockedData, { headers }) - ); - - // Setup the fetch to use mocked responses. - fetchMock.withMockedResponses(mockedResponses); - - const settings = new OlpClientSettings({ - environment: "here", - getToken: () => Promise.resolve("test-token-string") - }); - const layerClient = new VolatileLayerClient({ - catalogHrn: testHRN, - layerId: testVolatileLayerId, - settings - }); - const request = new DataRequest().withQuadKey(mockedQuadKey); - - const data = await layerClient.getData(request); - - assert.isDefined(data); - expect(fetchStub.callCount).to.be.equal(3); - }); - it("Shoud read partitions metadata by QuadKey for specific VolatileLayer", async function() { const mockedResponses = new Map(); @@ -566,7 +473,7 @@ describe("VolatileLayerClient", function() { // Set the response with mocked partitions for volatile layer mockedResponses.set( - `https://query.data.api.platform.here.com/query/v1/layers/test-layed-id/quadkeys/70/depths/3`, + `https://query.data.api.platform.here.com/query/v1/layers/test-layed-id/quadkeys/012/depths/3`, new Response( JSON.stringify({ parentQuads: [ @@ -796,7 +703,7 @@ describe("VolatileLayerClient", function() { // Set the response of mocked partitions with additional fields. mockedResponses.set( - `https://query.data.api.platform.here.com/query/v1/layers/test-layed-id/quadkeys/70/depths/0?additionalFields=dataSize,checksum,compressedDataSize`, + `https://query.data.api.platform.here.com/query/v1/layers/test-layed-id/quadkeys/012/depths/0?additionalFields=dataSize,checksum,compressedDataSize`, new Response(JSON.stringify(mockedPartitions), { headers }) ); @@ -890,7 +797,7 @@ describe("VolatileLayerClient", function() { ); mockedResponses.set( - `https://query.data.api.platform.here.com/hrn:here:data:::test-hrn/v1/layers/mocked-layer/quadkeys/24414/depths/4`, + `https://query.data.api.platform.here.com/hrn:here:data:::test-hrn/v1/layers/mocked-layer/quadkeys/1331132/depths/4`, new Response( `{"subQuads":[{"subQuadKey":"64","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"65","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"66","version":309,"dataHandle":"2297193A99F513DA23F40D0021CB01D0.309"},{"subQuadKey":"67","version":309,"dataHandle":"D63FA9E9CD89638BCCCF729BB7AD1CB8.309"},{"subQuadKey":"68","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"69","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"70","version":309,"dataHandle":"2297193A99F513DA23F40D0021CB01D0.309"},{"subQuadKey":"71","version":309,"dataHandle":"D63FA9E9CD89638BCCCF729BB7AD1CB8.309"},{"subQuadKey":"72","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"73","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"74","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"75","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"76","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"77","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"78","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"79","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"80","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"81","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"82","version":309,"dataHandle":"2297193A99F513DA23F40D0021CB01D0.309"},{"subQuadKey":"83","version":309,"dataHandle":"D63FA9E9CD89638BCCCF729BB7AD1CB8.309"},{"subQuadKey":"84","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"85","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"86","version":309,"dataHandle":"2297193A99F513DA23F40D0021CB01D0.309"},{"subQuadKey":"87","version":309,"dataHandle":"D63FA9E9CD89638BCCCF729BB7AD1CB8.309"},{"subQuadKey":"88","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"89","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"90","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"91","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"92","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"93","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"94","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"95","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"96","version":309,"dataHandle":"91682A4ABCAC3AB95758CF1E01444373.309"},{"subQuadKey":"97","version":309,"dataHandle":"7D068B97290AC948DC84BEBF10DD2079.309"},{"subQuadKey":"98","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"99","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"100","version":309,"dataHandle":"91682A4ABCAC3AB95758CF1E01444373.309"},{"subQuadKey":"101","version":309,"dataHandle":"7D068B97290AC948DC84BEBF10DD2079.309"},{"subQuadKey":"102","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"103","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"104","version":309,"dataHandle":"3BC6E551388E7E9449A6376CB0DB9254.309"},{"subQuadKey":"105","version":309,"dataHandle":"235A730981B48E30E04CA20457E3AC05.309"},{"subQuadKey":"106","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"107","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"108","version":309,"dataHandle":"3BC6E551388E7E9449A6376CB0DB9254.309"},{"subQuadKey":"109","version":309,"dataHandle":"235A730981B48E30E04CA20457E3AC05.309"},{"subQuadKey":"110","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"111","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"112","version":309,"dataHandle":"91682A4ABCAC3AB95758CF1E01444373.309"},{"subQuadKey":"113","version":309,"dataHandle":"7D068B97290AC948DC84BEBF10DD2079.309"},{"subQuadKey":"114","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"115","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"116","version":309,"dataHandle":"91682A4ABCAC3AB95758CF1E01444373.309"},{"subQuadKey":"117","version":309,"dataHandle":"7D068B97290AC948DC84BEBF10DD2079.309"},{"subQuadKey":"118","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"119","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"120","version":309,"dataHandle":"3BC6E551388E7E9449A6376CB0DB9254.309"},{"subQuadKey":"121","version":309,"dataHandle":"235A730981B48E30E04CA20457E3AC05.309"},{"subQuadKey":"122","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"123","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"124","version":309,"dataHandle":"3BC6E551388E7E9449A6376CB0DB9254.309"},{"subQuadKey":"125","version":309,"dataHandle":"235A730981B48E30E04CA20457E3AC05.309"},{"subQuadKey":"126","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"127","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"1","version":309,"dataHandle":"9E835327487159C24CC3BD9ABC1D9D8D.309"},{"subQuadKey":"16","version":309,"dataHandle":"DE6CE7A31E7272C8037B3E5344769A1A.309"},{"subQuadKey":"17","version":309,"dataHandle":"DE6CE7A31E7272C8037B3E5344769A1A.309"},{"subQuadKey":"18","version":309,"dataHandle":"C9522D8AA448785FCBC3B05E763B5477.309"},{"subQuadKey":"19","version":309,"dataHandle":"C9522D8AA448785FCBC3B05E763B5477.309"},{"subQuadKey":"20","version":309,"dataHandle":"DE6CE7A31E7272C8037B3E5344769A1A.309"},{"subQuadKey":"21","version":309,"dataHandle":"DE6CE7A31E7272C8037B3E5344769A1A.309"},{"subQuadKey":"22","version":309,"dataHandle":"C9522D8AA448785FCBC3B05E763B5477.309"},{"subQuadKey":"23","version":309,"dataHandle":"C9522D8AA448785FCBC3B05E763B5477.309"},{"subQuadKey":"24","version":309,"dataHandle":"65435B35BBE9825D5A75F8CF77F8B683.309"},{"subQuadKey":"25","version":309,"dataHandle":"65435B35BBE9825D5A75F8CF77F8B683.309"},{"subQuadKey":"26","version":309,"dataHandle":"AA64D744612B79BDF0FB9B1D311F28FD.309"},{"subQuadKey":"27","version":309,"dataHandle":"AA64D744612B79BDF0FB9B1D311F28FD.309"},{"subQuadKey":"28","version":309,"dataHandle":"65435B35BBE9825D5A75F8CF77F8B683.309"},{"subQuadKey":"29","version":309,"dataHandle":"65435B35BBE9825D5A75F8CF77F8B683.309"},{"subQuadKey":"30","version":309,"dataHandle":"AA64D744612B79BDF0FB9B1D311F28FD.309"},{"subQuadKey":"31","version":309,"dataHandle":"AA64D744612B79BDF0FB9B1D311F28FD.309"},{"subQuadKey":"256","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"257","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"258","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"259","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"260","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"261","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"262","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"263","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"264","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"265","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"266","version":309,"dataHandle":"44B55F66BD0CC98BD2EEB22B0946B923.309"},{"subQuadKey":"267","version":309,"dataHandle":"436735897B05C80C449B1D654541DE5E.309"},{"subQuadKey":"268","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"269","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"270","version":309,"dataHandle":"436735897B05C80C449B1D654541DE5E.309"},{"subQuadKey":"271","version":309,"dataHandle":"BB918FD0A2C3D0C13486DC20E70FE5D1.309"},{"subQuadKey":"272","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"273","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"274","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"275","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"276","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"277","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"278","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"279","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"280","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"281","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"282","version":309,"dataHandle":"44B55F66BD0CC98BD2EEB22B0946B923.309"},{"subQuadKey":"283","version":309,"dataHandle":"436735897B05C80C449B1D654541DE5E.309"},{"subQuadKey":"284","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"285","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"286","version":309,"dataHandle":"436735897B05C80C449B1D654541DE5E.309"},{"subQuadKey":"287","version":309,"dataHandle":"BB918FD0A2C3D0C13486DC20E70FE5D1.309"},{"subQuadKey":"288","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"289","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"290","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"291","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"292","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"293","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"294","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"295","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"296","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"297","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"298","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"299","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"300","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"301","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"302","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"303","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"304","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"305","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"306","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"307","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"308","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"309","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"310","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"311","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"312","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"313","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"314","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"315","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"316","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"317","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"318","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"319","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"320","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"321","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"322","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"323","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"324","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"325","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"326","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"327","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"328","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"329","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"330","version":309,"dataHandle":"44B55F66BD0CC98BD2EEB22B0946B923.309"},{"subQuadKey":"331","version":309,"dataHandle":"436735897B05C80C449B1D654541DE5E.309"},{"subQuadKey":"332","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"333","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"334","version":309,"dataHandle":"436735897B05C80C449B1D654541DE5E.309"},{"subQuadKey":"335","version":309,"dataHandle":"BB918FD0A2C3D0C13486DC20E70FE5D1.309"},{"subQuadKey":"336","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"337","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"338","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"339","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"340","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"341","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"342","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"343","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"344","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"345","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"346","version":309,"dataHandle":"44B55F66BD0CC98BD2EEB22B0946B923.309"},{"subQuadKey":"347","version":309,"dataHandle":"436735897B05C80C449B1D654541DE5E.309"},{"subQuadKey":"348","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"349","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"350","version":309,"dataHandle":"436735897B05C80C449B1D654541DE5E.309"},{"subQuadKey":"351","version":309,"dataHandle":"BB918FD0A2C3D0C13486DC20E70FE5D1.309"},{"subQuadKey":"352","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"353","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"354","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"355","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"356","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"357","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"358","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"359","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"360","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"361","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"362","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"363","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"364","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"365","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"366","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"367","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"368","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"369","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"370","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"371","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"372","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"373","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"374","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"375","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"376","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"377","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"378","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"379","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"380","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"381","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"382","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"383","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"384","version":309,"dataHandle":"B0D537F52AC1C17A27A339824C3853F9.309"},{"subQuadKey":"385","version":309,"dataHandle":"8EE1A707C5CB22DA4AC554EA1CF954D7.309"},{"subQuadKey":"386","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"387","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"388","version":309,"dataHandle":"8EE1A707C5CB22DA4AC554EA1CF954D7.309"},{"subQuadKey":"389","version":309,"dataHandle":"A2FA393A124DDB2EEAF962D41F33E85F.309"},{"subQuadKey":"390","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"391","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"392","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"393","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"394","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"395","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"396","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"397","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"398","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"399","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"400","version":309,"dataHandle":"B0D537F52AC1C17A27A339824C3853F9.309"},{"subQuadKey":"401","version":309,"dataHandle":"8EE1A707C5CB22DA4AC554EA1CF954D7.309"},{"subQuadKey":"402","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"403","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"404","version":309,"dataHandle":"8EE1A707C5CB22DA4AC554EA1CF954D7.309"},{"subQuadKey":"405","version":309,"dataHandle":"A2FA393A124DDB2EEAF962D41F33E85F.309"},{"subQuadKey":"406","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"407","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"408","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"409","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"410","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"411","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"412","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"413","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"414","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"415","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"416","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"417","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"418","version":309,"dataHandle":"F357AFDE030AA20DF6960B48EB625CA3.309"},{"subQuadKey":"419","version":309,"dataHandle":"33FCF2B9A0A070C97A1372C355C56E9D.309"},{"subQuadKey":"420","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"421","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"422","version":309,"dataHandle":"33FCF2B9A0A070C97A1372C355C56E9D.309"},{"subQuadKey":"423","version":309,"dataHandle":"5F74311EA37E90F55EC09D98F93EDA0C.309"},{"subQuadKey":"424","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"425","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"426","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"427","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"428","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"429","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"430","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"431","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"432","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"433","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"434","version":309,"dataHandle":"F357AFDE030AA20DF6960B48EB625CA3.309"},{"subQuadKey":"435","version":309,"dataHandle":"33FCF2B9A0A070C97A1372C355C56E9D.309"},{"subQuadKey":"436","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"437","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"438","version":309,"dataHandle":"33FCF2B9A0A070C97A1372C355C56E9D.309"},{"subQuadKey":"439","version":309,"dataHandle":"5F74311EA37E90F55EC09D98F93EDA0C.309"},{"subQuadKey":"440","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"441","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"442","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"443","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"444","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"445","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"446","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"447","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"448","version":309,"dataHandle":"B0D537F52AC1C17A27A339824C3853F9.309"},{"subQuadKey":"449","version":309,"dataHandle":"8EE1A707C5CB22DA4AC554EA1CF954D7.309"},{"subQuadKey":"450","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"451","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"452","version":309,"dataHandle":"8EE1A707C5CB22DA4AC554EA1CF954D7.309"},{"subQuadKey":"453","version":309,"dataHandle":"A2FA393A124DDB2EEAF962D41F33E85F.309"},{"subQuadKey":"454","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"455","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"456","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"457","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"458","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"459","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"460","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"461","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"462","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"463","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"464","version":309,"dataHandle":"B0D537F52AC1C17A27A339824C3853F9.309"},{"subQuadKey":"465","version":309,"dataHandle":"8EE1A707C5CB22DA4AC554EA1CF954D7.309"},{"subQuadKey":"466","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"467","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"468","version":309,"dataHandle":"8EE1A707C5CB22DA4AC554EA1CF954D7.309"},{"subQuadKey":"469","version":309,"dataHandle":"A2FA393A124DDB2EEAF962D41F33E85F.309"},{"subQuadKey":"470","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"471","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"472","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"473","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"474","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"475","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"476","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"477","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"478","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"479","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"480","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"481","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"482","version":309,"dataHandle":"F357AFDE030AA20DF6960B48EB625CA3.309"},{"subQuadKey":"483","version":309,"dataHandle":"33FCF2B9A0A070C97A1372C355C56E9D.309"},{"subQuadKey":"484","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"485","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"486","version":309,"dataHandle":"33FCF2B9A0A070C97A1372C355C56E9D.309"},{"subQuadKey":"487","version":309,"dataHandle":"5F74311EA37E90F55EC09D98F93EDA0C.309"},{"subQuadKey":"488","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"489","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"490","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"491","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"492","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"493","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"494","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"495","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"496","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"497","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"498","version":309,"dataHandle":"F357AFDE030AA20DF6960B48EB625CA3.309"},{"subQuadKey":"499","version":309,"dataHandle":"33FCF2B9A0A070C97A1372C355C56E9D.309"},{"subQuadKey":"500","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"501","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"502","version":309,"dataHandle":"33FCF2B9A0A070C97A1372C355C56E9D.309"},{"subQuadKey":"503","version":309,"dataHandle":"5F74311EA37E90F55EC09D98F93EDA0C.309"},{"subQuadKey":"504","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"505","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"506","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"507","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"508","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"509","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"510","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"511","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"4","version":309,"dataHandle":"8941BA72534EA59DC78AA066874F3F46.309"},{"subQuadKey":"5","version":309,"dataHandle":"8941BA72534EA59DC78AA066874F3F46.309"},{"subQuadKey":"6","version":309,"dataHandle":"0357B7D8E5E267C27A40375EEFD8CBDF.309"},{"subQuadKey":"7","version":309,"dataHandle":"0357B7D8E5E267C27A40375EEFD8CBDF.309"}],"parentQuads":[{"partition":"1525","version":309,"dataHandle":"5FA96A639F78245CCA052E6CA1B2E356.309"},{"partition":"23","version":311,"dataHandle":"E49841168CC61793C19635AB788B19F0.311"},{"partition":"381","version":309,"dataHandle":"B5496E024A5BBDB0AE8A7BD38614BB81.309"},{"partition":"5","version":311,"dataHandle":"48FBFF69B74F5B5CEEAE0D410ACF3783.311"},{"partition":"6103","version":309,"dataHandle":"B003789C316D46D70BDB0B4D02AE654A.309"},{"partition":"95","version":309,"dataHandle":"A46A7D44C6DB3C2880A0076FAE4098AF.309"}]}` ) diff --git a/tests/integration/olp-sdk-dataservice-read/getTile.test.ts b/tests/integration/olp-sdk-dataservice-read/getTile.test.ts index a8c9a32e..bcfcde16 100644 --- a/tests/integration/olp-sdk-dataservice-read/getTile.test.ts +++ b/tests/integration/olp-sdk-dataservice-read/getTile.test.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 HERE Europe B.V. + * Copyright (C) 2020-2021 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. @@ -20,13 +20,9 @@ import * as sinon from "sinon"; import * as chai from "chai"; import sinonChai = require("sinon-chai"); -import { - OlpClientSettings, - getTile, - HRN, - TileRequest -} from "@here/olp-sdk-dataservice-read"; +import { getTile, TileRequest } from "@here/olp-sdk-dataservice-read"; import { FetchMock } from "../FetchMock"; +import { HRN, OlpClientSettings } from "@here/olp-sdk-core"; chai.use(sinonChai); @@ -97,7 +93,7 @@ describe("getTile", () => { ); mockedResponses.set( - `https://query.data.api.platform.here.com/hrn:here-dev:data:::samplecatalog/v1/layers/mocked-layer/versions/123/quadkeys/24414/depths/4`, + `https://query.data.api.platform.here.com/hrn:here-dev:data:::samplecatalog/v1/layers/mocked-layer/versions/123/quadkeys/1331132/depths/4`, new Response( `{"subQuads":[{"subQuadKey":"64","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"65","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"66","version":309,"dataHandle":"2297193A99F513DA23F40D0021CB01D0.309"},{"subQuadKey":"67","version":309,"dataHandle":"D63FA9E9CD89638BCCCF729BB7AD1CB8.309"},{"subQuadKey":"68","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"69","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"70","version":309,"dataHandle":"2297193A99F513DA23F40D0021CB01D0.309"},{"subQuadKey":"71","version":309,"dataHandle":"D63FA9E9CD89638BCCCF729BB7AD1CB8.309"},{"subQuadKey":"72","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"73","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"74","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"75","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"76","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"77","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"78","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"79","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"80","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"81","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"82","version":309,"dataHandle":"2297193A99F513DA23F40D0021CB01D0.309"},{"subQuadKey":"83","version":309,"dataHandle":"D63FA9E9CD89638BCCCF729BB7AD1CB8.309"},{"subQuadKey":"84","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"85","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"86","version":309,"dataHandle":"2297193A99F513DA23F40D0021CB01D0.309"},{"subQuadKey":"87","version":309,"dataHandle":"D63FA9E9CD89638BCCCF729BB7AD1CB8.309"},{"subQuadKey":"88","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"89","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"90","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"91","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"92","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"93","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"94","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"95","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"96","version":309,"dataHandle":"91682A4ABCAC3AB95758CF1E01444373.309"},{"subQuadKey":"97","version":309,"dataHandle":"7D068B97290AC948DC84BEBF10DD2079.309"},{"subQuadKey":"98","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"99","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"100","version":309,"dataHandle":"91682A4ABCAC3AB95758CF1E01444373.309"},{"subQuadKey":"101","version":309,"dataHandle":"7D068B97290AC948DC84BEBF10DD2079.309"},{"subQuadKey":"102","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"103","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"104","version":309,"dataHandle":"3BC6E551388E7E9449A6376CB0DB9254.309"},{"subQuadKey":"105","version":309,"dataHandle":"235A730981B48E30E04CA20457E3AC05.309"},{"subQuadKey":"106","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"107","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"108","version":309,"dataHandle":"3BC6E551388E7E9449A6376CB0DB9254.309"},{"subQuadKey":"109","version":309,"dataHandle":"235A730981B48E30E04CA20457E3AC05.309"},{"subQuadKey":"110","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"111","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"112","version":309,"dataHandle":"91682A4ABCAC3AB95758CF1E01444373.309"},{"subQuadKey":"113","version":309,"dataHandle":"7D068B97290AC948DC84BEBF10DD2079.309"},{"subQuadKey":"114","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"115","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"116","version":309,"dataHandle":"91682A4ABCAC3AB95758CF1E01444373.309"},{"subQuadKey":"117","version":309,"dataHandle":"7D068B97290AC948DC84BEBF10DD2079.309"},{"subQuadKey":"118","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"119","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"120","version":309,"dataHandle":"3BC6E551388E7E9449A6376CB0DB9254.309"},{"subQuadKey":"121","version":309,"dataHandle":"235A730981B48E30E04CA20457E3AC05.309"},{"subQuadKey":"122","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"123","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"124","version":309,"dataHandle":"3BC6E551388E7E9449A6376CB0DB9254.309"},{"subQuadKey":"125","version":309,"dataHandle":"235A730981B48E30E04CA20457E3AC05.309"},{"subQuadKey":"126","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"127","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"1","version":309,"dataHandle":"9E835327487159C24CC3BD9ABC1D9D8D.309"},{"subQuadKey":"16","version":309,"dataHandle":"DE6CE7A31E7272C8037B3E5344769A1A.309"},{"subQuadKey":"17","version":309,"dataHandle":"DE6CE7A31E7272C8037B3E5344769A1A.309"},{"subQuadKey":"18","version":309,"dataHandle":"C9522D8AA448785FCBC3B05E763B5477.309"},{"subQuadKey":"19","version":309,"dataHandle":"C9522D8AA448785FCBC3B05E763B5477.309"},{"subQuadKey":"20","version":309,"dataHandle":"DE6CE7A31E7272C8037B3E5344769A1A.309"},{"subQuadKey":"21","version":309,"dataHandle":"DE6CE7A31E7272C8037B3E5344769A1A.309"},{"subQuadKey":"22","version":309,"dataHandle":"C9522D8AA448785FCBC3B05E763B5477.309"},{"subQuadKey":"23","version":309,"dataHandle":"C9522D8AA448785FCBC3B05E763B5477.309"},{"subQuadKey":"24","version":309,"dataHandle":"65435B35BBE9825D5A75F8CF77F8B683.309"},{"subQuadKey":"25","version":309,"dataHandle":"65435B35BBE9825D5A75F8CF77F8B683.309"},{"subQuadKey":"26","version":309,"dataHandle":"AA64D744612B79BDF0FB9B1D311F28FD.309"},{"subQuadKey":"27","version":309,"dataHandle":"AA64D744612B79BDF0FB9B1D311F28FD.309"},{"subQuadKey":"28","version":309,"dataHandle":"65435B35BBE9825D5A75F8CF77F8B683.309"},{"subQuadKey":"29","version":309,"dataHandle":"65435B35BBE9825D5A75F8CF77F8B683.309"},{"subQuadKey":"30","version":309,"dataHandle":"AA64D744612B79BDF0FB9B1D311F28FD.309"},{"subQuadKey":"31","version":309,"dataHandle":"AA64D744612B79BDF0FB9B1D311F28FD.309"},{"subQuadKey":"256","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"257","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"258","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"259","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"260","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"261","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"262","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"263","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"264","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"265","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"266","version":309,"dataHandle":"44B55F66BD0CC98BD2EEB22B0946B923.309"},{"subQuadKey":"267","version":309,"dataHandle":"436735897B05C80C449B1D654541DE5E.309"},{"subQuadKey":"268","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"269","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"270","version":309,"dataHandle":"436735897B05C80C449B1D654541DE5E.309"},{"subQuadKey":"271","version":309,"dataHandle":"BB918FD0A2C3D0C13486DC20E70FE5D1.309"},{"subQuadKey":"272","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"273","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"274","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"275","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"276","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"277","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"278","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"279","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"280","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"281","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"282","version":309,"dataHandle":"44B55F66BD0CC98BD2EEB22B0946B923.309"},{"subQuadKey":"283","version":309,"dataHandle":"436735897B05C80C449B1D654541DE5E.309"},{"subQuadKey":"284","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"285","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"286","version":309,"dataHandle":"436735897B05C80C449B1D654541DE5E.309"},{"subQuadKey":"287","version":309,"dataHandle":"BB918FD0A2C3D0C13486DC20E70FE5D1.309"},{"subQuadKey":"288","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"289","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"290","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"291","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"292","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"293","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"294","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"295","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"296","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"297","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"298","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"299","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"300","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"301","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"302","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"303","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"304","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"305","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"306","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"307","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"308","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"309","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"310","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"311","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"312","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"313","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"314","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"315","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"316","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"317","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"318","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"319","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"320","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"321","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"322","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"323","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"324","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"325","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"326","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"327","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"328","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"329","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"330","version":309,"dataHandle":"44B55F66BD0CC98BD2EEB22B0946B923.309"},{"subQuadKey":"331","version":309,"dataHandle":"436735897B05C80C449B1D654541DE5E.309"},{"subQuadKey":"332","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"333","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"334","version":309,"dataHandle":"436735897B05C80C449B1D654541DE5E.309"},{"subQuadKey":"335","version":309,"dataHandle":"BB918FD0A2C3D0C13486DC20E70FE5D1.309"},{"subQuadKey":"336","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"337","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"338","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"339","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"340","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"341","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"342","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"343","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"344","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"345","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"346","version":309,"dataHandle":"44B55F66BD0CC98BD2EEB22B0946B923.309"},{"subQuadKey":"347","version":309,"dataHandle":"436735897B05C80C449B1D654541DE5E.309"},{"subQuadKey":"348","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"349","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"350","version":309,"dataHandle":"436735897B05C80C449B1D654541DE5E.309"},{"subQuadKey":"351","version":309,"dataHandle":"BB918FD0A2C3D0C13486DC20E70FE5D1.309"},{"subQuadKey":"352","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"353","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"354","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"355","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"356","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"357","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"358","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"359","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"360","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"361","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"362","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"363","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"364","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"365","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"366","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"367","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"368","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"369","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"370","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"371","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"372","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"373","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"374","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"375","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"376","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"377","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"378","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"379","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"380","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"381","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"382","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"383","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"384","version":309,"dataHandle":"B0D537F52AC1C17A27A339824C3853F9.309"},{"subQuadKey":"385","version":309,"dataHandle":"8EE1A707C5CB22DA4AC554EA1CF954D7.309"},{"subQuadKey":"386","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"387","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"388","version":309,"dataHandle":"8EE1A707C5CB22DA4AC554EA1CF954D7.309"},{"subQuadKey":"389","version":309,"dataHandle":"A2FA393A124DDB2EEAF962D41F33E85F.309"},{"subQuadKey":"390","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"391","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"392","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"393","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"394","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"395","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"396","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"397","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"398","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"399","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"400","version":309,"dataHandle":"B0D537F52AC1C17A27A339824C3853F9.309"},{"subQuadKey":"401","version":309,"dataHandle":"8EE1A707C5CB22DA4AC554EA1CF954D7.309"},{"subQuadKey":"402","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"403","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"404","version":309,"dataHandle":"8EE1A707C5CB22DA4AC554EA1CF954D7.309"},{"subQuadKey":"405","version":309,"dataHandle":"A2FA393A124DDB2EEAF962D41F33E85F.309"},{"subQuadKey":"406","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"407","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"408","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"409","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"410","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"411","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"412","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"413","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"414","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"415","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"416","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"417","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"418","version":309,"dataHandle":"F357AFDE030AA20DF6960B48EB625CA3.309"},{"subQuadKey":"419","version":309,"dataHandle":"33FCF2B9A0A070C97A1372C355C56E9D.309"},{"subQuadKey":"420","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"421","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"422","version":309,"dataHandle":"33FCF2B9A0A070C97A1372C355C56E9D.309"},{"subQuadKey":"423","version":309,"dataHandle":"5F74311EA37E90F55EC09D98F93EDA0C.309"},{"subQuadKey":"424","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"425","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"426","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"427","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"428","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"429","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"430","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"431","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"432","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"433","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"434","version":309,"dataHandle":"F357AFDE030AA20DF6960B48EB625CA3.309"},{"subQuadKey":"435","version":309,"dataHandle":"33FCF2B9A0A070C97A1372C355C56E9D.309"},{"subQuadKey":"436","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"437","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"438","version":309,"dataHandle":"33FCF2B9A0A070C97A1372C355C56E9D.309"},{"subQuadKey":"439","version":309,"dataHandle":"5F74311EA37E90F55EC09D98F93EDA0C.309"},{"subQuadKey":"440","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"441","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"442","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"443","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"444","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"445","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"446","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"447","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"448","version":309,"dataHandle":"B0D537F52AC1C17A27A339824C3853F9.309"},{"subQuadKey":"449","version":309,"dataHandle":"8EE1A707C5CB22DA4AC554EA1CF954D7.309"},{"subQuadKey":"450","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"451","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"452","version":309,"dataHandle":"8EE1A707C5CB22DA4AC554EA1CF954D7.309"},{"subQuadKey":"453","version":309,"dataHandle":"A2FA393A124DDB2EEAF962D41F33E85F.309"},{"subQuadKey":"454","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"455","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"456","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"457","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"458","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"459","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"460","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"461","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"462","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"463","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"464","version":309,"dataHandle":"B0D537F52AC1C17A27A339824C3853F9.309"},{"subQuadKey":"465","version":309,"dataHandle":"8EE1A707C5CB22DA4AC554EA1CF954D7.309"},{"subQuadKey":"466","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"467","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"468","version":309,"dataHandle":"8EE1A707C5CB22DA4AC554EA1CF954D7.309"},{"subQuadKey":"469","version":309,"dataHandle":"A2FA393A124DDB2EEAF962D41F33E85F.309"},{"subQuadKey":"470","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"471","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"472","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"473","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"474","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"475","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"476","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"477","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"478","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"479","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"480","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"481","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"482","version":309,"dataHandle":"F357AFDE030AA20DF6960B48EB625CA3.309"},{"subQuadKey":"483","version":309,"dataHandle":"33FCF2B9A0A070C97A1372C355C56E9D.309"},{"subQuadKey":"484","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"485","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"486","version":309,"dataHandle":"33FCF2B9A0A070C97A1372C355C56E9D.309"},{"subQuadKey":"487","version":309,"dataHandle":"5F74311EA37E90F55EC09D98F93EDA0C.309"},{"subQuadKey":"488","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"489","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"490","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"491","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"492","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"493","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"494","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"495","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"496","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"497","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"498","version":309,"dataHandle":"F357AFDE030AA20DF6960B48EB625CA3.309"},{"subQuadKey":"499","version":309,"dataHandle":"33FCF2B9A0A070C97A1372C355C56E9D.309"},{"subQuadKey":"500","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"501","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"502","version":309,"dataHandle":"33FCF2B9A0A070C97A1372C355C56E9D.309"},{"subQuadKey":"503","version":309,"dataHandle":"5F74311EA37E90F55EC09D98F93EDA0C.309"},{"subQuadKey":"504","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"505","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"506","version":309,"dataHandle":"B8B9757AE8399D9603A684BAEA18C0AB.309"},{"subQuadKey":"507","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"508","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"509","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"510","version":309,"dataHandle":"5D220F614ED66FDD4850E9846482193A.309"},{"subQuadKey":"511","version":309,"dataHandle":"3774FD2C4E793770B86B82CF87F85E8B.309"},{"subQuadKey":"4","version":309,"dataHandle":"8941BA72534EA59DC78AA066874F3F46.309"},{"subQuadKey":"5","version":309,"dataHandle":"8941BA72534EA59DC78AA066874F3F46.309"},{"subQuadKey":"6","version":309,"dataHandle":"0357B7D8E5E267C27A40375EEFD8CBDF.309"},{"subQuadKey":"7","version":309,"dataHandle":"0357B7D8E5E267C27A40375EEFD8CBDF.309"}],"parentQuads":[{"partition":"1525","version":309,"dataHandle":"5FA96A639F78245CCA052E6CA1B2E356.309"},{"partition":"23","version":311,"dataHandle":"E49841168CC61793C19635AB788B19F0.311"},{"partition":"381","version":309,"dataHandle":"B5496E024A5BBDB0AE8A7BD38614BB81.309"},{"partition":"5","version":311,"dataHandle":"48FBFF69B74F5B5CEEAE0D410ACF3783.311"},{"partition":"6103","version":309,"dataHandle":"B003789C316D46D70BDB0B4D02AE654A.309"},{"partition":"95","version":309,"dataHandle":"A46A7D44C6DB3C2880A0076FAE4098AF.309"}]}` ) @@ -116,19 +112,27 @@ describe("getTile", () => { // Setup the fetch to use mocked responses. fetchMock.withMockedResponses(mockedResponses); - const request = new TileRequest({ - catalogHrn: HRN.fromString("hrn:here-dev:data:::samplecatalog"), - layerId: "mocked-layer", - layerType: "versioned", - settings, - catalogVersion: 123 - }); + const request = new TileRequest(); const response = await getTile( - request.withTileKey({ row: 818, column: 2021, level: 11 }) + request.withTileKey({ row: 818, column: 2021, level: 11 }), + { + catalogHrn: HRN.fromString("hrn:here-dev:data:::samplecatalog"), + layerId: "mocked-layer", + layerType: "versioned", + settings, + catalogVersion: 123 + } ); const response2 = await getTile( - request.withTileKey({ row: 819, column: 2021, level: 11 }) + request.withTileKey({ row: 819, column: 2021, level: 11 }), + { + catalogHrn: HRN.fromString("hrn:here-dev:data:::samplecatalog"), + layerId: "mocked-layer", + layerType: "versioned", + settings, + catalogVersion: 123 + } ); assert.isDefined(response); diff --git a/tests/performance/getDataMemoryTest.ts b/tests/performance/getDataMemoryTest.ts index 191339e4..3c51724c 100644 --- a/tests/performance/getDataMemoryTest.ts +++ b/tests/performance/getDataMemoryTest.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 HERE Europe B.V. + * Copyright (C) 2020-2021 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. @@ -20,11 +20,10 @@ /* tslint:disable */ import { - OlpClientSettings, VersionedLayerClient, - HRN, DataRequest } from "@here/olp-sdk-dataservice-read"; +import { HRN, OlpClientSettings } from "@here/olp-sdk-core"; import { getSleepPeriod, sleep, TestParams } from "./utils"; diff --git a/tests/performance/getDataPartitionsTest.ts b/tests/performance/getDataPartitionsTest.ts index 7a0c06f6..35cc943f 100644 --- a/tests/performance/getDataPartitionsTest.ts +++ b/tests/performance/getDataPartitionsTest.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 HERE Europe B.V. + * Copyright (C) 2020-2021 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. @@ -20,11 +20,10 @@ /* tslint:disable */ import { - OlpClientSettings, VersionedLayerClient, - HRN, PartitionsRequest } from "@here/olp-sdk-dataservice-read"; +import { OlpClientSettings, HRN } from "@here/olp-sdk-core"; import { getSleepPeriod, sleep, TestParams } from "./utils";