From fc255c1a8b03a54cfa89df32f668cfcc7592e977 Mon Sep 17 00:00:00 2001 From: SC Date: Wed, 6 Oct 2021 15:21:34 +0000 Subject: [PATCH 1/8] Translated using Weblate (Portuguese) Currently translated at 100.0% (25 of 25 strings) Translation: MapComplete/shared-questions Translate-URL: https://hosted.weblate.org/projects/mapcomplete/shared-questions/pt/ --- langs/shared-questions/pt.json | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/langs/shared-questions/pt.json b/langs/shared-questions/pt.json index 9524e139d5..a1622b21a3 100644 --- a/langs/shared-questions/pt.json +++ b/langs/shared-questions/pt.json @@ -61,6 +61,23 @@ } }, "question": "Este lugar é acessível a utilizadores de cadeiras de rodas?" + }, + "dog-access": { + "mappings": { + "0": { + "then": "Os cães são permitidos" + }, + "1": { + "then": "Os cães não são permitidos" + }, + "2": { + "then": "Os cães são permitidos, mas têm de ser presos pela trela" + }, + "3": { + "then": "Os cães são permitidos e podem correr livremente" + } + }, + "question": "Os cães são permitidos neste estabelecimento?" } } -} \ No newline at end of file +} From cee8eafb83e1e0c3fc553bbc48965f55b8fec6ca Mon Sep 17 00:00:00 2001 From: SC Date: Wed, 6 Oct 2021 15:23:37 +0000 Subject: [PATCH 2/8] Translated using Weblate (Portuguese) Currently translated at 30.4% (60 of 197 strings) Translation: MapComplete/Core Translate-URL: https://hosted.weblate.org/projects/mapcomplete/core/pt/ --- langs/pt.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/langs/pt.json b/langs/pt.json index 577ee0f205..f489838b87 100644 --- a/langs/pt.json +++ b/langs/pt.json @@ -20,5 +20,9 @@ "uploadingMultiple": "A enviar {count} imagens…", "uploadingPicture": "A enviar a sua imagem…", "addPicture": "Adicionar imagem" + }, + "index": { + "#": "Estes textos são mostrados acima dos botões do tema quando nenhum tema é carregado", + "title": "Bem-vindo(a) ao MapComplete" } } From 0dd483baf5a2fad5cb42e0dd647037be5272ffd4 Mon Sep 17 00:00:00 2001 From: SC Date: Thu, 7 Oct 2021 17:41:58 +0000 Subject: [PATCH 3/8] Translated using Weblate (Portuguese) Currently translated at 32.9% (65 of 197 strings) Translation: MapComplete/Core Translate-URL: https://hosted.weblate.org/projects/mapcomplete/core/pt/ --- langs/pt.json | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/langs/pt.json b/langs/pt.json index f489838b87..92db819cb1 100644 --- a/langs/pt.json +++ b/langs/pt.json @@ -23,6 +23,17 @@ }, "index": { "#": "Estes textos são mostrados acima dos botões do tema quando nenhum tema é carregado", - "title": "Bem-vindo(a) ao MapComplete" + "title": "Bem-vindo(a) ao MapComplete", + "intro": "O MapComplete é um visualizador e editor do OpenStreetMap, que mostra informações sobre um tema específico.", + "pickTheme": "Escolha um tema abaixo para começar." + }, + "delete": { + "reasons": { + "notFound": "Não foi possível encontrar este elemento" + }, + "explanations": { + "selectReason": "Por favor, selecione a razão porque este elemento deve ser eliminado", + "hardDelete": "Este ponto será eliminado no OpenStreetMap. Pode ser recuperado por um contribuidor com experiência" + } } } From 4f4203f670fba799bbf15ac82e7dfbc13f532e20 Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Mon, 11 Oct 2021 12:51:54 +0200 Subject: [PATCH 4/8] Add minzoom for charging stations --- Models/ThemeConfig/LayoutConfig.ts | 2 +- assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Models/ThemeConfig/LayoutConfig.ts b/Models/ThemeConfig/LayoutConfig.ts index 51cf19d759..9add1c7f92 100644 --- a/Models/ThemeConfig/LayoutConfig.ts +++ b/Models/ThemeConfig/LayoutConfig.ts @@ -92,7 +92,7 @@ export default class LayoutConfig { throw "Widenfactor too small" }else{ // Unofficial themes get away with this - console.warn("Detected a very small widenfactor, bumping this above 1.") + console.warn("Detected a very small widenfactor for theme ", this.id ,", bumping this above 1.") json.widenFactor = json.widenFactor + 1 } } diff --git a/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json b/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json index 2b303ea145..0a2eaa9e2f 100644 --- a/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json +++ b/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json @@ -31,7 +31,12 @@ "minzoom": 16 } }, - "charging_station", + { + "builtin": "charging_station", + "override": { + "minzoom": 16 + } + }, "toilet", "bench", "waste_basket", From 7576f7069bd7462e5179e10aa374e863a3d7d374 Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Mon, 11 Oct 2021 13:28:12 +0200 Subject: [PATCH 5/8] Fix broken layer selection --- .gitignore | 4 +++- InitUiElements.ts | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5d39c4885c..b2ad34580d 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,6 @@ Docs/Tools/stats.csv missing_translations.txt *.swp .DS_Store -Svg.ts \ No newline at end of file +Svg.ts +data/ +Folder.DotSettings.user diff --git a/InitUiElements.ts b/InitUiElements.ts index 8fafd7677d..dfd5b44396 100644 --- a/InitUiElements.ts +++ b/InitUiElements.ts @@ -489,7 +489,7 @@ export class InitUiElements { } return true - }, [State.state.currentBounds] + }, [State.state.currentBounds, source.layer.isDisplayed] ) new ShowDataLayer( From c010fb5271cc944b37ec9e6b07bd34a1234677c1 Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Mon, 11 Oct 2021 21:23:14 +0200 Subject: [PATCH 6/8] Change padding method, add max bounds, fix zoomlevels on toerisme vlaanderen theme --- Logic/Actors/OverpassFeatureSource.ts | 11 ++++-- Logic/BBox.ts | 17 ++++---- Logic/FeatureSource/FeaturePipeline.ts | 7 ++-- UI/BigComponents/ThemeIntroductionPanel.ts | 10 ++--- .../toerisme_vlaanderen.json | 39 ++++++++++++++----- 5 files changed, 53 insertions(+), 31 deletions(-) diff --git a/Logic/Actors/OverpassFeatureSource.ts b/Logic/Actors/OverpassFeatureSource.ts index 4f4f7a77f8..e27e0665d9 100644 --- a/Logic/Actors/OverpassFeatureSource.ts +++ b/Logic/Actors/OverpassFeatureSource.ts @@ -39,7 +39,7 @@ export default class OverpassFeatureSource implements FeatureSource { } private readonly _isActive: UIEventSource; private readonly onBboxLoaded: (bbox: BBox, date: Date, layers: LayerConfig[]) => void; - + private readonly padToTiles : number constructor( state: { readonly locationControl: UIEventSource, @@ -49,7 +49,8 @@ export default class OverpassFeatureSource implements FeatureSource { readonly overpassMaxZoom: UIEventSource, readonly currentBounds: UIEventSource }, - options?: { + options: { + padToTiles: number, isActive?: UIEventSource, relationTracker: RelationsTracker, onBboxLoaded?: (bbox: BBox, date: Date, layers: LayerConfig[]) => void @@ -57,6 +58,7 @@ export default class OverpassFeatureSource implements FeatureSource { this.state = state this._isActive = options.isActive; + this.padToTiles = options.padToTiles; this.onBboxLoaded = options.onBboxLoaded this.relationsTracker = options.relationTracker const self = this; @@ -109,11 +111,14 @@ export default class OverpassFeatureSource implements FeatureSource { return undefined; } - const bounds = this.state.currentBounds.data?.pad(this.state.layoutToUse.widenFactor)?.expandToTileBounds(14); + const bounds = this.state.currentBounds.data?.pad(this.state.layoutToUse.widenFactor)?.expandToTileBounds(this.padToTiles); if (bounds === undefined) { return undefined; } + console.log("Current bounds are", this.state.currentBounds.data," padded with",this.state.layoutToUse.widenFactor+":", + this.state.currentBounds.data.pad(this.state.layoutToUse.widenFactor), + "Tileexpanded: ",this.state.currentBounds.data?.pad(this.state.layoutToUse.widenFactor)?.expandToTileBounds(this.padToTiles) ) const self = this; diff --git a/Logic/BBox.ts b/Logic/BBox.ts index a6f350cf83..0205b15337 100644 --- a/Logic/BBox.ts +++ b/Logic/BBox.ts @@ -116,16 +116,15 @@ export class BBox { return this.minLat } - pad(factor: number): BBox { - const latDiff = this.maxLat - this.minLat - const lat = (this.maxLat + this.minLat) / 2 - const lonDiff = this.maxLon - this.minLon - const lon = (this.maxLon + this.minLon) / 2 + pad(factor: number, maxIncrease = 2): BBox { + + const latDiff = Math.min(maxIncrease / 2, Math.abs(this.maxLat - this.minLat) * factor) + const lonDiff =Math.min(maxIncrease / 2, Math.abs(this.maxLon - this.minLon) * factor) return new BBox([[ - lon - lonDiff * factor, - lat - latDiff * factor - ], [lon + lonDiff * factor, - lat + latDiff * factor]]) + this.minLon - lonDiff, + this.minLat - latDiff + ], [this.maxLon + lonDiff, + this.maxLat + latDiff]]) } toLeaflet() { diff --git a/Logic/FeatureSource/FeaturePipeline.ts b/Logic/FeatureSource/FeaturePipeline.ts index 3aa0af3562..ea33827f60 100644 --- a/Logic/FeatureSource/FeaturePipeline.ts +++ b/Logic/FeatureSource/FeaturePipeline.ts @@ -58,7 +58,7 @@ export default class FeaturePipeline { private readonly freshnesses = new Map(); private readonly oldestAllowedDate: Date = new Date(new Date().getTime() - 60 * 60 * 24 * 30 * 1000); - private readonly osmSourceZoomLevel = 14 + private readonly osmSourceZoomLevel = 15 constructor( handleFeatureSource: (source: FeatureSourceForLayer & Tiled) => void, @@ -147,7 +147,7 @@ export default class FeaturePipeline { // We split them up into tiles anyway as it is an OSM source TiledFeatureSource.createHierarchy(src, { layer: src.layer, - minZoomLevel: 14, + minZoomLevel: this.osmSourceZoomLevel, dontEnforceMinZoom: true, registerTile: (tile) => { new RegisteringAllFromFeatureSourceActor(tile) @@ -200,7 +200,7 @@ export default class FeaturePipeline { new PerLayerFeatureSourceSplitter(state.filteredLayers, (source) => TiledFeatureSource.createHierarchy(source, { layer: source.layer, - minZoomLevel: 14, + minZoomLevel: this.osmSourceZoomLevel, dontEnforceMinZoom: true, maxFeatureCount: state.layoutToUse.clustering.minNeededElements, maxZoomLevel: state.layoutToUse.clustering.maxZoom, @@ -333,6 +333,7 @@ export default class FeaturePipeline { const self = this; const updater = new OverpassFeatureSource(state, { + padToTiles: this.osmSourceZoomLevel, relationTracker: this.relationTracker, isActive: useOsmApi.map(b => !b && overpassIsActive.data, [overpassIsActive]), onBboxLoaded: ((bbox, date, downloadedLayers) => { diff --git a/UI/BigComponents/ThemeIntroductionPanel.ts b/UI/BigComponents/ThemeIntroductionPanel.ts index fec58bb29f..c7c0964210 100644 --- a/UI/BigComponents/ThemeIntroductionPanel.ts +++ b/UI/BigComponents/ThemeIntroductionPanel.ts @@ -50,13 +50,11 @@ export default class ThemeIntroductionPanel extends Combine { ) super([ - layout.description.Clone(), - "

