Merge remote-tracking branch 'origin/fix/zoom-overlay' into fix/zoom-overlay

Author: dopenguin

README.md

@@ -54,7 +54,7 @@ Other clients with more specific code include the [Denkmalkarte Schleswig-Holste
 <table align="center">
   <tr align="center">
     <td align="center"><img src="./pages/assets/landessymbole/bremen.svg" alt="Bremer Wappenzeichen" height="120px" style="object-fit: contain;"><div>Freie Hansestadt Bremen</div></td>
-    <td align="center"><img src="./pages/assets/landessymbole/hamburg.svg" alt="Hamburg-Symbol" height="120px" style="object-fit: contain;"><div>Freie Freie und Hansestadt Hamburg</div></td>
+    <td align="center"><img src="./pages/assets/landessymbole/hamburg.svg" alt="Hamburg-Symbol" height="120px" style="object-fit: contain;"><div>Freie und Hansestadt Hamburg</div></td>
   </tr>
   <tr align="center">
     <td align="center"><img src="./pages/assets/landessymbole/sachsen-anhalt.svg" alt="Landessymbol Sachsen-Anhalt" height="120px" style="object-fit: contain;"><div>Sachsen-Anhalt</div></td>

package-lock.json

@@ -29,7 +29,6 @@ export const mapConfiguration = {
   startResolution: 264.583190458,
   startCenter: [553655.72, 6004479.25],
   extent: [426205.6233, 5913461.9593, 650128.6567, 6101486.8776],
-  epsg: 'EPSG:25832',
   locales,
   layers: [
     {
@@ -230,18 +229,4 @@ export const mapConfiguration = {
     { resolution: 0.02645831904, scale: 100, zoomLevel: zoomLevel++ },
     { resolution: 0.01322915952, scale: 50, zoomLevel: zoomLevel++ },
   ],
-  namedProjections: [
-    [
-      'EPSG:31467',
-      '+proj=tmerc +lat_0=0 +lon_0=9 +k=1 +x_0=3500000 +y_0=0 +ellps=bessel +nadgrids=BETA2007.gsb +units=m +no_defs +type=crs',
-    ],
-    [
-      'EPSG:25832',
-      '+proj=utm +zone=32 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs',
-    ],
-    [
-      'EPSG:4326',
-      '+title=WGS 84 (long/lat) +proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs',
-    ],
-  ],
 }

packages/clients/dish/src/mapConfig.ts

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## unpublished
+
+- Feature: Directly expose `createMap` to be able to import it directly when using this client.
+
 ## 1.0.0
 
 Initial release.

packages/clients/generic/CHANGELOG.md

@@ -156,38 +156,40 @@ const addPlugins = (coreInstance: PolarCore, enabledPlugins: PluginName[]) => {
   )
 }
 
-export default {
-  createMap: ({
-    containerId,
-    services,
-    mapConfiguration,
-    enabledPlugins = [],
-    modifyLayerConfiguration = (x) => x,
-  }: {
-    containerId: string
-    services: object[]
-    mapConfiguration: MapConfig
-    enabledPlugins: Array<PluginName>
-    modifyLayerConfiguration: (layerConf: object[]) => object[]
-  }) =>
-    new Promise((resolve) => {
-      const coreInstance = { ...core }
+export const createMap = ({
+  containerId,
+  services,
+  mapConfiguration,
+  enabledPlugins = [],
+  modifyLayerConfiguration = (x) => x,
+}: {
+  containerId: string
+  services: object[]
+  mapConfiguration: MapConfig
+  enabledPlugins: Array<PluginName>
+  modifyLayerConfiguration: (layerConf: object[]) => object[]
+}) =>
+  new Promise((resolve) => {
+    const coreInstance = { ...core }
+
+    addPlugins(coreInstance, enabledPlugins)
 
-      addPlugins(coreInstance, enabledPlugins)
+    coreInstance.rawLayerList.initializeLayerList(
+      services,
+      async (layerConf) => {
+        const client = await coreInstance.createMap({
+          containerId,
+          mapConfiguration: {
+            ...mapConfiguration,
+            layerConf: modifyLayerConfiguration(layerConf),
+          },
+        })
 
-      coreInstance.rawLayerList.initializeLayerList(
-        services,
-        async (layerConf) => {
-          const client = await coreInstance.createMap({
-            containerId,
-            mapConfiguration: {
-              ...mapConfiguration,
-              layerConf: modifyLayerConfiguration(layerConf),
-            },
-          })
+        resolve(client)
+      }
+    )
+  })
 
-          resolve(client)
-        }
-      )
-    }),
+export default {
+  createMap,
 }

packages/clients/generic/src/polar-client.ts

@@ -25,7 +25,6 @@ const hamburgRed = '#ff0019'
 
 const commonMapConfiguration: Partial<MapConfig> = {
   checkServiceAvailability: false, // service register too long
-  epsg: 'EPSG:25832',
   locales: language,
   vuetify: {
     theme: {
@@ -39,16 +38,6 @@ const commonMapConfiguration: Partial<MapConfig> = {
       },
     },
   },
-  namedProjections: [
-    [
-      'EPSG:25832',
-      '+proj=utm +zone=32 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs',
-    ],
-    [
-      'EPSG:4326',
-      '+title=WGS 84 (long/lat) +proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs',
-    ],
-  ],
 }
 
 const commonLayers: LayerConfiguration[] = [

packages/clients/meldemichel/src/mapConfigurations.ts

@@ -11,14 +11,8 @@ const uBahn = '23053'
 
 const hamburgBorder = '6074'
 
-/**
- * bitbucket.org/geowerkstatt-hamburg/masterportalapi/src/master/src/defaults.js
- * implicitly using masterportalAPI HH defaults by fallback
- * they can be overwritten in this object
- */
 export const mapConfiguration = {
   language: 'en',
-  epsg: 'EPSG:25832',
   locales: language,
   vuetify: {
     theme: {
@@ -32,20 +26,6 @@ export const mapConfiguration = {
       },
     },
   },
-  namedProjections: [
-    [
-      'EPSG:25832',
-      '+proj=utm +zone=32 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs',
-    ],
-    [
-      'EPSG:4326',
-      '+title=WGS 84 (long/lat) +proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs',
-    ],
-    [
-      'EPSG:4647',
-      '+proj=tmerc +lat_0=0 +lon_0=9 +k=0.9996 +x_0=32500000 +y_0=0 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs',
-    ],
-  ],
   addressSearch: {
     searchMethods: [
       {

packages/clients/snowbox/src/mapConfiguration.ts

@@ -21,7 +21,6 @@ export const mapConfiguration: Partial<MapConfig> = {
   extent: [
     288427.40898665343, 5888233.576754751, 880090.4063210202, 6188713.349959846,
   ],
-  epsg: 'EPSG:25832',
   locales,
   vuetify: { theme },
   layers: [
@@ -86,22 +85,4 @@ export const mapConfiguration: Partial<MapConfig> = {
     { resolution: 0.2645831904584105, scale: 1000, zoomLevel: zoomLevel++ },
     { resolution: 0.1322915952292052, scale: 500, zoomLevel: zoomLevel++ },
   ],
-  namedProjections: [
-    [
-      'EPSG:31467',
-      '+proj=tmerc +lat_0=0 +lon_0=9 +k=1 +x_0=3500000 +y_0=0 +ellps=bessel +nadgrids=BETA2007.gsb +units=m +no_defs +type=crs',
-    ],
-    [
-      'EPSG:25832',
-      '+proj=utm +zone=32 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs',
-    ],
-    [
-      'EPSG:3857',
-      '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs',
-    ],
-    [
-      'EPSG:4326',
-      '+title=WGS 84 (long/lat) +proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs',
-    ],
-  ],
 }

packages/clients/textLocator/src/mapConfig.ts

@@ -6,6 +6,11 @@
 - Breaking: Remove support for marking client CSS via `data-polar="true"`. Please use the configuration parameter `stylePath` instead.
 - 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.
+- Feature: Add clearer documentation regarding `@masterportal/masterportalapi` related configuration parameters including examples.
+- Feature: Officially add support for WMTS layers.
+- Feature: Add reasonable default values for configuration parameters `epsg`, `options`, `namedProjections` and `startResolution`.
+- Fix: Document `rawLayerList.initializeLayerList` as an essential step when creating a client.
+- Fix: Move basic documentation of `layers` from `@polar/plugin-layer-chooser` to `@polar/core`.
 - 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.
 - Fix: Adjust overlay to properly be displayed on macOS devices.