Merge pull request #485 from Dataport/DISH-309-Suchstring-verbessern-Gemeinde-suchen

edit user input for better results and sort search result to get a better overview of the results

Author: jedi-of-the-sea

packages/clients/dish/CHANGELOG.md

@@ -9,10 +9,13 @@
 - Fix: Add terms of use for internal map.
 - Fix: Open links for BKG and their terms of use in new tab.
 - Fix: Only a new Tab for the print-function if newTab is wanted.
+- Fix: The search now returns results regardless of case(upper/lower).
 - Chore: Edit urlParams configuration for new testing environment.
 - Feature: Configuration changed. A maximum of 120 features per search (BKG (address search) results) are now displayed.
 - Enhancement: Add 'Gemeinde' to the searchresults from the intern-Denkmal-search
 - Enhancement: Changed search result to display 'ONR' before the Objektnummer
+- Enhancement: The search results are now beautifully sorted, just like in DA Nord.
+- Enhancement: It is now possible to search ('Flurstücksuche') for 'Gemeinde'.
 
 ## 1.2.0
 

packages/clients/dish/src/mapConfigurations/searchConfigParams.ts

@@ -6,6 +6,7 @@ import {
   denkmaelerWFS,
   alkisWfs,
 } from '../servicesConstants'
+import { sortFeaturesByProperties } from '../utils/sortFeaturesByProperties'
 
 const groupDenkmalsuche = 'groupDenkmalsuche'
 export const categoryIdAlkisSearch = 'categoryIdAlkisSearch'
@@ -65,13 +66,14 @@ export const searchMethods = {
       featurePrefix: 'app',
       xmlns: 'http://www.deegree.org/app',
       useRightHandWildcard: true,
+      caseSensitive: false,
       maxFeatures: 120,
       patternKeys: {
         hausnummer: '([0-9]+)',
-        strasse: '([A-Za-z]+)',
-        objektansprache: '([A-Za-z]+)',
-        kreis_kue: '([A-Za-z]+)',
-        gemeinde: '([A-Za-z]+)',
+        strasse: '([A-Za-zäöüßÄÖÜ]+)',
+        objektansprache: '([A-Za-zäöüßÄÖÜ]+)',
+        kreis_kue: '([A-Za-zäöüßÄÖÜ]+)',
+        gemeinde: '([A-Za-zäöüßÄÖÜ]+)',
         objektid: '([0-9]+)',
       },
       patterns: [
@@ -80,7 +82,24 @@ export const searchMethods = {
         '{{objektansprache}}, {{gemeinde}}, ONR {{objektid}}',
       ],
     },
+    resultModifier: (featureCollection) => {
+      if (
+        featureCollection.features === undefined ||
+        featureCollection.features === null
+      ) {
+        return featureCollection
+      }
+      const featuresSorted = sortFeaturesByProperties(
+        featureCollection.features,
+        ['gemeinde', 'objektansprache', 'strasse', 'hausnummer', 'objektid']
+      )
+      return {
+        ...featureCollection,
+        features: featuresSorted,
+      }
+    },
   },
+
   alkisSearch: {
     groupId: groupDenkmalsuche,
     categoryId: categoryIdAlkisSearch,
@@ -98,22 +117,41 @@ export const searchMethods = {
       patternKeys: {
         flstnrnen: '([0-9]+)',
         flstnrzae: '([0-9]+)',
-        gemarkung: '([A-Za-z]+)',
+        gemarkung: '([A-Za-zäöüßÄÖÜ]+)',
+        gemeinde: '([A-Za-zäöüßÄÖÜ]+)',
         flstkennz: '([0-9_]+)',
         flur: '([0-9]+)',
       },
       patterns: [
-        '{{gemarkung}} {{flur}}, {{flstnrzae}}/{{flstnrnen}}, {{flstkennz}}',
-        '{{gemarkung}} {{flur}}, {{flstnrzae}}, {{flstkennz}}',
+        '{{gemeinde}}, {{gemarkung}} {{flur}}, {{flstnrzae}}/{{flstnrnen}}, {{flstkennz}}',
+        '{{gemeinde}}, {{gemarkung}} {{flur}}, {{flstnrzae}}, {{flstkennz}}',
         '{{flstkennz}}',
       ],
       sortBy: [
+        { propertyName: 'gemeinde', direction: 'ASC' },
         { propertyName: 'gemarkung', direction: 'ASC' },
         { propertyName: 'flur', direction: 'ASC' },
         { propertyName: 'flstnrzae', direction: 'ASC' },
         { propertyName: 'flstnrnen', direction: 'ASC' },
       ],
     },
+    resultModifier: (featureCollection) => {
+      if (
+        featureCollection.features === undefined ||
+        featureCollection.features === null
+      ) {
+        return featureCollection
+      }
+      const featuresSorted = sortFeaturesByProperties(
+        featureCollection.features,
+        ['gemeinde', 'gemarkung', 'flur', 'flstnrzae', 'flstnrnen'],
+        ['flur', 'flstnrzae', 'flstnrnen']
+      )
+      return {
+        ...featureCollection,
+        features: featuresSorted,
+      }
+    },
   },
 }
 

