From f641f9970988a92082f264b45faad0583209be04 Mon Sep 17 00:00:00 2001 From: Nick Forbes-Smith Date: Wed, 21 Aug 2024 10:55:46 +1000 Subject: [PATCH] Update changes --- CHANGES.md | 17 ++++++++--------- .../Esri/ArcGisImageServerCatalogItem.ts | 5 +++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 44ea499773..ed4abec974 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -7,14 +7,6 @@ - extract common style logic to new Cesium3dTilesStyleMixin.ts - Set default value for date and datetime WPS fields only when the field is marked as required. - Add Proj4 definition for EPSG:8059 -- [The next improvement] - -#### 8.7.5 - 2024-06-26 - -- TSify some `js` and `jsx` files and provide `.d.ts` ambient type files for a few others. This is so that running `tsc` on an external project that imports Terria code will typecheck successfully. -- Upgraded a bunch of d3 dependencies for fixing security errors. -- Show rectangle selector for WPS bounding box parameter -- Fix `store` and `status` values send in WPS Execute request. - Add support for ArcGis ImageServer - this includes - Support for "dynamic" `exportImage` endpoint (using `102100` wkid) - Support for web mercator and wgs84 precached tiles @@ -23,9 +15,16 @@ - Increase `maxRefreshIntervals` from 1000 to 10000 for `WebMapServiceCatalogItem` and `ArcGisMapServerCatalogItem`. - Add `nextDiscreteJulianDate` helper computed value to `DiscretelyTimeVaryingMixin` - Add `EPSG:7899` to `Proj4Definitions` -- Add docs for `modelDimensions` - [The next improvement] +#### 8.7.5 - 2024-06-26 + +- TSify some `js` and `jsx` files and provide `.d.ts` ambient type files for a few others. This is so that running `tsc` on an external project that imports Terria code will typecheck successfully. +- Upgraded a bunch of d3 dependencies for fixing security errors. +- Show rectangle selector for WPS bounding box parameter +- Fix `store` and `status` values send in WPS Execute request. +- Add docs for `modelDimensions` + #### 8.7.4 - 2024-06-07 - Fix position of draggable point after moving. diff --git a/lib/Models/Catalog/Esri/ArcGisImageServerCatalogItem.ts b/lib/Models/Catalog/Esri/ArcGisImageServerCatalogItem.ts index be00a46107..2bdb0841d4 100644 --- a/lib/Models/Catalog/Esri/ArcGisImageServerCatalogItem.ts +++ b/lib/Models/Catalog/Esri/ArcGisImageServerCatalogItem.ts @@ -7,7 +7,7 @@ import WebMercatorTilingScheme from "terriajs-cesium/Source/Core/WebMercatorTili import URI from "urijs"; import AsyncLoader from "../../../Core/AsyncLoader"; import { JsonObject, isJsonObject } from "../../../Core/Json"; -import TerriaError, { networkRequestError } from "../../../Core/TerriaError"; +import TerriaError from "../../../Core/TerriaError"; import createDiscreteTimesFromIsoSegments from "../../../Core/createDiscreteTimes"; import createTransformerAllowUndefined from "../../../Core/createTransformerAllowUndefined"; import filterOutUndefined from "../../../Core/filterOutUndefined"; @@ -419,6 +419,7 @@ export default class ArcGisImageServerCatalogItem extends UrlMixin( return result; } + @computed private get _currentImageryParts(): ImageryParts | undefined { // Make sure legend stays up to date this._legendStratumLoader.load(); @@ -587,7 +588,7 @@ function getBaseURI(item: ArcGisImageServerCatalogItem) { return uri; } -async function getJson(item: ArcGisImageServerCatalogItem, uri: any) { +async function getJson(item: ArcGisImageServerCatalogItem, uri: uri.URI) { try { const response = await loadJson( proxyCatalogItemUrl(item, uri.addQuery("f", "json").toString())