@masterportal/masterportalapi 2.10.0 → 2.11.0

package/CHANGELOG.md

@@ -3,45 +3,28 @@
 
  The [Semantic Versioning](https://semver.org/spec/v2.0.0.html) is used.
 
-## Unreleased - in development
+## 2.11.0 - 2022-11-24
 ### Added
-
-### Changed
-
-### Deprecated
-
-### Removed
+- crossOrigin settings can now be passed to WMSSources (TileWMS, ImageWMS) via config.json or services.json
 
 ### Fixed
+- Issue #847(Masterportal): searchAddress now keeps searching for house numbers if a digit was entered at the end of the search string
 
 ---
-## 2.10.0 - 2022-03-11
+
+## 2.10.0 - 2022-11-03
 ### Added
 - DPS-1313: Added custom DragPan interaction to add ability to use 2-Finger-Pan instead of 1-Finger-Pan on mobile devices
 
 ### Changed
 - Exports in src/rawLayerList, src/crs.js and src/lib/load3DScript.js changed to export default {} to provide  ES-Syntax.
 
-### Deprecated
-
-### Removed
-
-### Fixed
-
 ---
 
 ## 2.9.0 - 2022-10-25
-### Added
-
 ### Changed
 - Exports in src/rawLayerList and src/crs.js changed to module.exports to provide the possibility to stub the functions with sinon in masterportal.
 
-### Deprecated
-
-### Removed
-
-### Fixed
-
 ---
 
 ## 2.8.0 - 2022-10-04

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@masterportal/masterportalapi",
   "author": "Implementierungspartnerschaft Masterportal <info@masterportal.org> (https://www.masterportal.org)",
-  "version": "2.10.0",
+  "version": "2.11.0",
   "license": "MIT",
   "description": "Basic functions of the Masterportal as api",
   "repository": {
@@ -53,6 +53,7 @@
   },
   "homepage": "https://bitbucket.org/geowerkstatt-hamburg/masterportalapi#readme",
   "directories": {
+    "doc": "docs",
     "example": "example",
     "test": "test"
   },

package/src/layer/wms.js

@@ -82,6 +82,7 @@ export function makeParams (rawLayer) {
  * @param {string} [rawLayer.gutter] - optional the size in pixels of the gutter around image tiles to ignore
  * @param {function} [rawLayer.olAttribution] - optional function that takes a module:ol/Map~FrameState and returns a string or an array of strings representing source attributions
  * @param {string|number} [rawLayer.tilesize] - optional needed to create the tileGrid
+ * @param {string|"anonymous"} [rawLayer.crossOrigin] - optional needed for CORS requests of image data, to enable canvas export
  * @param {object} options - optional resolutions and origin to create the TileGrid
  * @param {Array} [options.resolutions] - optional resolutions to create the TileGrid, must be in descending order
  * @param {Array} [options.origin] - optional origin to create the TileGrid
@@ -99,7 +100,8 @@ export function createLayerSource (rawLayer, options) {
             params,
             serverType: rawLayer.serverType,
             projection: projection,
-            attributions: rawLayer.olAttribution
+            attributions: rawLayer.olAttribution,
+            crossOrigin: rawLayer.crossOrigin
         });
     }
     if (options && options.resolutions) {
@@ -115,7 +117,8 @@ export function createLayerSource (rawLayer, options) {
         gutter: rawLayer.gutter || 0,
         tileGrid: tileGrid,
         projection: projection,
-        attributions: rawLayer.olAttribution
+        attributions: rawLayer.olAttribution,
+        crossOrigin: rawLayer.crossOrigin
     });
 }
 
@@ -130,6 +133,7 @@ export function createLayerSource (rawLayer, options) {
  * @param {string} [rawLayer.gutter] - optional the size in pixels of the gutter around image tiles to ignore
  * @param {function} [rawLayer.olAttribution] - optional function that takes a module:ol/Map~FrameState and returns a string or an array of strings representing source attributions
  * @param {string|number} [rawLayer.tilesize] - optional needed to create the tileGrid
+ * @param {string|"anonymous"} [rawLayer.crossOrigin] - optional needed for CORS requests of image data, to enable canvas export
  * @param {object} layerParams - additional layer params
  * @param {object} options - optional resolutions and origin to create the TileGrid
  * @param {Array} [options.resolutions] - optional resolutions to create the TileGrid, must be in descending order

package/src/searchAddress/search.js

@@ -10,16 +10,19 @@ let abortController = null;
  * Chains gazetteer request and response parser.
  * @param {string} type from searchTypes
  * @param {(string|string[])} values one or multiple strings, depending on type
+ * @param {function} sortFunction a function with two parameters which can be used to sort all results
+ * @param {function} filterFunction a function which will be executed to filter results
  * @returns {Promise<SearchResult[]>} parsed response
  * @ignore
  */
-function searchAndParse (type, values) {
+function searchAndParse (type, values, sortFunction = (a, b) => a.name.localeCompare(b.name), filterFunction = () => true) {
     return new Promise((resolve, reject) => {
         searchGazetteer(type, values, abortController)
             .then(results => {
-                const parsed = parse(type, results);
-
-                resolve(parsed);
+                parse(type, results).then(parsed => {
+                    resolve(parsed.filter(filterFunction)
+                        .sort(sortFunction));
+                });
             })
             .catch(e => reject(e));
     });
@@ -38,7 +41,8 @@ function searchAndParseStreetAndHouseNumber (searchstring, searchHouseNumbers) {
         searchGazetteer(searchTypes.STREET, searchstring, abortController)
             .then(streetResults => parse(searchTypes.STREET, streetResults))
             .then(parsedStreetResults => {
-                const allSearches = [];
+                const allSearches = [],
+                    matches = searchstring.match(new RegExp("^(.+)[\\s,](\\d+|\\d.*)$"));
 
                 for (let i = 0; i < parsedStreetResults.length; i++) {
                     // put street in front of street's street+hnr as ordering
@@ -48,6 +52,13 @@ function searchAndParseStreetAndHouseNumber (searchstring, searchHouseNumbers) {
                     }
                 }
 
+                if (!parsedStreetResults.length && matches?.length && searchHouseNumbers) {
+                    allSearches.push(searchAndParse(searchTypes.HOUSE_NUMBERS_FOR_STREET,
+                        matches[1],
+                        (a, b) => parseInt(a.properties?.hausnummer, 10) - parseInt(b.properties?.hausnummer, 10),
+                        item => item.properties?.hausnummerkomplett?.indexOf(matches[2]) === 0)); // check longer housenumbers and suffixes!
+                }
+
                 return Promise.all(allSearches);
             })
             .then(allResults => resolve([].concat(...allResults)))

package/test/layer/wms.test.js

@@ -111,6 +111,16 @@ describe("wms.js", function () {
 
             expect(source).toBeInstanceOf(ImageWMS);
         });
+        it("creates a LayerSource with crossOrigin set to 'anonymous'", function () {
+            // only relevant for TileWMS and ImageWMS instances
+            const
+                tileWMS = wms.createLayerSource({singleTile: false, crossOrigin: "anonymous"}),
+                imageWMS = wms.createLayerSource({singleTile: true, crossOrigin: "anonymous"});
+
+            // eslint-disable-next-line no-underscore-dangle
+            expect(imageWMS.crossOrigin_).toEqual("anonymous");
+            expect(tileWMS.crossOrigin).toEqual("anonymous");
+        });
     });
     describe("createLayerSource with a tileGrid", function () {
         function attrFunction () {