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

Merge develop

Browse source
This commit is contained in:
Pieter Vander Vennet 2025-08-01 19:03:52 +02:00
commit 55ebaaa256
17 changed files with 640 additions and 645 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Models/ThemeConfig/Conversion/ExpandFilter.ts
View file

@ -15,6 +15,7 @@ import { FlatTag, OptimizedTag, TagsFilterClosed } from "../../../Logic/Tags/Tag
import { TagsFilter } from "../../../Logic/Tags/TagsFilter"
import { Translation } from "../../../UI/i18n/Translation"
import { Lists } from "../../../Utils/Lists"
import { Strings } from "../../../Utils/Strings"
export class PruneFilters extends DesugaringStep<LayerConfigJson> {
constructor() {
@ -158,7 +159,7 @@ export class ExpandFilter extends DesugaringStep<LayerConfigJson> {
const options = qtr.mappings.map((mapping) => {
let icon: string = mapping.icon?.["path"] ?? mapping.icon
let emoji: string = undefined
if (Utils.isEmoji(icon)) {
if (Strings.isEmoji(icon)) {
emoji = icon
icon = undefined
}

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

@ -23,6 +23,7 @@ import { PrevalidateLayer } from "./PrevalidateLayer"
import { AvailableRasterLayers } from "../../RasterLayers"
import { eliCategory } from "../../RasterLayerProperties"
import licenses from "../../../assets/generated/license_info.json"
import { Strings } from "../../../Utils/Strings"
export class ValidateLanguageCompleteness extends DesugaringStep<ThemeConfig> {
private readonly _languages: string[]
@ -105,7 +106,7 @@ export class DoesImageExist extends DesugaringStep<string> {
return image
}
if (Utils.isEmoji(image)) {
if (Strings.isEmoji(image)) {
return image
}