# HG changeset patch
# User Sascha Wilde <wilde@intevation.de>
# Date 1591690231 -7200
# Node ID 31c50d676bb06ca4a5c2eb3eff2c65d3fcb105fa
# Parent  eb79bc545482e4bb18a82070f80dbd6f313a35b1# Parent  41a67619c170dadf73185f6c3887bc8a6f5eb73a
Merged multi-geoms branch

diff -r 41a67619c170 -r 31c50d676bb0 client/src/components/importconfiguration/ScheduledImports.vue
--- a/client/src/components/importconfiguration/ScheduledImports.vue	Mon Jun 08 19:29:40 2020 +0200
+++ b/client/src/components/importconfiguration/ScheduledImports.vue	Tue Jun 09 10:10:31 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;
diff -r 41a67619c170 -r 31c50d676bb0 client/src/components/importconfiguration/types/Distancemarksashore.vue
--- a/client/src/components/importconfiguration/types/Distancemarksashore.vue	Mon Jun 08 19:29:40 2020 +0200
+++ b/client/src/components/importconfiguration/types/Distancemarksashore.vue	Tue Jun 09 10:10:31 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
  *
diff -r 41a67619c170 -r 31c50d676bb0 client/src/components/importconfiguration/types/Fairwaydimensions.vue
--- a/client/src/components/importconfiguration/types/Fairwaydimensions.vue	Mon Jun 08 19:29:40 2020 +0200
+++ b/client/src/components/importconfiguration/types/Fairwaydimensions.vue	Tue Jun 09 10:10:31 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
  *
diff -r 41a67619c170 -r 31c50d676bb0 client/src/components/importconfiguration/types/Fairwaymarks.vue
--- a/client/src/components/importconfiguration/types/Fairwaymarks.vue	Mon Jun 08 19:29:40 2020 +0200
+++ b/client/src/components/importconfiguration/types/Fairwaymarks.vue	Tue Jun 09 10:10:31 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
  *
diff -r 41a67619c170 -r 31c50d676bb0 client/src/components/importconfiguration/types/WaterwayProfiles.vue
--- a/client/src/components/importconfiguration/types/WaterwayProfiles.vue	Mon Jun 08 19:29:40 2020 +0200
+++ b/client/src/components/importconfiguration/types/WaterwayProfiles.vue	Tue Jun 09 10:10:31 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
  *
@@ -166,7 +159,7 @@
       this.uploadFile = files[0];
     },
     submit() {
-      if (!this.url || !this.featureType || !this.sortBy || !this.uploadFile)
+      if (!this.url || !this.featureType || !this.uploadFile)
         return;
       let formData = new FormData();
       formData.append("wp", this.uploadFile);
diff -r 41a67619c170 -r 31c50d676bb0 client/src/components/importconfiguration/types/Waterwayarea.vue
--- a/client/src/components/importconfiguration/types/Waterwayarea.vue	Mon Jun 08 19:29:40 2020 +0200
+++ b/client/src/components/importconfiguration/types/Waterwayarea.vue	Tue Jun 09 10:10:31 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
  *
diff -r 41a67619c170 -r 31c50d676bb0 client/src/components/importconfiguration/types/Waterwayaxis.vue
--- a/client/src/components/importconfiguration/types/Waterwayaxis.vue	Mon Jun 08 19:29:40 2020 +0200
+++ b/client/src/components/importconfiguration/types/Waterwayaxis.vue	Tue Jun 09 10:10:31 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
  *