Merge pull request #101 from Dataport/fix/narrower-type

narrow down type for EPSG codes
Dataport · Feb 5, 2024 · d20eb0b · d20eb0b
2 parents b4dd6f3 + 49cee51
commit d20eb0b
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 6 deletions.
diff --git 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
@@ -23,7 +23,7 @@ export function getGazetteerFeatures(
   version: WFSVersion,
   memberSuffix: MemberSuffix,
   namespaces: string[],
-  epsg: string,
+  epsg: `EPSG:${string}`,
   options: AdditionalSearchOptions = {}
 ): Promise<FeatureCollection> {
   let requestUrl = Object.entries(input).reduce(

diff --git 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<FeatureCollection> {
   return response.text().then((text) => {

diff --git 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/lib/testMountParameters/CHANGELOG.md b/packages/lib/testMountParameters/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/testMountParameters/index.ts b/packages/lib/testMountParameters/index.ts
@@ -49,7 +49,7 @@ export default (): MockParameters => {
       center: null,
       components: 1,
       configuration: {
-        epsg: '',
+        epsg: 'EPSG:12345',
         layerConf: [],
         namedProjections: [],
         layers: [],

diff --git 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
@@ -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 */