midgard/mapcomplete
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Do not show quickswitch if background map switching is disabled

Browse source
This commit is contained in:
pietervdvn 2021-12-04 12:20:24 +01:00
parent e21f7f4dee
commit 2bead588fb
4 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Logic/State/FeatureSwitchState.ts
View file

@ -16,7 +16,7 @@ export default class FeatureSwitchState {
public readonly featureSwitchUserbadge: UIEventSource<boolean>; public readonly featureSwitchUserbadge: UIEventSource<boolean>;
public readonly featureSwitchSearch: UIEventSource<boolean>; public readonly featureSwitchSearch: UIEventSource<boolean>;
public readonly featureSwitchBackgroundSlection: UIEventSource<boolean>; public readonly featureSwitchBackgroundSelection: UIEventSource<boolean>;
public readonly featureSwitchAddNew: UIEventSource<boolean>; public readonly featureSwitchAddNew: UIEventSource<boolean>;
public readonly featureSwitchWelcomeMessage: UIEventSource<boolean>; public readonly featureSwitchWelcomeMessage: UIEventSource<boolean>;
public readonly featureSwitchIframePopoutEnabled: UIEventSource<boolean>; public readonly featureSwitchIframePopoutEnabled: UIEventSource<boolean>;
@ -72,7 +72,7 @@ export default class FeatureSwitchState {
(layoutToUse) => layoutToUse?.enableSearch ?? true, (layoutToUse) => layoutToUse?.enableSearch ?? true,
"Disables/Enables the search bar" "Disables/Enables the search bar"
); );
this.featureSwitchBackgroundSlection = featSw( this.featureSwitchBackgroundSelection = featSw(
"fs-background", "fs-background",
(layoutToUse) => layoutToUse?.enableBackgroundLayerSelection ?? true, (layoutToUse) => layoutToUse?.enableBackgroundLayerSelection ?? true,
"Disables/Enables the background layer control" "Disables/Enables the background layer control"

2
UI/BigComponents/FilterView.ts
View file

@ -20,7 +20,7 @@ export default class FilterView extends VariableUiElement {
const backgroundSelector = new Toggle( const backgroundSelector = new Toggle(
new BackgroundSelector(), new BackgroundSelector(),
undefined, undefined,
State.state.featureSwitchBackgroundSlection State.state.featureSwitchBackgroundSelection
) )
super( super(
filteredLayer.map((filteredLayers) => { filteredLayer.map((filteredLayers) => {

9
UI/BigComponents/LeftControls.ts
View file

@ -19,6 +19,7 @@ import BackgroundMapSwitch from "./BackgroundMapSwitch";
export default class LeftControls extends Combine { export default class LeftControls extends Combine {
constructor(state: { constructor(state: {
featureSwitchBackgroundSelection: UIEventSource<boolean>;
layoutToUse: LayoutConfig, layoutToUse: LayoutConfig,
featurePipeline: FeaturePipeline, featurePipeline: FeaturePipeline,
currentBounds: UIEventSource<BBox>, currentBounds: UIEventSource<BBox>,
@ -74,10 +75,16 @@ export default class LeftControls extends Combine {
undefined, undefined,
state.featureSwitchFilter state.featureSwitchFilter
); );
const mapSwitch = new Toggle(
new BackgroundMapSwitch(state, state.backgroundLayer),
undefined,
state.featureSwitchBackgroundSelection
)
super([filterButton, super([filterButton,
downloadButtonn, downloadButtonn,
new BackgroundMapSwitch(state, state.backgroundLayer) mapSwitch
]) ])
this.SetClass("flex flex-col") this.SetClass("flex flex-col")

2
UI/DefaultGuiState.ts
View file

@ -18,7 +18,7 @@ export class DefaultGuiState {
this.welcomeMessageOpenedTab = UIEventSource.asFloat(QueryParameters.GetQueryParameter( this.welcomeMessageOpenedTab = UIEventSource.asFloat(QueryParameters.GetQueryParameter(
"tab", "tab",
"0", "0",
`The tab that is shown in the welcome-message. 0 = the explanation of the theme,1 = OSM-credits, 2 = sharescreen, 3 = more themes, 4 = about mapcomplete (user must be logged in and have >${Constants.userJourney.mapCompleteHelpUnlock} changesets)` `The tab that is shown in the welcome-message.`
)); ));
this.welcomeMessageIsOpened = QueryParameters.GetBooleanQueryParameter( this.welcomeMessageIsOpened = QueryParameters.GetBooleanQueryParameter(
"welcome-control-toggle", "welcome-control-toggle",