", + layout.description.Clone().SetClass("blcok mb-4"), toTheMap, - loginStatus, - layout.descriptionTail?.Clone(), - "
", - languagePicker, + loginStatus.SetClass("block"), + layout.descriptionTail?.Clone().SetClass("block mt-4"), + languagePicker.SetClass("block mt-4"), ...layout.CustomCodeSnippets() ]) diff --git a/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json b/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json index 0a2eaa9e2f..7a401b0ab8 100644 --- a/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json +++ b/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json @@ -14,7 +14,10 @@ "nl": "Een kaart om toeristisch relevante info op aan te duiden" }, "description": { - "nl": "Op deze kaart kan je info zien die relevant is voor toerisme, zoals:
  • Eetgelegenheden
  • Cafés en bars
  • (Fiets)oplaadpunten
  • Fietspompen, fietserverhuur en fietswinkels
  • Uitkijktorens
  • ...
Zie je fouten op de kaart? Dan kan je zelf makkelijk aanpasingen maken, die zichtbaar zijn voor iedereen. Hiervoor dien je een gratis OpenStreetMap account voor te maken.

Met de steun van Toerisme Vlaanderen" + "nl": "Op deze kaart kan je info zien die relevant is voor toerisme, zoals:
  • Eetgelegenheden
  • Cafés en bars
  • (Fiets)oplaadpunten
  • Fietspompen, fietserverhuur en fietswinkels
  • Uitkijktorens
  • ...
