Mercurial > gemma
changeset 5190:c3765d8e2a90 new-fwa
Merged default into new-fwa branch.
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Thu, 02 Apr 2020 19:06:52 +0200 |
parents | 5c52d6d69545 (current diff) e688e79a51e8 (diff) |
children | f5564dc0adcc |
files | |
diffstat | 2 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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)"),
--- 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")