POLAR@3: Add nominatim support

examples/iceberg/components/IcebergMap.vue

@@ -142,6 +142,7 @@ watch(map, (map) => {
 			toZoomLevel: 7,
 		}),
 		pluginReverseGeocoder({
+			type: 'wps',
 			url: 'https://geodienste.hamburg.de/HH_WPS',
 			coordinateSources: [
 				{

examples/snowbox/index.js

@@ -92,7 +92,7 @@
 		colorScheme,
 		startCenter: [565874, 5934140],
 		layers: [
 			// TODO: Add internalization to snowbox
 			{
 				id: basemapId,
 				visibility: true,
@@ -359,7 +359,10 @@
 addPlugin(
 	map,
 	pluginReverseGeocoder({
-		url: 'https://geodienste.hamburg.de/HH_WPS',
+		// type: 'wps',
+		// url: 'https://geodienste.hamburg.de/HH_WPS',
+		type: 'nominatim',
+		url: 'https://polar.dataport.de/nominatim/reverse',
 		coordinateSources: [
 			{
 				plugin: 'pins',
@@ -509,6 +512,7 @@
 		displayComponent: true,
 		layoutTag: 'TOP_LEFT',
 		searchMethods: [
+			/*
 			{
 				queryParameters: {
 					searchStreets: true,
@@ -517,6 +521,12 @@
 				type: 'mpapi',
 				url: 'https://geodienste.hamburg.de/HH_WFS_GAGES?service=WFS&request=GetFeature&version=2.0.0',
 			},
+			*/
+			{
+				type: 'nominatim',
+				url: 'https://polar.dataport.de/nominatim/search',
+				queryParameters: {},
+			},
 		],
 		minLength: 3,
 		waitMs: 300,

src/client.ts

@@ -62,7 +62,7 @@ function addPlugins(map: typeof PolarContainer, enabledPlugins: string[]) {
 					layoutTag: 'BOTTOM_LEFT',
 				}),
 			enabledPlugins.includes('reverseGeocoder') &&
-				ReverseGeocoder({ url: '' }),
+				ReverseGeocoder({ url: '', type: 'wps' }),
 			enabledPlugins.includes('scale') &&
 				Scale({
 					displayComponent: true,

src/lib/getFeatures/nominatim.ts

@@ -0,0 +1,62 @@
+import type { Point } from 'geojson'
+
+import { transform as transformCoordinates } from 'ol/proj'
+
+import type { PolarGeoJsonFeatureCollection } from '@/core'
+
+import type { NominatimParameters } from './types'
+
+export default async function (
+	signal: AbortSignal,
+	url: string,
+	inputValue: string,
+	queryParameters: NominatimParameters
+): Promise<PolarGeoJsonFeatureCollection> {
+	const { epsg, maxFeatures, ...native } = queryParameters
+
+	const fetchUrl = new URL(url)
+	Object.entries({
+		...Object.fromEntries(
+			Object.entries(native).map(([key, value]) => [
+				key,
+				Array.isArray(value) ? value.join(',') : value,
+			])
+		),
+		...(maxFeatures ? { limit: maxFeatures } : {}),
+		q: inputValue,
+		format: 'geojson',
+		polygon_geojson: 0, // TODO: Setting this to 1 is currently not supported well by addressSearch plugin. The plugin expects a point geometry.
+		polygon_threshold: 5,
+	}).forEach(([key, value]) => {
+		fetchUrl.searchParams.set(key, value.toString())
+	})
+
+	return await fetch(fetchUrl, {
+		signal,
+	})
+		.then((response) => response.json())
+		.then((featureCollection) => ({
+			...featureCollection,
+			features: featureCollection.features.map((feature) => ({
+				...feature,
+				title: feature.properties.display_name,
+				geometry: {
+					...feature.geometry,
+					coordinates:
+						epsg === 'EPSG:4326'
+							? feature.geometry.coordinates
+							: feature.geometry.type === 'Polygon'
+								? feature.geometry.coordinates.map((ring) =>
+										ring.map((coord) =>
+											transformCoordinates(coord, 'EPSG:4326', epsg)
+										)
+									)
+								: transformCoordinates(
+										(feature.geometry as Point).coordinates,
+										'EPSG:4326',
+										epsg
+									),
+				},
+			})),
+		}))
+}

src/lib/getFeatures/types.ts

@@ -288,3 +288,85 @@ export interface WfsParameters extends QueryParameters {
 	 */
 	useRightHandWildcard?: boolean
 }
+
+export interface NominatimParameters extends QueryParameters {
+	/**
+	 * Include address details in result?
+	 */
+	addressdetails?: boolean
+
+	/**
+	 * Name and/or type of POI.
+	 */
+	amenity?: string
+
+	/**
+	 * Whether to consider the viewbox as exact instead of fuzzy filter.
+	 */
+	bounded?: boolean
+
+	/**
+	 * City.
+	 */
+	city?: string
+
+	/**
+	 * Country.
+	 */
+	country?: string
+
+	/**
+	 * Country code (ISO 3166-1alpha2).
+	 */
+	countrycodes?: string[]
+
+	/**
+	 * County.
+	 */
+	county?: string
+
+	/**
+	 * Include entrances to buildings in results?
+	 */
+	entrances?: boolean
+
+	/**
+	 * Add extra tags to result?
+	 */
+	extratags?: boolean
+
+	/**
+	 * Which feature types to include.
+	 */
+	featureType?: 'country' | 'state' | 'city' | 'settlement'
+
+	/**
+	 * Which type(s) of results to return.
+	 */
+	layer?: ('address' | 'poi' | 'railway' | 'natural' | 'manmade')[]
+
+	/**
+	 * Include more names in alternate languages?
+	 */
+	namedetails?: boolean
+
+	/**
+	 * Postal code.
+	 */
+	postalcode?: string
+
+	/**
+	 * State.
+	 */
+	state?: string
+
+	/**
+	 * House number and street name.
+	 */
+	street?: string
+
+	/**
+	 * Viewbox to prefer for searching the given term.
+	 */
+	viewbox?: [number, number, number, number]
+}

src/plugins/addressSearch/types.ts

@@ -127,7 +127,7 @@ export interface AddressSearchPluginOptions extends PluginOptions {
 
 /** Possible search methods by type. */
 // eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
-export type SearchType = 'bkg' | 'wfs' | 'mpapi' | string
+export type SearchType = 'bkg' | 'wfs' | 'mpapi' | 'nominatim' | string
 
 export type SearchDisplayMode = 'mixed' | 'categorized'
 
@@ -177,7 +177,7 @@ export interface SearchMethodConfiguration {
 
 	/**
 	 * The object further describes details for the search request.
-	 * Its contents vary by service type, see {@link BKGParameters}, {@link MpapiParameters} or {@link WfsParameters}.
+	 * Its contents vary by service type, see {@link BKGParameters}, {@link MpapiParameters}, {@link WfsParameters} or {@link NominatimParameters}.
 	 */
 	queryParameters?: QueryParameters
 

src/plugins/addressSearch/utils/methodContainer.ts

@@ -1,11 +1,12 @@
 import bkg from '@/lib/getFeatures/bkg'
 import mpapi from '@/lib/getFeatures/mpapi'
+import nominatim from '@/lib/getFeatures/nominatim'
 import { getWfsFeatures } from '@/lib/getFeatures/wfs'
 
 import type { SearchMethodFunction } from '../types'
 
 export function getMethodContainer() {
-	const methods = { bkg, mpapi, wfs: getWfsFeatures }
+	const methods = { bkg, mpapi, nominatim, wfs: getWfsFeatures }
 
 	return {
 		registerSearchMethods: (

src/plugins/reverseGeocoder/store.ts

@@ -20,7 +20,8 @@ import {
 	type ReverseGeocoderFeature,
 	type ReverseGeocoderPluginOptions,
 } from './types'
-import { reverseGeocode as reverseGeocodeUtil } from './utils/reverseGeocode'
+import { reverseGeocodeNominatim } from './utils/reverseGeocodeNominatim'
+import { reverseGeocodeWps } from './utils/reverseGeocodeWps'
 
 /* eslint-disable tsdoc/syntax */
 /**
@@ -77,9 +78,14 @@ export const useReverseGeocoderStore = defineStore(
 			abortController.value = new AbortController()
 			const signal = toRaw(abortController.value.signal)
 			try {
+				const reverseGeocodeUtil = {
+					wps: reverseGeocodeWps,
+					nominatim: reverseGeocodeNominatim,
+				}[configuration.value.type]
 				const feature = await reverseGeocodeUtil(
 					configuration.value.url,
 					coordinate,
+					coreStore.configuration.epsg,
 					signal
 				)
 				if (configuration.value.addressTarget) {
@@ -129,20 +135,20 @@ if (import.meta.vitest) {
 	const { createPinia, setActivePinia } = await import('pinia')
 	const { reactive } = await import('vue')
 	const useCoreStoreFile = await import('@/core/stores')
-	const reverseGeocodeUtilFile = await import('./utils/reverseGeocode')
+	const reverseGeocodeUtilFile = await import('./utils/reverseGeocodeWps')
 	const indicateLoadingFile = await import('@/lib/indicateLoading')
 
 	/* eslint-disable no-empty-pattern */
 	const test = _test.extend<{
-		reverseGeocodeUtil: Mock<typeof reverseGeocodeUtil>
+		reverseGeocodeUtil: Mock<typeof reverseGeocodeWps>
 		indicateLoading: Mock<typeof indicateLoading>
 		coreStore: Reactive<Record<string, unknown>>
 		store: ReturnType<typeof useReverseGeocoderStore>
 	}>({
 		reverseGeocodeUtil: [
 			async ({}, use) => {
 				const reverseGeocodeUtil = vi
-					.spyOn(reverseGeocodeUtilFile, 'reverseGeocode')
+					.spyOn(reverseGeocodeUtilFile, 'reverseGeocodeWps')
 					.mockResolvedValue(null as unknown as ReverseGeocoderFeature)
 				await use(reverseGeocodeUtil)
 			},
@@ -167,7 +173,9 @@ if (import.meta.vitest) {
 				}
 				const coreStore = reactive({
 					configuration: {
+						epsg: 'EPSG:25832',
 						[PluginId]: {
+							type: 'wps',
 							url: 'https://wps.example',
 							coordinateSources: [{ plugin: 'pins', key: 'coordinate' }],
 							addressTarget: { key: 'addressTarget' },
@@ -211,9 +219,10 @@ if (import.meta.vitest) {
 		}
 		pluginStore.pins.coordinate = [1, 2]
 		await new Promise((resolve) => setTimeout(resolve))
-		expect(reverseGeocodeUtil).toHaveBeenCalledWith(
+		expect(reverseGeocodeUtil).toHaveBeenCalledExactlyOnceWith(
 			'https://wps.example',
 			[1, 2],
+			'EPSG:25832',
 			store.abortController?.signal
 		)
 	})
@@ -228,8 +237,7 @@ if (import.meta.vitest) {
 			feature as unknown as ReverseGeocoderFeature
 		)
 		await store.reverseGeocode([3, 4])
-		expect(coreStore.addressTarget).toHaveBeenCalledOnce()
-		expect(coreStore.addressTarget).toHaveBeenCalledWith(feature)
+		expect(coreStore.addressTarget).toHaveBeenCalledExactlyOnceWith(feature)
 	})
 
 	test('zooms to input coordinate', async ({

src/plugins/reverseGeocoder/types.ts

@@ -11,6 +11,11 @@ export const PluginId = 'reverseGeocoder'
  * Plugin options for reverse geocoder plugin.
  */
 export interface ReverseGeocoderPluginOptions extends PluginOptions {
+	/**
+	 * Type of reverse geocoding service.
+	 */
+	type: 'wps' | 'nominatim'
+
 	/**
 	 * URL of a WPS service to use for reverse geocoding.
 	 */

src/plugins/reverseGeocoder/utils/reverseGeocodeNominatim.ts

@@ -0,0 +1,53 @@
+import { transform as transformCoordinate } from 'ol/proj'
+
+import type { ReverseGeocoderFeature } from '../types'
+
+export async function reverseGeocodeNominatim(
+	url: string,
+	coordinate: [number, number],
+	epsg: string,
+	signal: AbortSignal
+): Promise<ReverseGeocoderFeature> {
+	const searchCoordinate = transformCoordinate(
+		coordinate,
+		epsg,
+		'EPSG:4326'
+	) as [number, number]
+
+	const fetchUrl = new URL(url)
+	fetchUrl.searchParams.set('lat', searchCoordinate[1].toString())
+	fetchUrl.searchParams.set('lon', searchCoordinate[0].toString())
+	fetchUrl.searchParams.set('format', 'jsonv2')
+
+	const result = await fetch(fetchUrl, { signal }).then((response) =>
+		response.json()
+	)
+
+	const resultObject: ReverseGeocoderFeature = {
+		type: 'reverse_geocoded',
+		title: [
+			[result.address.road, result.address.house_number]
+				.filter((x) => x)
+				.join(' '),
+			result.address.town || result.address.city || result.address.village,
+		]
+			.filter((x) => x)
+			.join(', '),
+		properties: result.properties,
+		geometry: {
+			// as clicked by user - usually want to keep this since user is pointing at something
+			coordinates: coordinate,
+			type: 'Point',
+		},
+		addressGeometry: {
+			// as returned by reverse geocoder
+			coordinates: transformCoordinate(
+				[result.lon, result.lat],
+				'EPSG:4326',
+				epsg
+			),
+			type: 'Point',
+		},
+	}
+	return resultObject
+}