Zie je fouten op de kaart? Dan kan je zelf makkelijk aanpasingen maken, die zichtbaar zijn voor iedereen. Hiervoor dien je een gratis OpenStreetMap account voor te maken." + }, + "descriptionTail": { + "nl": "Met de steun van Toerisme Vlaanderen" }, "icon": "./assets/svg/star.svg", "startZoom": 8, @@ -28,21 +31,37 @@ "cafe_pub" ], "override": { - "minzoom": 16 + "minzoom": 17 } }, { - "builtin": "charging_station", + "builtin": [ + "bench", + "waste_basket" + ], "override": { - "minzoom": 16 + "minzoom": 19 } }, - "toilet", - "bench", - "waste_basket", - "bike_repair_station", - "binocular", - "observation_tower" + { + "builtin": [ + "charging_station", + "toilet", + "bike_repair_station" + ], + "override": { + "minzoom": 14 + } + }, + { + "builtin": [ + "binocular", + "observation_tower" + ], + "override": { + "minzoom": 10 + } + } ], "hideFromOverview": true } \ No newline at end of file From 3157c35c62268ec54f4492fcf010ce47929937ed Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Mon, 11 Oct 2021 21:23:31 +0200 Subject: [PATCH 7/8] Version bump --- Models/Constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Models/Constants.ts b/Models/Constants.ts index a45d19e9ed..2b266f4ad5 100644 --- a/Models/Constants.ts +++ b/Models/Constants.ts @@ -2,7 +2,7 @@ import {Utils} from "../Utils"; export default class Constants { - public static vNumber = "0.10.3"; + public static vNumber = "0.10.4"; public static ImgurApiKey = '7070e7167f0a25a' public static readonly mapillary_client_token_v3 = 'TXhLaWthQ1d4RUg0czVxaTVoRjFJZzowNDczNjUzNmIyNTQyYzI2' public static readonly mapillary_client_token_v4 = "MLY|4441509239301885|b40ad2d3ea105435bd40c7e76993ae85" From 178cefceb41c854196356bad856d70eb728de2d7 Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Mon, 11 Oct 2021 22:30:22 +0200 Subject: [PATCH 8/8] Fix bounds and loading with overpass --- Logic/Actors/OverpassFeatureSource.ts | 23 ++-- .../Actors/SaveTileToLocalStorageActor.ts | 4 +- Logic/FeatureSource/FeaturePipeline.ts | 30 ++--- .../TiledFromLocalStorageSource.ts | 119 ++++++++---------- Models/Constants.ts | 2 +- Models/TileRange.ts | 2 +- .../toerisme_vlaanderen.json | 1 + 7 files changed, 78 insertions(+), 103 deletions(-) diff --git a/Logic/Actors/OverpassFeatureSource.ts b/Logic/Actors/OverpassFeatureSource.ts index e27e0665d9..62cf799988 100644 --- a/Logic/Actors/OverpassFeatureSource.ts +++ b/Logic/Actors/OverpassFeatureSource.ts @@ -38,8 +38,7 @@ export default class OverpassFeatureSource implements FeatureSource { readonly currentBounds: UIEventSource } private readonly _isActive: UIEventSource; - private readonly onBboxLoaded: (bbox: BBox, date: Date, layers: LayerConfig[]) => void; - private readonly padToTiles : number + private readonly onBboxLoaded: (bbox: BBox, date: Date, layers: LayerConfig[], zoomlevel: number) => void; constructor( state: { readonly locationControl: UIEventSource, @@ -50,20 +49,19 @@ export default class OverpassFeatureSource implements FeatureSource { readonly currentBounds: UIEventSource }, options: { - padToTiles: number, + padToTiles: UIEventSource, isActive?: UIEventSource, relationTracker: RelationsTracker, - onBboxLoaded?: (bbox: BBox, date: Date, layers: LayerConfig[]) => void + onBboxLoaded?: (bbox: BBox, date: Date, layers: LayerConfig[], zoomlevel: number) => void }) { this.state = state this._isActive = options.isActive; - this.padToTiles = options.padToTiles; this.onBboxLoaded = options.onBboxLoaded this.relationsTracker = options.relationTracker const self = this; state.currentBounds.addCallback(_ => { - self.update() + self.update(options.padToTiles.data) }) } @@ -86,21 +84,21 @@ export default class OverpassFeatureSource implements FeatureSource { return new Overpass(new Or(filters), extraScripts, interpreterUrl, this.state.overpassTimeout, this.relationsTracker); } - private update() { + private update(paddedZoomLevel: number) { if (!this._isActive.data) { return; } const self = this; - this.updateAsync().then(bboxDate => { + this.updateAsync(paddedZoomLevel).then(bboxDate => { if(bboxDate === undefined || self.onBboxLoaded === undefined){ return; } const [bbox, date, layers] = bboxDate - self.onBboxLoaded(bbox, date, layers) + self.onBboxLoaded(bbox, date, layers, paddedZoomLevel) }) } - private async updateAsync(): Promise<[BBox, Date, LayerConfig[]]> { + private async updateAsync(padToZoomLevel: number): Promise<[BBox, Date, LayerConfig[]]> { if (this.runningQuery.data) { console.log("Still running a query, not updating"); return undefined; @@ -111,14 +109,11 @@ export default class OverpassFeatureSource implements FeatureSource { return undefined; } - const bounds = this.state.currentBounds.data?.pad(this.state.layoutToUse.widenFactor)?.expandToTileBounds(this.padToTiles); + const bounds = this.state.currentBounds.data?.pad(this.state.layoutToUse.widenFactor)?.expandToTileBounds(padToZoomLevel); if (bounds === undefined) { return undefined; } - console.log("Current bounds are", this.state.currentBounds.data," padded with",this.state.layoutToUse.widenFactor+":", - this.state.currentBounds.data.pad(this.state.layoutToUse.widenFactor), - "Tileexpanded: ",this.state.currentBounds.data?.pad(this.state.layoutToUse.widenFactor)?.expandToTileBounds(this.padToTiles) ) const self = this; diff --git a/Logic/FeatureSource/Actors/SaveTileToLocalStorageActor.ts b/Logic/FeatureSource/Actors/SaveTileToLocalStorageActor.ts index 2894d56b82..96e9938aac 100644 --- a/Logic/FeatureSource/Actors/SaveTileToLocalStorageActor.ts +++ b/Logic/FeatureSource/Actors/SaveTileToLocalStorageActor.ts @@ -7,7 +7,7 @@ import {FeatureSourceForLayer} from "../FeatureSource"; export default class SaveTileToLocalStorageActor { public static readonly storageKey: string = "cached-features"; - public static readonly formatVersion: string = "1" + public static readonly formatVersion: string = "2" constructor(source: FeatureSourceForLayer, tileIndex: number) { source.features.addCallbackAndRunD(features => { @@ -31,6 +31,6 @@ export default class SaveTileToLocalStorageActor { const key = `${SaveTileToLocalStorageActor.storageKey}-${layerId}-${tileId}` localStorage.setItem(key + "-time", JSON.stringify(freshness.getTime())) localStorage.setItem(key + "-format", SaveTileToLocalStorageActor.formatVersion) - + console.log("Marked ", key, "as visited") } } \ No newline at end of file diff --git a/Logic/FeatureSource/FeaturePipeline.ts b/Logic/FeatureSource/FeaturePipeline.ts index ea33827f60..6df7b87f4f 100644 --- a/Logic/FeatureSource/FeaturePipeline.ts +++ b/Logic/FeatureSource/FeaturePipeline.ts @@ -155,7 +155,7 @@ export default class FeaturePipeline { tile.features.addCallbackAndRunD(_ => self.newDataLoadedSignal.setData(tile)) } }) - }else{ + } else { new RegisteringAllFromFeatureSourceActor(src) perLayerHierarchy.get(id).registerTile(src) src.features.addCallbackAndRunD(_ => self.newDataLoadedSignal.setData(src)) @@ -200,7 +200,7 @@ export default class FeaturePipeline { new PerLayerFeatureSourceSplitter(state.filteredLayers, (source) => TiledFeatureSource.createHierarchy(source, { layer: source.layer, - minZoomLevel: this.osmSourceZoomLevel, + minZoomLevel: source.layer.layerDef.minzoom, dontEnforceMinZoom: true, maxFeatureCount: state.layoutToUse.clustering.minNeededElements, maxZoomLevel: state.layoutToUse.clustering.maxZoom, @@ -233,7 +233,7 @@ export default class FeaturePipeline { // Whenever fresh data comes in, we need to update the metatagging - self.newDataLoadedSignal.stabilized(1000).addCallback(src => { + self.newDataLoadedSignal.stabilized(1000).addCallback(_ => { self.updateAllMetaTagging() }) @@ -270,15 +270,15 @@ export default class FeaturePipeline { const self = this return this.state.currentBounds.map(bbox => { if (bbox === undefined) { - return + return undefined } if (!isSufficientlyZoomed.data) { - return; + return undefined; } const osmSourceZoomLevel = self.osmSourceZoomLevel const range = bbox.containingTileRange(osmSourceZoomLevel) const tileIndexes = [] - if (range.total > 100) { + if (range.total >= 100) { // Too much tiles! return [] } @@ -288,7 +288,7 @@ export default class FeaturePipeline { if (oldestDate !== undefined && oldestDate > this.oldestAllowedDate) { console.debug("Skipping tile", osmSourceZoomLevel, x, y, "as a decently fresh one is available") // The cached tiles contain decently fresh data - return; + return undefined; } tileIndexes.push(i) }) @@ -321,29 +321,30 @@ export default class FeaturePipeline { } const range = bbox.containingTileRange(zoom) - if (range.total > 100) { + if (range.total >= 5000) { return false } const self = this; const allFreshnesses = Tiles.MapRange(range, (x, y) => self.freshnessForVisibleLayers(zoom, x, y)) return allFreshnesses.some(freshness => freshness === undefined || freshness < this.oldestAllowedDate) - }, [state.locationControl]) const self = this; const updater = new OverpassFeatureSource(state, { - padToTiles: this.osmSourceZoomLevel, + padToTiles: state.locationControl.map(l => Math.min(15, l.zoom + 1)), relationTracker: this.relationTracker, isActive: useOsmApi.map(b => !b && overpassIsActive.data, [overpassIsActive]), - onBboxLoaded: ((bbox, date, downloadedLayers) => { - Tiles.MapRange(bbox.containingTileRange(self.osmSourceZoomLevel), (x, y) => { + onBboxLoaded: (bbox, date, downloadedLayers, paddedToZoomLevel) => { + Tiles.MapRange(bbox.containingTileRange(paddedToZoomLevel), (x, y) => { + const tileIndex = Tiles.tile_index(paddedToZoomLevel, x, y) downloadedLayers.forEach(layer => { - SaveTileToLocalStorageActor.MarkVisited(layer.id, Tiles.tile_index(this.osmSourceZoomLevel, x, y), date) + self.freshnesses.get(layer.id).addTileLoad(tileIndex, date) + SaveTileToLocalStorageActor.MarkVisited(layer.id, tileIndex, date) }) }) - }) + } }); @@ -379,7 +380,6 @@ export default class FeaturePipeline { private updateAllMetaTagging() { const self = this; - console.log("Reupdating all metatagging") this.perLayerHierarchy.forEach(hierarchy => { hierarchy.loadedTiles.forEach(src => { self.applyMetaTags(src) diff --git a/Logic/FeatureSource/TiledFeatureSource/TiledFromLocalStorageSource.ts b/Logic/FeatureSource/TiledFeatureSource/TiledFromLocalStorageSource.ts index 6f815f48d5..a2cd50be08 100644 --- a/Logic/FeatureSource/TiledFeatureSource/TiledFromLocalStorageSource.ts +++ b/Logic/FeatureSource/TiledFeatureSource/TiledFromLocalStorageSource.ts @@ -1,14 +1,16 @@ import FilteredLayer from "../../../Models/FilteredLayer"; import {FeatureSourceForLayer, Tiled} from "../FeatureSource"; import {UIEventSource} from "../../UIEventSource"; -import Loc from "../../../Models/Loc"; import TileHierarchy from "./TileHierarchy"; import SaveTileToLocalStorageActor from "../Actors/SaveTileToLocalStorageActor"; import {Tiles} from "../../../Models/TileRange"; import {BBox} from "../../BBox"; export default class TiledFromLocalStorageSource implements TileHierarchy { - public loadedTiles: Map = new Map(); + public readonly loadedTiles: Map = new Map(); + private readonly layer: FilteredLayer; + private readonly handleFeatureSource: (src: FeatureSourceForLayer & Tiled, index: number) => void; + private readonly undefinedTiles: Set; public static GetFreshnesses(layerId: string): Map { const prefix = SaveTileToLocalStorageActor.storageKey + "-" + layerId + "-" @@ -29,14 +31,15 @@ export default class TiledFromLocalStorageSource implements TileHierarchy void, state: { - locationControl: UIEventSource - leafletMap: any + currentBounds: UIEventSource }) { + this.layer = layer; + this.handleFeatureSource = handleFeatureSource; - const undefinedTiles = new Set() + + this.undefinedTiles = new Set() const prefix = SaveTileToLocalStorageActor.storageKey + "-" + layer.layerDef.id + "-" - // @ts-ignore - const indexes: number[] = Object.keys(localStorage) + const knownTiles: number[] = Object.keys(localStorage) .filter(key => { return key.startsWith(prefix) && !key.endsWith("-time") && !key.endsWith("-format"); }) @@ -45,8 +48,8 @@ export default class TiledFromLocalStorageSource implements TileHierarchy !isNaN(i)) - console.debug("Layer", layer.layerDef.id, "has following tiles in available in localstorage", indexes.map(i => Tiles.tile_from_index(i).join("/")).join(", ")) - for (const index of indexes) { + console.debug("Layer", layer.layerDef.id, "has following tiles in available in localstorage", knownTiles.map(i => Tiles.tile_from_index(i).join("/")).join(", ")) + for (const index of knownTiles) { const prefix = SaveTileToLocalStorageActor.storageKey + "-" + layer.layerDef.id + "-" + index; const version = localStorage.getItem(prefix + "-format") @@ -55,78 +58,54 @@ export default class TiledFromLocalStorageSource implements TileHierarchy i % 100) - const indexesSet = new Set(indexes) - const maxZoom = Math.max(...zLevels) - const minZoom = Math.min(...zLevels) - const self = this; + const self = this + state.currentBounds.map(bounds => { - const neededTiles = state.locationControl.map( - location => { - if (!layer.isDisplayed.data) { - // No need to download! - the layer is disabled - return undefined; - } - - if (location.zoom < layer.layerDef.minzoom) { - // No need to download! - the layer is disabled - return undefined; - } - - // Yup, this is cheating to just get the bounds here - const bounds = state.leafletMap.data?.getBounds() - if (bounds === undefined) { - // We'll retry later - return undefined - } - - const needed = [] - for (let z = minZoom; z <= maxZoom; z++) { - - const tileRange = Tiles.TileRangeBetween(z, bounds.getNorth(), bounds.getEast(), bounds.getSouth(), bounds.getWest()) - const neededZ = Tiles.MapRange(tileRange, (x, y) => Tiles.tile_index(z, x, y)) - .filter(i => !self.loadedTiles.has(i) && !undefinedTiles.has(i) && indexesSet.has(i)) - needed.push(...neededZ) - } - - if (needed.length === 0) { - return undefined - } - return needed + if(bounds === undefined){ + return; } - , [layer.isDisplayed, state.leafletMap]).stabilized(50); - - neededTiles.addCallbackAndRunD(neededIndexes => { - for (const neededIndex of neededIndexes) { - // We load the features from localStorage - try { - const key = SaveTileToLocalStorageActor.storageKey + "-" + layer.layerDef.id + "-" + neededIndex - const data = localStorage.getItem(key) - const features = JSON.parse(data) - const src = { - layer: layer, - features: new UIEventSource<{ feature: any; freshness: Date }[]>(features), - name: "FromLocalStorage(" + key + ")", - tileIndex: neededIndex, - bbox: BBox.fromTileIndex(neededIndex) - } - handleFeatureSource(src, neededIndex) - self.loadedTiles.set(neededIndex, src) - } catch (e) { - console.error("Could not load data tile from local storage due to", e) - undefinedTiles.add(neededIndex) + for (const knownTile of knownTiles) { + + if(this.loadedTiles.has(knownTile)){ + continue; } + if(this.undefinedTiles.has(knownTile)){ + continue; + } + + if(!bounds.overlapsWith(BBox.fromTileIndex(knownTile))){ + continue; + } + self.loadTile(knownTile) } - - }) } + + private loadTile( neededIndex: number){ + try { + const key = SaveTileToLocalStorageActor.storageKey + "-" + this.layer.layerDef.id + "-" + neededIndex + const data = localStorage.getItem(key) + const features = JSON.parse(data) + const src = { + layer: this.layer, + features: new UIEventSource<{ feature: any; freshness: Date }[]>(features), + name: "FromLocalStorage(" + key + ")", + tileIndex: neededIndex, + bbox: BBox.fromTileIndex(neededIndex) + } + this.handleFeatureSource(src, neededIndex) + this.loadedTiles.set(neededIndex, src) + } catch (e) { + console.error("Could not load data tile from local storage due to", e) + this.undefinedTiles.add(neededIndex) + } + } } \ No newline at end of file diff --git a/Models/Constants.ts b/Models/Constants.ts index 2b266f4ad5..c79773971a 100644 --- a/Models/Constants.ts +++ b/Models/Constants.ts @@ -2,7 +2,7 @@ import {Utils} from "../Utils"; export default class Constants { - public static vNumber = "0.10.4"; + public static vNumber = "0.10.5"; public static ImgurApiKey = '7070e7167f0a25a' public static readonly mapillary_client_token_v3 = 'TXhLaWthQ1d4RUg0czVxaTVoRjFJZzowNDczNjUzNmIyNTQyYzI2' public static readonly mapillary_client_token_v4 = "MLY|4441509239301885|b40ad2d3ea105435bd40c7e76993ae85" diff --git a/Models/TileRange.ts b/Models/TileRange.ts index 7a542a2135..cccfe19643 100644 --- a/Models/TileRange.ts +++ b/Models/TileRange.ts @@ -15,7 +15,7 @@ export class Tiles { public static MapRange(tileRange: TileRange, f: (x: number, y: number) => T): T[] { const result: T[] = [] const total = tileRange.total - if(total > 5000){ + if(total > 100000){ throw "Tilerange too big" } for (let x = tileRange.xstart; x <= tileRange.xend; x++) { diff --git a/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json b/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json index 7a401b0ab8..489c36ed7d 100644 --- a/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json +++ b/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json @@ -37,6 +37,7 @@ { "builtin": [ "bench", + "picnic_table", "waste_basket" ], "override": {