packages/clients/dish/src/utils/sortFeaturesByProperties.ts

@@ -0,0 +1,29 @@
+import { Feature } from 'geojson'
+
+export const sortFeaturesByProperties = (
+  features: Feature[],
+  sortKeys: string[],
+  numericKeys: string[] = []
+): Feature[] => {
+  return features.sort((a, b) => {
+    for (const key of sortKeys) {
+      const valueA = a.properties?.[key] ?? ''
+      const valueB = b.properties?.[key] ?? ''
+
+      let comparison = 0
+
+      if (numericKeys.includes(key)) {
+        const numA = parseFloat(String(valueA)) || 0
+        const numB = parseFloat(String(valueB)) || 0
+        comparison = numA - numB
+      } else {
+        comparison = String(valueA).localeCompare(String(valueB))
+      }
+
+      if (comparison !== 0) {
+        return comparison
+      }
+    }
+    return 0
+  })
+}

packages/lib/getFeatures/CHANGELOG.md

@@ -3,6 +3,7 @@
 ## unpublished
 
 - Feature: Implement server-side sorting for `getWfsFeatures`. Can be configured by new parameter `sortBy`.
+- Feature: Implement possibility to search a WFS without regard to upper or lower case. Can be configured by new parameter `caseSensivite`.
 
 ## 3.1.1
 

packages/lib/getFeatures/types.ts

@@ -63,6 +63,8 @@ export interface WfsParameters extends QueryParameters {
   likeFilterAttributes?: Record<string, string>
   /** Sorting definition for WFS features; e.g. [\{ propertyName: 'name', direction: 'DESC' \}] */
   sortBy?: { propertyName: string; direction?: 'ASC' | 'DESC' }[]
+  /** Whether the like filter should be case sensitive */
+  caseSensitive?: boolean
 }
 
 /**

packages/lib/getFeatures/wfs/buildWfsFilter.ts

@@ -30,12 +30,18 @@ const queryPrefix = ({
 const wfsLike = (
   fieldName: string,
   input: string,
-  { featurePrefix, useRightHandWildcard, likeFilterAttributes }: WfsParameters
+  {
+    featurePrefix,
+    useRightHandWildcard,
+    likeFilterAttributes,
+    caseSensitive,
+  }: WfsParameters
 ) => {
   const mergedLikeFilterAttributes = merge(
     {},
     defaultLikeFilterAttributes,
-    likeFilterAttributes
+    likeFilterAttributes,
+    caseSensitive !== undefined ? { matchCase: caseSensitive } : {}
   )
   return `
 <ogc:PropertyIsLike${Object.entries(mergedLikeFilterAttributes).reduce(

packages/plugins/AddressSearch/CHANGELOG.md

@@ -3,6 +3,7 @@
 ## unpublished
 
 - Feature: Add new parameter `sortBy` to type `WfsParameter` for server-side sorting of WFS search results.
+- Feature: Add new parameter `caseSensitive` to type `WfsParameter` to control case sensitivity in WFS search strings.
 
 ## 3.2.0
 

packages/plugins/AddressSearch/README.md

@@ -231,6 +231,7 @@ queryParameters: {
 | sortBy | Array<{propertyName: string; direction?: 'ASC' \| 'DESC'}>? | Server-side sorting criteria for WFS features. Features will be sorted by the properties in order of their appearance. The first property has highest priority. Direction defaults to 'ASC' if not specified. Applied after the filter, before results are returned. Please note that the server must support server-side sorting. |
 | srsName | string? | Name of the projection (srs) for the query. |
 | useRightHandWildcard? | boolean? | By default, if searching for "search", it is sent as "search*". This behaviour can be deactivated by setting this parameter to `false`. |
+| caseSensitive | boolean |  When `false`, searches are case-insensitive. When `true`, exact case matching is required. Requires WFS server support for the `matchCase` attribute. |
 
 Since inputs may overlap with multiple patterns, multiple queries are fired and executed on the WFS until the `maxFeatures` requirement is met, beginning with the pattern that 'looks like the user input the most'. The best-fitting pattern on the returned features will be used to generate a display string. When two patterns fit best, the first one is used.
 
@@ -249,6 +250,7 @@ queryParameters: {
   featurePrefix: 'app',
   xmlns: 'http://www.deegree.org/app',
   useRightHandWildcard: true,
+  caseSensitive: false,
   sortBy: [
     { propertyName: 'street', direction: 'ASC' },
     { propertyName: 'housenumber', direction: 'ASC' },