From 6d8739d15fae9fb001d4220830f514e467b2f19d Mon Sep 17 00:00:00 2001 From: Dennis Sen Date: Tue, 30 Jan 2024 08:57:45 +0100 Subject: [PATCH 1/2] narrow down type --- packages/lib/getFeatures/CHANGELOG.md | 4 ++++ packages/lib/getFeatures/gazetteer/index.ts | 2 +- packages/lib/getFeatures/gazetteer/parse.ts | 2 +- packages/lib/getFeatures/types.ts | 2 +- packages/types/custom/CHANGELOG.md | 4 ++++ packages/types/custom/core.ts | 4 ++-- 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/packages/lib/getFeatures/CHANGELOG.md b/packages/lib/getFeatures/CHANGELOG.md index 385b843b..f97c504e 100644 --- a/packages/lib/getFeatures/CHANGELOG.md +++ b/packages/lib/getFeatures/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## unpublished + +- Fix: Increase type precision of EPSG codes from `string` to `EPSG:${string}`. + ## 1.0.0 Initial release. diff --git a/packages/lib/getFeatures/gazetteer/index.ts b/packages/lib/getFeatures/gazetteer/index.ts index 6c0ba8eb..edd68764 100644 --- a/packages/lib/getFeatures/gazetteer/index.ts +++ b/packages/lib/getFeatures/gazetteer/index.ts @@ -23,7 +23,7 @@ export function getGazetteerFeatures( version: WFSVersion, memberSuffix: MemberSuffix, namespaces: string[], - epsg: string, + epsg: `EPSG:${string}`, options: AdditionalSearchOptions = {} ): Promise { let requestUrl = Object.entries(input).reduce( diff --git a/packages/lib/getFeatures/gazetteer/parse.ts b/packages/lib/getFeatures/gazetteer/parse.ts index e2119b6a..f91262dd 100644 --- a/packages/lib/getFeatures/gazetteer/parse.ts +++ b/packages/lib/getFeatures/gazetteer/parse.ts @@ -16,7 +16,7 @@ export function parseGazetteerResponse( response: Response, memberSuffix: MemberSuffix, namespaces: string[], - epsg: string, + epsg: `EPSG:${string}`, title?: string | string[] ): Promise { return response.text().then((text) => { diff --git a/packages/lib/getFeatures/types.ts b/packages/lib/getFeatures/types.ts index 8c48c070..2bd53aa4 100644 --- a/packages/lib/getFeatures/types.ts +++ b/packages/lib/getFeatures/types.ts @@ -15,7 +15,7 @@ export interface AdditionalSearchOptions { /** Adds the possibility to have a 'title' attribute in a GeoJSON Feature */ export interface PolarGeoJsonFeature extends GeoJsonFeature { /** The projection of the coordinates of the features */ - epsg: string + epsg: `EPSG:${string}` /** Which fieldName to use for display purposes; e.g. used in the AddressSearch for the result list */ title?: string } diff --git a/packages/types/custom/CHANGELOG.md b/packages/types/custom/CHANGELOG.md index 37f6d02f..c05ef4e6 100644 --- a/packages/types/custom/CHANGELOG.md +++ b/packages/types/custom/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## unpublished + +- Fix: Increase type precision of EPSG codes from `string` to `EPSG:${string}`. + ## 1.4.0 - Feature: Add `MasterportalapiPolygonFillHatch` to `MarkerStyle` as optional fill variant. diff --git a/packages/types/custom/core.ts b/packages/types/custom/core.ts index 75bf680b..edd59cb1 100644 --- a/packages/types/custom/core.ts +++ b/packages/types/custom/core.ts @@ -44,7 +44,7 @@ export type SearchType = 'bkg' | 'gazetteer' | 'wfs' | 'mpapi' */ export interface QueryParameters { /** Currently used projection of the map */ - epsg: string + epsg: `EPSG:${string}` /** sets the maximum number of features to retrieve */ maxFeatures?: number // type:mpapi – these are forwarded to the masterportalApi @@ -570,7 +570,7 @@ export interface MapConfig { /** if true, all services' availability will be checked with head requests */ checkServiceAvailability?: boolean /** The epsg code of the projection that the map will use */ - epsg: string + epsg: `EPSG:${string}` /** Configured layers */ layers: LayerConfiguration[] /** masterportalapi-type layer configuration */ From 179e339b3bd05e3107087f81facf8bac8ae9c6d1 Mon Sep 17 00:00:00 2001 From: Dennis Sen Date: Tue, 30 Jan 2024 09:01:21 +0100 Subject: [PATCH 2/2] fix default value --- packages/lib/createTestMountParameters/CHANGELOG.md | 4 ++++ packages/lib/createTestMountParameters/index.ts | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/lib/createTestMountParameters/CHANGELOG.md b/packages/lib/createTestMountParameters/CHANGELOG.md index 8ce0524a..823fa38b 100644 --- a/packages/lib/createTestMountParameters/CHANGELOG.md +++ b/packages/lib/createTestMountParameters/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## unpublished + +- Fix: Test now uses a mock EPSG code instead of an empty string. + ## 1.2.0 - Feature: Extend mock state to match current core state type. diff --git a/packages/lib/createTestMountParameters/index.ts b/packages/lib/createTestMountParameters/index.ts index f7153532..aa42e8b6 100644 --- a/packages/lib/createTestMountParameters/index.ts +++ b/packages/lib/createTestMountParameters/index.ts @@ -49,7 +49,7 @@ export default (): MockParameters => { center: null, components: 1, configuration: { - epsg: '', + epsg: 'EPSG:12345', layerConf: [], namedProjections: [], layers: [],