Merge branch 'main' into feature/add-new-mode-for-attributions

Dataport · Aug 1, 2024 · 731c347 · 731c347
2 parents 2f50771 + 68c761d
commit 731c347
Show file tree

Hide file tree

Showing 28 changed files with 244 additions and 234 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -52,7 +52,6 @@
     "@types/node": "^17.0.8",
     "@types/ol": "^6.5.3",
     "@types/proj4": "^2.5.2",
-    "@types/sass": "^1.43.1",
     "@typescript-eslint/eslint-plugin": "^5.9.0",
     "@typescript-eslint/parser": "^5.9.0",
     "@vitejs/plugin-vue2": "^2.2.0",

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/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Feature: Add new state parameter `mapHasDimensions` to let plugins have a "hook" to react on when the map is ready.
 - Feature: Add `deviceIsHorizontal` as a getter to have a more central place to check if the device is in landscape mode.
 - Fix: Adjust documentation to properly describe optionality of configuration parameters.
+- Fix: Add package `events` as a dependency to fix issue with `xml2js`. See https://github.com/Leonidas-from-XIV/node-xml2js/issues/697 for more information.
 - Chore: Update dependencies to latest versions.
 
 ## 1.4.1

diff --git a/packages/core/README.md b/packages/core/README.md
@@ -69,14 +69,14 @@ MapClient.createMap({
 
 The mapConfiguration allows controlling many client instance details.
 
-| fieldName                   | type             | description                                                                                                                                                              |
-| --------------------------- | ---------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| layerConf                   | LayerConf        | Layer configuration as required by masterportalAPI.                                                                                                                      |
-| language                    | enum["de", "en"] | Initial language.                                                                                           |
-| <...masterportalAPI.fields> | various          | The object is also used to initialize the masterportalAPI. Please refer to their documentation for options.                                                              |
-| <plugin.fields>             | various?          | Many plugins added with `addPlugin` may respect additional configuration. Please see the respective plugin documentations. Global plugin parameters are described below. |
+| fieldName | type | description |
+| - | - | - |
+| layerConf | LayerConf | Layer configuration as required by masterportalAPI. |
+| language | enum["de", "en"] | Initial language. |
+| <...masterportalAPI.fields> | various | The object is also used to initialize the masterportalAPI. Please refer to their documentation for options. |
+| <plugin.fields> | various? | Many plugins added with `addPlugin` may respect additional configuration. Please see the respective plugin documentations. Global plugin parameters are described below. |
 | locales | LanguageOption[]? | All locales in POLAR's plugins can be overridden to fit your needs.|
-| vuetify                     | object?           | You may add vuetify configuration here.                                                                                                                                  |
+| vuetify | object? | You may add vuetify configuration here. |
 | extendedMasterportalapiMarkers | extendedMasterportalapiMarkers? | Optional. If set, all configured visible vector layers' features can be hovered and selected by mouseover and click respectively. They are available as features in the store. Layers with `clusterDistance` will be clustered to a multi-marker that supports the same features. Please mind that this only works properly if you configure nothing but point marker vector layers styled by the masterportalAPI. |
 | stylePath | string? | If no link tag with `data-polar="true"` is found in the document, this path will be used to create the link node in the client itself. It defaults to `'./style.css'`. Please mind that `data-polar="true"` is deprecated since it potentially led to flashes of misstyled content. stylePath will replace that solution in the next major release. |
 | renderFaToLightDom | boolean? | POLAR requires FontAwesome in the Light/Root DOM due to an [unfixed bug in many browsers](https://bugs.chromium.org/p/chromium/issues/detail?id=336876). This value defaults to `true`. POLAR will, by default, just add the required CSS by itself. Should you have a version of Fontawesome already included, you can try to set this to `false` to check whether the versions are interoperable. |
@@ -138,7 +138,7 @@ To figure out the name of the locales to override, inspect the matching plugin i
 A full documentation of the masterportalapiPolygonFillHatch is available at the Masterportal's documentation file [style.json.md](https://bitbucket.org/geowerkstatt-hamburg/masterportal/src/dev/doc/style.json.md), chapter 'Polygon.polygonFillHatch'. The basic usage is quoted below for quick lookup. For more details, visual examples, and expert features, see there.
 
 >|Name|Required|Type|Default|Description|
->|----|--------|----|-------|-----------|
+>| - | - | - | - | - |
 >|pattern|no|enum["diagonal", "diagonal-right", "zig-line", "zig-line-horizontal", "circle", "rectangle", "triangle", "diamond"]/Object|`"diagonal"`|Draw pattern. You may either use a pre-defined pattern from the enum or specify one yourself.|
 >|size|no|Number|`30`|Edge length of a singular repeated pattern element.|
 >|lineWidth|no|Number|`10`|Line width of drawn pattern. To achieve an even distribution in diagonal and zig-line pattern, choose lineWidth as (1/3 * size). For triangle and diamond, a lineWidth of 1 must be chosen. For rectangle, a lineWidth of at most (1/4 * size) should be chosen. Deviating from these rules is not harmful, but patterns may seem off.|
@@ -188,14 +188,14 @@ Since this is the base for many functions, the service ID set in this is used to
 
 The `<...masterportalAPI.fields>` means that any masterportalAPI field may also be used here _directly_. The most common fields are the following ones; for more, see masterportalAPI.
 
-| fieldName        | type     | description                                                                                                               |
-| ---------------- | -------- | ------------------------------------------------------------------------------------------------------------------------- |
-| startResolution  | number   | Initial resolution; must be in options. See below.                                                                        |
-| startCenter      | number[] | Initial center coordinate.                                                                                                |
-| extent           | number[] | Map movement will be restricted to this rectangle.                                                                        |
-| epsg             | string   | Leading coordinate system, e.g. `"EPSG:25832"`.                                                                           |
-| options          | Array    | Defines all available zoomLevels. Entries define `resolution`, `scale`, and `zoomLevel`. See masterportalAPI for details. |
-| namedProjections | Array    | Array of usable projections by proj4 string.                                                                              |
+| fieldName | type | description |
+| - | - | - |
+| startResolution | number | Initial resolution; must be in options. See below. |
+| startCenter | number[] | Initial center coordinate. |
+| extent | number[] | Map movement will be restricted to this rectangle. |
+| epsg | string | Leading coordinate system, e.g. `"EPSG:25832"`. |
+| options | Array | Defines all available zoomLevels. Entries define `resolution`, `scale`, and `zoomLevel`. See masterportalAPI for details. |
+| namedProjections | Array | Array of usable projections by proj4 string. |
 
 ##### <plugin.fields>
 
@@ -211,8 +211,8 @@ On how to configure a plugin, see the respective plugin. The configuration is gi
 
 Most plugins honor this additional field.
 
-| fieldName        | type    | description                                                                                                                                                                                                                                               |
-| ---------------- | ------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| fieldName | type | description |
+| - | - | - |
 | displayComponent | boolean? | Optional field that allows hiding UI elements from the user. The store will still be initialized, allowing you to add your own UI elements and control the plugin's functionality via the Store. This may or may not make sense, depending on the plugin. Defaults to `false` , meaning the default UI is hidden. |
 
 ##### mapConfiguration.vuetify

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -20,6 +20,7 @@
     "@polar/lib-invisible-style": "^1.0.0",
     "@repositoryname/noop": "^1.0.6",
     "@repositoryname/vuex-generators": "^1.1.2",
+    "events": "^3.3.0",
     "hammerjs": "2.0.8",
     "i18next": "^23.11.5",
     "i18next-browser-languagedetector": "^8.0.0",