Merge branch 'main' into update/masterportalapi

Dataport · Aug 1, 2024 · e319823 · e319823
2 parents 6c92de4 + 4a5733f
commit e319823
Show file tree

Hide file tree

Showing 16 changed files with 47 additions and 12 deletions.
diff --git a/packages/clients/afm/CHANGELOG.md b/packages/clients/afm/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Feature: This client now supports the `@polar/core`'s field `stylePath`. The usage is documented in the API.md file.
 - Feature: Update icon of `layerChooser` in `iconMenu` to `fa-layer-group` to clear-up the content hidden behind the menu button.
+- Chore: Change value of `pins.movable` configuration to `'drag'` as using a boolean has been deprecated in a future release.
 
 ## 1.0.1
 

diff --git a/packages/clients/afm/example/polar-example.js b/packages/clients/afm/example/polar-example.js
@@ -67,7 +67,7 @@ const mapConfiguration = {
   },
   pins: {
     toZoomLevel: 9,
-    movable: true,
+    movable: 'drag',
     appearOnClick: {
       show: true,
       atZoomLevel: 3,

diff --git a/packages/clients/dish/CHANGELOG.md b/packages/clients/dish/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## unpublished
 
 - Feature: If a user is geolocated outside of the map's extent, the client will inform the user of why geolocation did not take effect via a textbox.
+- Chore: Change value of `pins.movable` configuration to `'drag'` as using a boolean has been deprecated in a future release.
 
 ## 1.1.1
 

diff --git a/packages/clients/dish/src/mapConfig.ts b/packages/clients/dish/src/mapConfig.ts
@@ -208,7 +208,7 @@ export const mapConfiguration = {
   },
   pins: {
     toZoomLevel: 7,
-    movable: true,
+    movable: 'drag',
     style: {
       fill: shBlue,
     },

diff --git a/packages/clients/meldemichel/CHANGELOG.md b/packages/clients/meldemichel/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## unpublished
+
+- Chore: Change value of `pins.movable` configuration to `'drag'` as using a boolean has been deprecated in a future release.
+
 ## 1.1.2
 
 - Chore: Fix bugs via dependency updates.

diff --git a/packages/clients/meldemichel/src/mapConfigurations.ts b/packages/clients/meldemichel/src/mapConfigurations.ts
@@ -104,7 +104,7 @@ const addressSearch: AddressSearchConfiguration = {
 
 const commonPins: Partial<PinsConfiguration> = {
   toZoomLevel: 7,
-  movable: true,
+  movable: 'drag',
   style: {
     fill: hamburgRed,
   },

diff --git a/packages/clients/snowbox/src/mapConfiguration.ts b/packages/clients/snowbox/src/mapConfiguration.ts
@@ -179,7 +179,7 @@ export const mapConfiguration = {
   pins: {
     boundaryLayerId: hamburgBorder,
     toZoomLevel: 9,
-    movable: true,
+    movable: 'drag',
     appearOnClick: {
       show: true,
       atZoomLevel: 0,

diff --git a/packages/plugins/Attributions/CHANGELOG.md b/packages/plugins/Attributions/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## unpublished
 
+- Feature: Add new option `'footer'` to configuration parameter `renderType` that changes the attributions to be displayed as a small version of the information box that is always visible.
 - Refactor: Replace redundant props with computed properties.
 
 ## 1.2.1

diff --git a/packages/plugins/Attributions/src/components/AttributionContent.vue b/packages/plugins/Attributions/src/components/AttributionContent.vue
@@ -1,7 +1,14 @@
 <template>
   <v-scroll-x-reverse-transition>
-    <v-card dense filled :width="width" :color="color" :max-width="maxWidth">
-      <v-card-title>
+    <v-card
+      :class="renderType === 'footer' ? 'polar-plugin-attributions-footer' : ''"
+      dense
+      filled
+      :width="width"
+      :color="color"
+      :max-width="maxWidth"
+    >
+      <v-card-title v-if="renderType !== 'footer'">
         {{ $t('common:plugins.attributions.title') }}
       </v-card-title>
       <!-- NOTE: The usage of v-html is considered unsafe as it
@@ -48,7 +55,9 @@ export default Vue.extend({
       return this.renderType === 'independent'
     },
     color() {
-      return this.renderIndependently ? '#ffffffdd' : ''
+      return this.renderType === 'independent' || this.renderType === 'footer'
+        ? '#ffffffdd'
+        : ''
     },
     maxWidth() {
       return this.renderIndependently
@@ -76,4 +85,13 @@ export default Vue.extend({
 })
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+.polar-plugin-attributions-footer {
+  margin: 4px;
+}
+.polar-plugin-attributions-footer .v-card__text {
+  font-size: 0.8rem;
+  padding: 2px;
+  line-height: 1.1;
+}
+</style>
diff --git a/packages/plugins/Attributions/src/types.ts b/packages/plugins/Attributions/src/types.ts
@@ -18,7 +18,7 @@ export interface AttributionsGetters extends AttributionsState {
   listenToChanges: string[]
   mapInfo: string[]
   initiallyOpen: boolean
-  renderType: 'independent' | 'iconMenu'
+  renderType: 'independent' | 'iconMenu' | 'footer'
   staticAttributions: string[]
   windowWidth: number
 }
diff --git a/packages/plugins/Export/CHANGELOG.md b/packages/plugins/Export/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Fix: PDF export with download:false now works correctly.
 - Fix: Adjust documentation to properly describe optionality of configuration parameters.
+- Fix: Disable map interactions during the export process so potential interaction features won't be exported.
 - Chore: Update dependencies to latest versions.
 
 ## 1.2.0

diff --git a/packages/plugins/Export/src/store/actions.ts b/packages/plugins/Export/src/store/actions.ts
@@ -25,6 +25,10 @@ const actions: PolarActionTree<ExportState, ExportGetters> = {
     //  Screenshot canvas
     const CANVAS_ID = 'export-canvas'
 
+    map.getInteractions().forEach((interaction) => {
+      interaction.setActive(false)
+    })
+
     map.once('postrender', function () {
       // Map properties
       const size = map.getSize()
@@ -102,6 +106,10 @@ const actions: PolarActionTree<ExportState, ExportGetters> = {
         }
       }
 
+      map.getInteractions().forEach((interaction) => {
+        interaction.setActive(true)
+      })
+
       commit('setExportedMap', src)
     })
     map.renderSync()

diff --git a/packages/plugins/Pins/README.md b/packages/plugins/Pins/README.md
@@ -17,7 +17,7 @@ The usage of `displayComponent` has no influence on the creation of Pins on the
 | boundaryOnError | ('strict' \| 'permissive')? | If the boundary layer check does not work due to loading or configuration errors, style `'strict'` will disable the pins feature, and style `'permissive'` will act as if no boundaryLayerId was set. Defaults to `'permissive'`. |
 | coordinateSource | string? | The pins plugin may react to changes in other plugins. This specifies the path to such store positions. The position must, when subscribed to, return a GeoJSON feature. Please mind that, when referencing another plugin, that plugin must be in `addPlugins` before this one. |
 | initial | initial? | Configuration options for setting an initial pin. |
-| movable | boolean? \| 'drag' \| 'click' \| 'none' | Whether a user may drag and re-click the pin (`drag` or `true`), only re-click it (`click`) or may only be placed programmatically (`none` or `false`). Defaults to 'none'. **Using a boolean for this configuration has been deprecated and will be removed in the next major release.** |
+| movable | boolean \| 'drag' \| 'click' \| 'none'? | Whether a user may drag and re-click the pin (`drag` or `true`), only re-click it (`click`) or may only be placed programmatically (`none` or `false`). Defaults to 'none'. **Using a boolean for this configuration has been deprecated and will be removed in the next major release.** |
 | style | style? | Display style configuration. |
 | toastAction | string? | If `boundaryLayerId` is set, and the pin is moved or created outside the boundary, this string will be used as action to send a toast information to the user. If no toast information is desired, leave this field undefined; for testing purposes, you can still find information in the console. |
 | toZoomLevel | number? | Zoom level to use on outside input by e.g. address search. Defaults to `0`. |

diff --git a/packages/types/custom/CHANGELOG.md b/packages/types/custom/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Feature: Add `afterResultComponent` to `AddressSearchConfiguration` for custom search result suffixes.
 - Feature: Add `mapHasDimensions` to `CoreState` and `CoreGetters`.
 - Feature: Add new getter `deviceIsHorizontal` to `CoreGetters`.
+- Feature: Add `footer` to `RenderType` as an option to display attributions in a footer.
 - Fix: Add `string` as option for `SearchType` since arbitrary strings can be registered.
 - Fix: Remove unused parameters `proxyUrl` and `loadingStrategy` from `LayerConfigurationOptions`.
 - Fix: Properly document optional parameters of interfaces `AddressSearchConfiguration`, `FeatureList`, `FilterConfigurationTime`, `FilterConfigurationTimeOption`, `GeoLocationConfiguration`, `LayerConfigurationOptionLayers` and `PinsConfiguration`

diff --git a/packages/types/custom/core.ts b/packages/types/custom/core.ts
@@ -32,7 +32,7 @@ export interface PluginOptions {
   layoutTag?: string // TODO: Might it be useful to move declaration of NineLayoutTag here?
 }
 
-export type RenderType = 'iconMenu' | 'independent'
+export type RenderType = 'iconMenu' | 'independent' | 'footer'
 
 /** Possible search methods by type */
 export type SearchType = 'bkg' | 'gazetteer' | 'wfs' | 'mpapi' | string

diff --git a/pages/examples/address.html b/pages/examples/address.html
@@ -63,7 +63,7 @@
       pins: {
         coordinateSource: 'plugin/addressSearch/chosenAddress',
         toZoomLevel: 7,
-        movable: true,
+        movable: 'drag',
       },
       reverseGeocoder: {
         url: 'https://geodienste.hamburg.de/HH_WPS',