From d3f84d51ace8fb521d94dc27918abb39495bbfa4 Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Wed, 20 Oct 2021 19:12:28 +0200 Subject: [PATCH] Small fixes --- Logic/Actors/OverpassFeatureSource.ts | 7 ++++++- UI/BigComponents/SimpleAddUI.ts | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Logic/Actors/OverpassFeatureSource.ts b/Logic/Actors/OverpassFeatureSource.ts index e48ae2a3f9..49c605137f 100644 --- a/Logic/Actors/OverpassFeatureSource.ts +++ b/Logic/Actors/OverpassFeatureSource.ts @@ -180,14 +180,19 @@ export default class OverpassFeatureSource implements FeatureSource { } } while (data === undefined && this._isActive.data); - self.retries.setData(0); + try { + if(data === undefined){ + return undefined + } data.features.forEach(feature => SimpleMetaTagger.objectMetaInfo.applyMetaTagsOnFeature(feature, date, undefined)); self.features.setData(data.features.map(f => ({feature: f, freshness: date}))); return [bounds, date, layersToDownload]; } catch (e) { console.error("Got the overpass response, but could not process it: ", e, e.stack) + return undefined } finally { + self.retries.setData(0); self.runningQuery.setData(false); } diff --git a/UI/BigComponents/SimpleAddUI.ts b/UI/BigComponents/SimpleAddUI.ts index 204e7f955f..84e14b6827 100644 --- a/UI/BigComponents/SimpleAddUI.ts +++ b/UI/BigComponents/SimpleAddUI.ts @@ -113,9 +113,9 @@ export default class SimpleAddUI extends Toggle { new Toggle( new Toggle( new Toggle( - addUi, Translations.t.general.add.stillLoading.Clone().SetClass("alert"), - state.featurePipeline.somethingLoaded + addUi, + state.featurePipeline.runningQuery ), Translations.t.general.add.zoomInFurther.Clone().SetClass("alert"), state.locationControl.map(loc => loc.zoom >= Constants.userJourney.minZoomLevelToAddNewPoints)