Mercurial > gemma

changeset 5268:1ff56484db4e wfs-optional-sortby

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Made SortBy parameter in WMS import optional Some national systems are based on ArcGIS which can not handle the requests containing the sortby parameter correctly.
author wilde@azure1.rgb.intevation.de
date Thu, 04 Jun 2020 14:38:40 +0200
parents 5df1eff5e445
children eb79bc545482
files client/src/components/importconfiguration/ScheduledImports.vue client/src/components/importconfiguration/types/Distancemarksashore.vue client/src/components/importconfiguration/types/Fairwaydimensions.vue client/src/components/importconfiguration/types/Fairwaymarks.vue client/src/components/importconfiguration/types/WaterwayProfiles.vue client/src/components/importconfiguration/types/Waterwayarea.vue client/src/components/importconfiguration/types/Waterwayaxis.vue
diffstat 7 files changed, 7 insertions(+), 70 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/components/importconfiguration/ScheduledImports.vue	Wed May 13 19:43:57 2020 +0200
+++ b/client/src/components/importconfiguration/ScheduledImports.vue	Thu Jun 04 14:38:40 2020 +0200
@@ -473,7 +473,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  * License-Filename: LICENSES/AGPL-3.0.txt
  *
- * Copyright (C) 2018, 2019 by via donau
+ * Copyright (C) 2018, 2019, 2020 by via donau
  *   – Österreichische Wasserstraßen-Gesellschaft mbH
  * Software engineering by Intevation GmbH
  *
@@ -611,18 +611,6 @@
           return false;
       }
     },
