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

4
assets/layers/icons/icons.json
View file

@ -430,10 +430,10 @@
}
},
{
"id": "favourite_icon",
"condition": "_favourite=yes",
"description": "Only for rendering",
"icon": "circle:white;heart:red",
"condition": "_favourite=yes",
"id": "favourite_icon",
"metacondition": "__showTimeSensitiveIcons!=no"
},
{

4
assets/layers/last_click/last_click.json
View file

@ -217,8 +217,8 @@
},
{
"id": "debug",
"render": "{all_tags()}",
"metacondition": "__featureSwitchIsDebugging=true"
"metacondition": "__featureSwitchIsDebugging=true",
"render": "{all_tags()}"
}
],
"filter": [

4
assets/layers/note/note.json
View file

@ -114,9 +114,9 @@
"lineRendering": [],
"tagRenderings": [
{
"classes": "p-0",
"id": "conversation",
"render": "{visualize_note_comments()}",
"classes": "p-0"
"render": "{visualize_note_comments()}"
},
{
"id": "add_image",

12
assets/layers/osm_community_index/osm_community_index.json
View file

@ -66,16 +66,16 @@
],
"tagRenderings": [
{
"id": "country_name",
"condition": "level=country",
"description": "The name of the country",
"render": "{nameEn} {emojiFlag}",
"condition": "level=country"
"id": "country_name",
"render": "{nameEn} {emojiFlag}"
},
{
"id": "community_links",
"condition": "_community_links~*",
"description": "Community Links (Discord, meetups, Slack groups, IRC channels, mailing lists etc...)",
"render": "{_community_links}",
"condition": "_community_links~*"
"id": "community_links",
"render": "{_community_links}"
}
],
"filter": [

2
langs/fr.json
View file

@ -888,4 +888,4 @@
"feedback": "Ceci n'est pas une adresse web valide"
}
}
}
}

1206
public/assets/SocialImageTemplate.svg
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 MiB

After

Width:  |  Height:  |  Size: 3.1 MiB

Before After
Before After

9
scripts/generateTaginfoProjectFiles.ts
View file

@ -6,6 +6,7 @@ import ThemeConfig from "../src/Models/ThemeConfig/ThemeConfig"
import LayerConfig from "../src/Models/ThemeConfig/LayerConfig"
import { Utils } from "../src/Utils"
import { Lists } from "../src/Utils/Lists"
import { Strings } from "../src/Utils/Strings"
/**
* Generates all the files in "Docs/TagInfo". These are picked up by the taginfo project, showing a link to the mapcomplete theme if the key is used
@ -107,8 +108,8 @@ function generateLayerUsage(layer: LayerConfig): TagInfoPrototype[] {
layerName,
shownText: descr,
layer,
icon: !Utils.isEmoji(tr.renderIcon) ? tr.renderIcon : undefined,
emoji: Utils.isEmoji(tr.renderIcon) ? tr.renderIcon : undefined,
icon: !Strings.isEmoji(tr.renderIcon) ? tr.renderIcon : undefined,
emoji: Strings.isEmoji(tr.renderIcon) ? tr.renderIcon : undefined,
trid: tr.id,
})
}
@ -123,8 +124,8 @@ function generateLayerUsage(layer: LayerConfig): TagInfoPrototype[] {
shownText: `${mapping.if.asHumanString()} is displayed as "${
mapping.then.txt
}"`,
icon: !Utils.isEmoji(mapping.icon) ? mapping.icon : undefined,
emoji: Utils.isEmoji(mapping.icon) ? mapping.icon : undefined,
icon: !Strings.isEmoji(mapping.icon) ? mapping.icon : undefined,
emoji: Strings.isEmoji(mapping.icon) ? mapping.icon : undefined,
trid: tr.id,
})
}

2
src/Logic/Osm/ChangesetHandler.ts
View file

@ -159,7 +159,7 @@ export class ChangesetHandler {
extraMetaTags = [...extraMetaTags, ...this.defaultChangesetTags()]
extraMetaTags = ChangesetHandler.removeDuplicateMetaTags(extraMetaTags)
if (this.userDetails.data.csCount == 0) {
if (this.userDetails.data?.csCount == 0) {
// The user became a contributor!
this.userDetails.data.csCount = 1
this.userDetails.ping()

3
src/Logic/Search/FilterSearch.ts
View file

@ -5,6 +5,7 @@ import LayerConfig from "../../Models/ThemeConfig/LayerConfig"
import LayerState from "../State/LayerState"
import ThemeConfig from "../../Models/ThemeConfig/ThemeConfig"
import { Lists } from "../../Utils/Lists"
import { Strings } from "../../Utils/Strings"
export type FilterSearchResult = {
option: FilterConfigOption
@ -30,7 +31,7 @@ export default class FilterSearch {
const queries = query
.split(" ")
.map((query) => {
if (!Utils.isEmoji(query)) {
if (!Strings.isEmoji(query)) {
return Utils.simplifyStringForSearch(query)
}
return query

5
src/Logic/State/GeoLocationState.ts
View file

@ -107,9 +107,10 @@ export class GeoLocationState {
this.requestPermission()
}
const hasLocation: Store<boolean> = this.currentGPSLocation.map(l => l !== undefined)
this.gpsStateExplanation = this.gpsAvailable.map(
(available) => {
if (this.currentGPSLocation.data !== undefined) {
if (hasLocation.data) {
if (!this.allowMoving.data) {
return Translations.t.general.visualFeedback.islocked
}
@ -131,7 +132,7 @@ export class GeoLocationState {
}
return Translations.t.general.waitingForLocation
},
[this.allowMoving, this.permission, this.currentGPSLocation]
[this.allowMoving, this.permission, hasLocation]
)
}

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
}

9
src/UI/BigComponents/CompassWidget.svelte
View file

@ -1,13 +1,11 @@
<script lang="ts">/**
* Show a compass. The compass outline rotates with the map, the compass needle points to the actual north
*/
import { UIEventSource } from "../../Logic/UIEventSource"
import { Store, UIEventSource } from "../../Logic/UIEventSource"
import { Orientation } from "../../Sensors/Orientation"
import Compass_back from "../../assets/svg/Compass_back.svelte"
import Compass_needle from "../../assets/svg/Compass_needle.svelte"
import North_arrow from "../../assets/svg/North_arrow.svelte"
import { Store } from "../../Logic/UIEventSource"
import { Translation } from "../i18n/Translation"
export let mapProperties: { rotation: UIEventSource<number>, allowRotating: Store<boolean> }
let orientation = Orientation.singleton.alpha
@ -24,11 +22,6 @@ function clicked(e: Event) {
}
} else {
mapProperties.rotation.set(0)
explanation.set(new Translation({ "*": "North is now up" }))
showPopover = true
Utils.waitFor(5000).then(() => {
showPopover = false
})
}
}

