From a79aa1ea82a7afba335ae46a2b2879e268eb0159 Mon Sep 17 00:00:00 2001 From: Pascal Roehling Date: Mon, 4 Mar 2024 19:14:58 +0100 Subject: [PATCH 1/2] Add AddressSearch and ReverseGeocoder to 'SINGLE' mode of meldemichel --- packages/clients/meldemichel/CHANGELOG.md | 4 ++++ packages/clients/meldemichel/src/addPlugins.ts | 13 ++++++------- .../clients/meldemichel/src/mapConfigurations.ts | 2 ++ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/packages/clients/meldemichel/CHANGELOG.md b/packages/clients/meldemichel/CHANGELOG.md index cf5631b2e..c49647507 100644 --- a/packages/clients/meldemichel/CHANGELOG.md +++ b/packages/clients/meldemichel/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## unpublished + +- Feature: Add `@polar/plugin-address-search` and `@polar/plugin-reverse-geocoder` to mode `SINGLE`. + ## 1.0.0-beta.5 - Fix: Add missing API.md change. No further changes to previous version. diff --git a/packages/clients/meldemichel/src/addPlugins.ts b/packages/clients/meldemichel/src/addPlugins.ts index 60012a304..078e4e1b6 100644 --- a/packages/clients/meldemichel/src/addPlugins.ts +++ b/packages/clients/meldemichel/src/addPlugins.ts @@ -26,13 +26,12 @@ export const addPlugins = (core, mode: keyof typeof MODE) => { core.addPlugins( [ - mode !== MODE.SINGLE && - AddressSearch({ - displayComponent: true, - layoutTag: NineLayoutTag.TOP_LEFT, - addLoading: 'plugin/loadingIndicator/addLoadingKey', - removeLoading: 'plugin/loadingIndicator/removeLoadingKey', - }), + AddressSearch({ + displayComponent: true, + layoutTag: NineLayoutTag.TOP_LEFT, + addLoading: 'plugin/loadingIndicator/addLoadingKey', + removeLoading: 'plugin/loadingIndicator/removeLoadingKey', + }), Pins({ displayComponent: true, appearOnClick: { show: true, atZoomLevel: 0 }, diff --git a/packages/clients/meldemichel/src/mapConfigurations.ts b/packages/clients/meldemichel/src/mapConfigurations.ts index 13b161ec5..e40eb0b14 100644 --- a/packages/clients/meldemichel/src/mapConfigurations.ts +++ b/packages/clients/meldemichel/src/mapConfigurations.ts @@ -248,11 +248,13 @@ const mapConfigurations: Record< }), [MODE.SINGLE]: () => ({ ...commonMapConfiguration, + addressSearch: { ...addressSearch, displayComponent: false }, layers: commonLayers, attributions: { ...commonAttributions, }, pins: commonPins, + reverseGeocoder, }), } From 7875ec0a924129c5769e815e6b76d872b447222c Mon Sep 17 00:00:00 2001 From: Pascal Roehling Date: Tue, 5 Mar 2024 10:33:48 +0100 Subject: [PATCH 2/2] Move decision-making whether AddressSearch is displayed to addPlugins --- packages/clients/meldemichel/src/addPlugins.ts | 2 +- packages/clients/meldemichel/src/mapConfigurations.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/clients/meldemichel/src/addPlugins.ts b/packages/clients/meldemichel/src/addPlugins.ts index 078e4e1b6..79b142bdd 100644 --- a/packages/clients/meldemichel/src/addPlugins.ts +++ b/packages/clients/meldemichel/src/addPlugins.ts @@ -27,7 +27,7 @@ export const addPlugins = (core, mode: keyof typeof MODE) => { core.addPlugins( [ AddressSearch({ - displayComponent: true, + displayComponent: mode !== MODE.SINGLE, layoutTag: NineLayoutTag.TOP_LEFT, addLoading: 'plugin/loadingIndicator/addLoadingKey', removeLoading: 'plugin/loadingIndicator/removeLoadingKey', diff --git a/packages/clients/meldemichel/src/mapConfigurations.ts b/packages/clients/meldemichel/src/mapConfigurations.ts index e40eb0b14..d3bfd614d 100644 --- a/packages/clients/meldemichel/src/mapConfigurations.ts +++ b/packages/clients/meldemichel/src/mapConfigurations.ts @@ -248,7 +248,7 @@ const mapConfigurations: Record< }), [MODE.SINGLE]: () => ({ ...commonMapConfiguration, - addressSearch: { ...addressSearch, displayComponent: false }, + addressSearch, layers: commonLayers, attributions: { ...commonAttributions,