feat: include wfs search and refactor MultiSearch

terrestris · Nov 28, 2024 · ada52b2 · ada52b2
1 parent d75d3d4
commit ada52b2
Show file tree

Hide file tree

Showing 17 changed files with 918 additions and 527 deletions.
diff --git a/README.md b/README.md
@@ -49,10 +49,10 @@ Several global settings for the client can be configured via the [`gis-client-co
 | wfsLockFeatureEnabled | Whether WFS LockFeature is enabled during feature editing or not.                                                                                                                                        | false               |
 | documentationButtonVisible | Whether the button in the user menu to open the documentation is visible or not. | true                |
 | enableFallbackConfig | Whether the default application configuration should be loaded without any given application ID or not.                                                                                                  | true                |
+| search.nominatimUrl | The nominatim URL to use.                                                                                                                                                                            | 'https://nominatim.openstreetmap.org/search?'     |
 | search.solrBasePath | Base path to a solr instance.                                                                                                                                                                            | '/search/query'     |
 | search.coreName | Solr core name.                                                                                                                                                                                          | 'search'            |
 | search.defaultUseViewBox | Whether the search is restricted to the current view box.                                                                                                                                                | true                |
-| search.useNominatim | Whether to use Nominatim.                                                                                                                                                                                | true                |
 | search.groupByCategory | Groups search results by 'category' text field. If disabled, the layer title will be used instead.                                                                                                       | true                |
 | search.useSolrHighlighting | Enable / disable solr search result highlighting.                                                                                                                                                        | true                |
 | search.delay | Delay in milliseconds before search is triggered (debouncing).                                                                                                                                           | 1000                |

diff --git a/resources/config/gis-client-config.js b/resources/config/gis-client-config.js
@@ -22,10 +22,10 @@ var clientConfig = {
     }
   },
   search: {
+    nominatimUrl: 'https://nominatim.openstreetmap.org/search?',
     solrBasePath: '/search/query',
     coreName: 'search',
     defaultUseViewBox: true,
-    useNominatim: true,
     groupByCategory: true,
     useSolrHighlighting: true,
     activateLayerOnClick: true,

diff --git a/src/components/BasicNominatimSearch/index.spec.tsx b/src/components/BasicNominatimSearch/index.spec.tsx
diff --git a/src/components/BasicNominatimSearch/index.tsx b/src/components/BasicNominatimSearch/index.tsx
diff --git a/src/components/MultiSearch/index.less b/src/components/MultiSearch/index.less
@@ -1,61 +1,62 @@
-.search {
-
+.multi-search {
   position: relative;
 
-  span.ant-input-group-addon {
-    background-color: var(--secondaryColor);
+  .ant-space-compact {
+    width: 100%;
+
+    button {
+      border-radius: 0;
 
-    span.anticon {
-      color: var(--primaryColor);
+      &.ant-btn-variant-outlined:hover {
+        color: var(--secondaryColor);
+      }
     }
   }
 
-  >div {
-    .search-result-div {
-      box-shadow: var(--componentShadow);
-      margin-top: 2px;
-      top: unset;
-      width: 100%;
-
-      .ant-collapse {
+  .search-result-div {
+    box-shadow: var(--componentShadow);
+    margin-top: 2px;
+    top: unset;
+    width: 100%;
 
-        overflow-y: auto;
-        max-height: 80vh;
+    .ant-collapse {
+      overflow-y: auto;
+      max-height: 80vh;
+      background-color: white;
 
-        .ant-collapse-header {
-          line-height: unset;
-          border-bottom: solid 1px var(--secondaryColor);
-          background-color: color-mix(in srgb, var(--secondaryColor) 15%, white);
-        }
+      .ant-collapse-header {
+        line-height: unset;
+        border-bottom: solid 1px var(--secondaryColor);
+        background-color: color-mix(in srgb, var(--secondaryColor) 15%, white);
+      }
 
-        .ant-collapse-content {
-          max-height: 25vh;
-          overflow-y: auto;
+      .ant-collapse-content {
+        max-height: 25vh;
+        overflow-y: auto;
 
-          .ant-list-item {
-            justify-content: flex-start;
+        .ant-list-item {
+          justify-content: flex-start;
 
-            .result-prefix:not(:empty) {
-              width: 130px;
+          .result-prefix:not(:empty) {
+            width: 130px;
 
-              .ant-tag {
-                width: 100%;
-                text-align: center;
-              }
+            .ant-tag {
+              width: 100%;
+              text-align: center;
             }
+          }
 
-            .result-text {
-              flex: 1;
-            }
+          .result-text {
+            flex: 1;
           }
         }
       }
     }
+  }
 
-    .no-search-result-div {
-      background-color: white;
-      position: absolute;
-      width: 100%;
-    }
+  .no-search-result-div {
+    background-color: white;
+    position: absolute;
+    width: 100%;
   }
 }
diff --git a/src/components/MultiSearch/index.spec.tsx b/src/components/MultiSearch/index.spec.tsx
@@ -10,17 +10,11 @@ import MultiSearch from './index';
 
 describe('<MultiSearch />', () => {
 
-  it('is defined', () => {
-    expect(MultiSearch).not.toBeUndefined();
-  });
-
   it('can be rendered', () => {
     const {
       container
     } = render(
-      <MultiSearch
-        useNominatim={true}
-      />, {
+      <MultiSearch />, {
         wrapper: createReduxWrapper()
       }
     );