diff --git a/Logic/Basemap.ts b/Logic/Basemap.ts index 9298dd345..f6ae1f81b 100644 --- a/Logic/Basemap.ts +++ b/Logic/Basemap.ts @@ -14,14 +14,14 @@ export class Basemap { private aivLucht2013Layer = L.tileLayer.wms('https://geoservices.informatievlaanderen.be/raadpleegdiensten/OGW/wms?s', { layers: "OGWRGB13_15VL", - attribution: "Luchtfoto's van © AIV Vlaanderen (2013-2015) | Data van OpenStreetMap" + attribution: "Luchtfoto's van © AIV Vlaanderen (2013-2015) | " }); private aivLuchtLatestLayer = L.tileLayer("https://tile.informatievlaanderen.be/ws/raadpleegdiensten/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&" + "LAYER=omwrgbmrvl&STYLE=&FORMAT=image/png&tileMatrixSet=GoogleMapsVL&tileMatrix={z}&tileRow={y}&tileCol={x}", { // omwrgbmrvl - attribution: 'Map Data OpenStreetMap | Luchtfoto\'s van © AIV Vlaanderen (Laatste) © AGIV', + attribution: 'Luchtfoto\'s van © AIV Vlaanderen (Laatste) © AGIV', maxZoom: 20, minZoom: 1, wmts: true @@ -30,20 +30,20 @@ export class Basemap { private osmLayer = L.tileLayer("https://tile.openstreetmap.org/{z}/{x}/{y}.png", { - attribution: 'Map Data and background © OpenStreetMap', + attribution: '', maxZoom: 19, minZoom: 1 }); private osmBeLayer = L.tileLayer("https://tile.osm.be/osmbe/{z}/{x}/{y}.png", { - attribution: 'Map Data and background © OpenStreetMap | Tiles courtesy of Geo6', + attribution: 'Tile hosting courtesy of Geo6', maxZoom: 18, minZoom: 1 }); private grbLayer = L.tileLayer("https://tile.informatievlaanderen.be/ws/raadpleegdiensten/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=grb_bsk&STYLE=&FORMAT=image/png&tileMatrixSet=GoogleMapsVL&tileMatrix={z}&tileCol={x}&tileRow={y}", { - attribution: 'Map Data OpenStreetMap | Background Grootschalig ReferentieBestand(GRB) © AGIV', + attribution: 'Achtergrond Grootschalig ReferentieBestand(GRB) © AGIV', maxZoom: 20, minZoom: 1, wmts: true @@ -66,7 +66,8 @@ export class Basemap { zoom: location.data.zoom, layers: [this.osmLayer], }); - this.map.attributionControl.setPrefix(extraAttribution.Render()); + this.map.attributionControl.setPrefix( + extraAttribution.Render() + " | OpenStreetMap"); this.Location = location; const layerControl = L.control.layers(this.baseLayers, null, diff --git a/UI/SimpleAddUI.ts b/UI/SimpleAddUI.ts index 0462215c9..e778ef645 100644 --- a/UI/SimpleAddUI.ts +++ b/UI/SimpleAddUI.ts @@ -15,11 +15,13 @@ export class SimpleAddUI extends UIElement { private _lastClickLocation: UIEventSource<{ lat: number; lon: number }>; private _changes: Changes; private _selectedElement: UIEventSource; + private _dataIsLoading: UIEventSource; constructor(zoomlevel: UIEventSource<{ zoom: number }>, lastClickLocation: UIEventSource<{ lat: number, lon: number }>, changes: Changes, selectedElement: UIEventSource, + dataIsLoading: UIEventSource, addButtons: { name: string; icon: string; tags: Tag[]; layerToAddTo: FilteredLayer }[], ) { super(zoomlevel); @@ -27,6 +29,7 @@ export class SimpleAddUI extends UIElement { this._lastClickLocation = lastClickLocation; this._changes = changes; this._selectedElement = selectedElement; + this._dataIsLoading = dataIsLoading; this._addButtons = []; for (const option of addButtons) { @@ -53,15 +56,17 @@ export class SimpleAddUI extends UIElement { protected InnerRender(): string { const header = "

Geen selectie

" + - "Je klikte ergens waar er nog geen gezochte data is.
" + "Je klikte ergens waar er nog geen gezochte data is.
"; if (this._zoomlevel.data.zoom < 19) { - return header + "Zoom verder in om een element toe te voegen." + return header + "Zoom verder in om een element toe te voegen."; + } + + if(this._dataIsLoading.data){ + return header + "De data is nog aan het laden. Nog even geduld, dan kan je een punt toevoegen"; } var html = ""; for (const button of this._addButtons) { - //