Bastian-Greshake-Tzovaras/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Merge branch 'develop' into features/left-right-rendering

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-10-21 01:21:29 +02:00
commit 59d20ec859
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Logic/Actors/OverpassFeatureSource.ts
View file

@ -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);
}

2
Models/Constants.ts
View file

@ -2,7 +2,7 @@ import {Utils} from "../Utils";
export default class Constants {
public static vNumber = "0.11.0-rc-1";
public static vNumber = "0.11.0";
public static ImgurApiKey = '7070e7167f0a25a'
public static readonly mapillary_client_token_v3 = 'TXhLaWthQ1d4RUg0czVxaTVoRjFJZzowNDczNjUzNmIyNTQyYzI2'
public static readonly mapillary_client_token_v4 = "MLY|4441509239301885|b40ad2d3ea105435bd40c7e76993ae85"

4
UI/BigComponents/SimpleAddUI.ts
View file

@ -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)