Merge branch 'master' into develop

This commit is contained in:
Pieter Vander Vennet 2024-10-28 18:08:26 +01:00
commit f5c8f4da92
116 changed files with 1276 additions and 317 deletions

View file

@ -50,7 +50,12 @@ export default class Constants {
...Constants.no_include,
] as const
public static panoramax: { url: string; token: string, sequence: string, testsequence: string } = packagefile.config.panoramax
public static panoramax: {
url: string
token: string
sequence: string
testsequence: string
} = packagefile.config.panoramax
// The user journey states thresholds when a new feature gets unlocked
public static userJourney = {

View file

@ -31,9 +31,7 @@ export default class DependencyCalculator {
* Returns a set of all other layer-ids that this layer needs to function.
* E.g. if this layers does snap to another layer in the preset, this other layer id will be mentioned
*/
public static getLayerDependencies(
layer: LayerConfig
): {
public static getLayerDependencies(layer: LayerConfig): {
neededLayer: string
reason: string
context?: string

View file

@ -373,9 +373,13 @@ export default class ThemeViewState implements SpecialVisualizationState {
this.hasDataInView = new NoElementsInViewDetector(this).hasFeatureInView
this.imageUploadManager = new ImageUploadManager(
layout,
new PanoramaxUploader(Constants.panoramax.url, Constants.panoramax.token,
this.featureSwitchIsTesting.map(t => t ? Constants.panoramax.testsequence : Constants.panoramax.sequence)
),
new PanoramaxUploader(
Constants.panoramax.url,
Constants.panoramax.token,
this.featureSwitchIsTesting.map((t) =>
t ? Constants.panoramax.testsequence : Constants.panoramax.sequence
)
),
this.featureProperties,
this.osmConnection,
this.changes,