3
src/UI/InputElement/Validators/IconValidator.ts
View file

@ -2,6 +2,7 @@ import { Validator } from "../Validator"
import { Translation } from "../../i18n/Translation"
import licenses from "../../../assets/generated/license_info.json"
import { Utils } from "../../../Utils"
import { Strings } from "../../../Utils/Strings"
export default class IconValidator extends Validator {
private static allLicenses = new Set(licenses.map((l) => l.path))
@ -16,7 +17,7 @@ export default class IconValidator extends Validator {
}
getFeedback(s: string, getCountry, sloppy?: boolean): Translation | undefined {
if (Utils.isEmoji(s)) {
if (Strings.isEmoji(s)) {
return undefined
}
s = this.reformat(s)

3
src/UI/Map/Icon.svelte
View file

@ -46,6 +46,7 @@
import LockClosed from "@babeard/svelte-heroicons/solid/LockClosed"
import Key from "@babeard/svelte-heroicons/solid/Key"
import Snap from "../../assets/svg/Snap.svelte"
import { Strings } from "../../Utils/Strings"
/**
* Renders a single icon.
@ -163,7 +164,7 @@
<UserCircleIcon class={clss} {color} />
{:else if icon === "wifi"}
<WifiIcon class={"m-0 " + clss} {color} />
{:else if Utils.isEmoji(icon)}<span
{:else if Strings.isEmoji(icon)}<span
style={`font-size: ${emojiHeight}; line-height: ${emojiHeight}`}
>
{icon}

2
src/UI/Popup/DeleteFlow/DeleteFlowState.ts
View file

@ -58,7 +58,7 @@ export class DeleteFlowState {
return false
}
return (
ud.csCount >=
ud?.csCount >=
Math.min(
Constants.userJourney.deletePointsOfOthersUnlock,
this._allowDeletionAtChangesetCount

11
src/Utils.ts
View file

@ -1784,17 +1784,6 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be
return href
}
/**
* Returns 'true' if the given string contains at least one and only emoji characters
*
* Utils.isEmoji("⛰\uFE0F") // => true
* Utils.isEmoji("🇧🇪") // => true
* Utils.isEmoji("🍕") // => true
*/
public static isEmoji(string: string) {
return Strings.isEmoji(string)
}
public static sum(list: number[]): number {
let total = 0