-    isSortbyRequired() {
-      switch (this.import_) {
-        case this.$options.IMPORTTYPES.WATERWAYAXIS:
-        case this.$options.IMPORTTYPES.WATERWAYAREA:
-        case this.$options.IMPORTTYPES.FAIRWAYDIMENSION:
-        case this.$options.IMPORTTYPES.FAIRWAYMARKS:
-        case this.$options.IMPORTTYPES.DISTANCEMARKSASHORE:
-          return true;
-        default:
-          return false;
-      }
-    },
     isToleranceRequired() {
       switch (this.import_) {
         case this.$options.IMPORTTYPES.BOTTLENECK:
@@ -653,7 +641,6 @@
       if (this.directImport && !this.uploadFile) return false;
       else if (!this.directImport) {
         if (this.isURLRequired && !this.url) return false;
-        if (this.isSortbyRequired && !this.sortBy) return false;
         if (this.isFeatureTypeRequired && !this.featureType) return false;
         if (this.isCredentialsRequired && !this.usernamePasswordFilled)
           return false;
@@ -894,10 +881,6 @@
         if (!this.featureType) return;
         data["feature-type"] = this.featureType;
       }
-      if (this.isSortbyRequired) {
-        if (!this.sortBy) return;
-        data["sort-by"] = this.sortBy;
-      }
       if (this.isToleranceRequired) {
         if (!this.tolerance) return;
         data["tolerance"] = parseFloat(this.tolerance);
@@ -977,10 +960,6 @@
         config["url"] = this.url;
         config["insecure"] = this.insecure;
       }
-      if (this.isSortbyRequired) {
-        if (!this.sortBy) return;
-        config["sort-by"] = this.sortBy;
-      }
       if (this.isFeatureTypeRequired) {
         if (!this.featureType) return;
         config["feature-type"] = this.featureType;
--- a/client/src/components/importconfiguration/types/Distancemarksashore.vue	Wed May 13 19:43:57 2020 +0200
+++ b/client/src/components/importconfiguration/types/Distancemarksashore.vue	Thu Jun 04 14:38:40 2020 +0200
@@ -53,13 +53,6 @@
             :value="sortBy"
           />
         </div>
-        <div v-if="!sortBy" class="d-flex flex-row">
-          <small
-            ><translate class="text-danger"
-              >Please enter SortBy</translate
-            ></small
-          >
-        </div>
       </div>
     </div>
   </div>
@@ -72,7 +65,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  * License-Filename: LICENSES/AGPL-3.0.txt
  *
- * Copyright (C) 2018 by via donau
+ * Copyright (C) 2018, 2019, 2020 by via donau
  *   – Österreichische Wasserstraßen-Gesellschaft mbH
  * Software engineering by Intevation GmbH
  *
--- a/client/src/components/importconfiguration/types/Fairwaydimensions.vue	Wed May 13 19:43:57 2020 +0200
+++ b/client/src/components/importconfiguration/types/Fairwaydimensions.vue	Thu Jun 04 14:38:40 2020 +0200
@@ -53,13 +53,6 @@
             :value="sortBy"
           />
         </div>
-        <div v-if="!sortBy" class="d-flex flex-row">
-          <small
-            ><translate class="text-danger"
-              >Please enter SortBy</translate
-            ></small
-          >
-        </div>
       </div>
     </div>
     <div class="d-flex px-2">
@@ -183,7 +176,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  * License-Filename: LICENSES/AGPL-3.0.txt
  *
- * Copyright (C) 2018 by via donau
+ * Copyright (C) 2018, 2019, 2020 by via donau
  *   – Österreichische Wasserstraßen-Gesellschaft mbH
  * Software engineering by Intevation GmbH
  *
--- a/client/src/components/importconfiguration/types/Fairwaymarks.vue	Wed May 13 19:43:57 2020 +0200
+++ b/client/src/components/importconfiguration/types/Fairwaymarks.vue	Thu Jun 04 14:38:40 2020 +0200
@@ -72,13 +72,6 @@
             :value="sortBy"
           />
         </div>
-        <div v-if="!sortBy" class="d-flex flex-row">
-          <small
-            ><translate class="text-danger"
-              >Please enter SortBy</translate
-            ></small
-          >
-        </div>
       </div>
     </div>
   </div>
@@ -91,7 +84,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  * License-Filename: LICENSES/AGPL-3.0.txt
  *
- * Copyright (C) 2018 by via donau
+ * Copyright (C) 2018, 2019, 2020 by via donau
  *   – Österreichische Wasserstraßen-Gesellschaft mbH
  * Software engineering by Intevation GmbH
  *
--- a/client/src/components/importconfiguration/types/WaterwayProfiles.vue	Wed May 13 19:43:57 2020 +0200
+++ b/client/src/components/importconfiguration/types/WaterwayProfiles.vue	Thu Jun 04 14:38:40 2020 +0200
@@ -75,13 +75,6 @@
               v-model="sortBy"
             />
           </div>
-          <div v-if="!sortBy" class="d-flex flex-row">
-            <small
-              ><translate class="text-danger"
-                >Please enter SortBy</translate
-              ></small
-            >
-          </div>
         </div>
       </div>
     </div>
@@ -124,7 +117,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  * License-Filename: LICENSES/AGPL-3.0.txt
  *
- * Copyright (C) 2018 by via donau
+ * Copyright (C) 2018, 2019, 2020 by via donau
  *   – Österreichische Wasserstraßen-Gesellschaft mbH
  * Software engineering by Intevation GmbH
  *
--- a/client/src/components/importconfiguration/types/Waterwayarea.vue	Wed May 13 19:43:57 2020 +0200
+++ b/client/src/components/importconfiguration/types/Waterwayarea.vue	Thu Jun 04 14:38:40 2020 +0200
@@ -53,13 +53,6 @@
             :value="sortBy"
           />
         </div>
-        <div v-if="!sortBy" class="d-flex flex-row">
-          <small
-            ><translate class="text-danger"
-              >Please enter SortBy</translate
-            ></small
-          >
-        </div>
       </div>
     </div>
   </div>
@@ -72,7 +65,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  * License-Filename: LICENSES/AGPL-3.0.txt
  *
- * Copyright (C) 2018 by via donau
+ * Copyright (C) 2018, 2019, 2020 by via donau
  *   – Österreichische Wasserstraßen-Gesellschaft mbH
  * Software engineering by Intevation GmbH
  *
--- a/client/src/components/importconfiguration/types/Waterwayaxis.vue	Wed May 13 19:43:57 2020 +0200
+++ b/client/src/components/importconfiguration/types/Waterwayaxis.vue	Thu Jun 04 14:38:40 2020 +0200
@@ -53,13 +53,6 @@
             :value="sortBy"
           />
         </div>
-        <div v-if="!sortBy" class="d-flex flex-row">
-          <small
-            ><translate class="text-danger"
-              >Please enter SortBy</translate
-            ></small
-          >
-        </div>
       </div>
     </div>
   </div>
@@ -72,7 +65,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  * License-Filename: LICENSES/AGPL-3.0.txt
  *
- * Copyright (C) 2018 by via donau
+ * Copyright (C) 2018, 2019, 2020 by via donau
  *   – Österreichische Wasserstraßen-Gesellschaft mbH
  * Software engineering by Intevation GmbH
  *