contrapunctus/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Merge master

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-12-19 23:02:02 +01:00
commit f51b51c491
340 changed files with 15515 additions and 11114 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/Models/ThemeConfig/Conversion/FixImages.ts
View file

@ -147,11 +147,14 @@ export class ExtractImages extends Conversion<
.warn("Found an emtpy image")
} else if (typeof img.leaf !== "string") {
const c = context.enter(img.path)
const w = this._isOfficial ? c.err : c.warn
w(
const msg =
"found an image path that is not a string: " +
JSON.stringify(img.leaf)
)
JSON.stringify(img.leaf)
if (this._isOfficial) {
c.err(msg)
} else {
c.warn(msg)
}
} else {
allFoundImages.push({
path: img.leaf,

4
src/Models/ThemeConfig/Conversion/Validation.ts
View file

@ -1454,10 +1454,10 @@ export class ValidateLayer extends Conversion<
for (let i = 0; i < layerConfig.titleIcons.length; i++) {
const titleIcon = layerConfig.titleIcons[i]
if (<any> titleIcon.render === "icons.defaults") {
if (<any>titleIcon.render === "icons.defaults") {
context.enters("titleIcons", i).err("Detected a literal 'icons.defaults'")
}
if (<any> titleIcon.render === "icons.rating") {
if (<any>titleIcon.render === "icons.rating") {
context.enters("titleIcons", i).err("Detected a literal 'icons.rating'")
}
}

12
src/Models/ThemeViewState.ts
View file

@ -61,7 +61,6 @@ import NearbyFeatureSource from "../Logic/FeatureSource/Sources/NearbyFeatureSou
import FavouritesFeatureSource from "../Logic/FeatureSource/Sources/FavouritesFeatureSource"
import { ProvidedImage } from "../Logic/ImageProviders/ImageProvider"
import { GeolocationControlState } from "../UI/BigComponents/GeolocationControl"
import { Orientation } from "../Sensors/Orientation"
/**
*
@ -552,6 +551,17 @@ export default class ThemeViewState implements SpecialVisualizationState {
nomod: "b",
},
Translations.t.hotkeyDocumentation.openLayersPanel,
() => {
if (this.featureSwitches.featureSwitchBackgroundSelection.data) {
this.guistate.backgroundLayerSelectionIsOpened.setData(true)
}
}
)
Hotkeys.RegisterHotkey(
{
nomod: "s",
},
Translations.t.hotkeyDocumentation.openFilterPanel,
() => {
if (this.featureSwitches.featureSwitchFilter.data) {
this.guistate.openFilterView()