# HG changeset patch
# User Sascha L. Teichmann <sascha.teichmann@intevation.de>
# Date 1585847212 -7200
# Node ID c3765d8e2a903e0213962fbec7c553a9c79da7e3
# Parent  5c52d6d69545c4d191e4285265e4df724e4da52c# Parent  e688e79a51e8136688186cf7b9ea90c5a31b49f1
Merged default into new-fwa branch.

diff -r 5c52d6d69545 -r c3765d8e2a90 client/src/components/importconfiguration/types/Fairwaymarks.vue
--- a/client/src/components/importconfiguration/types/Fairwaymarks.vue	Thu Apr 02 15:09:29 2020 +0200
+++ b/client/src/components/importconfiguration/types/Fairwaymarks.vue	Thu Apr 02 19:06:52 2020 +0200
@@ -126,11 +126,12 @@
     }
   },
   FAIRWAYMARKS: {
-    bcnisd: app.$gettext("Beacon, isolated danger (MARITIME/Hydro feature)"),
-    bcnlat_hydro: app.$gettext("Beacon, lateral (MARITIME/Hydro feature)"),
+    // Feature types not available from d4d wfs source are not selectable.
+    // bcnisd: app.$gettext("Beacon, isolated danger (MARITIME/Hydro feature)"),
+    // bcnlat_hydro: app.$gettext("Beacon, lateral (MARITIME/Hydro feature)"),
     bcnlat_ienc: app.$gettext("Beacon, lateral (IENC feature)"),
     boycar: app.$gettext("Buoy, cardinal (MARITIME/Hydro feature)"),
-    boyisd: app.$gettext("Buoy, isolated danger (MARITIME/Hydro feature)"),
+    // boyisd: app.$gettext("Buoy, isolated danger (MARITIME/Hydro feature)"),
     boylat_hydro: app.$gettext("Buoy, lateral (MARITIME/Hydro feature)"),
     boylat_ienc: app.$gettext("Buoy, lateral (IENC feature)"),
     boysaw: app.$gettext("Buoy, safe water (MARITIME/Hydro feature)"),
diff -r 5c52d6d69545 -r c3765d8e2a90 client/src/components/layers/layers.js
--- a/client/src/components/layers/layers.js	Thu Apr 02 15:09:29 2020 +0200
+++ b/client/src/components/layers/layers.js	Thu Apr 02 19:06:52 2020 +0200
@@ -742,11 +742,11 @@
             source
           });
         })(),
-        new TileLayer({
+        new ImageLayer({
           id: "FAIRWAYMARKS",
           label: "Fairway marks",
           visible: true,
-          source: new TileWMS({
+          source: new ImageSource({
             preload: 0,
             projection: "EPSG:3857",
             url: window.location.origin + "/api/internal/wms",
@@ -756,7 +756,7 @@
               TILED: true,
               TIME: store.state.application.refreshLayersTime.toISOString()
             },
-            tileLoadFunction: function(tile, src) {
+            imageLoadFunction: function(tile, src) {
               HTTP.get(src, {
                 headers: {
                   "X-Gemma-Auth": localStorage.getItem("token")