diff --git a/src/UI/Base/SubtleButton.ts b/src/UI/Base/SubtleButton.ts
index 02db03ab26..9934e80d1e 100644
--- a/src/UI/Base/SubtleButton.ts
+++ b/src/UI/Base/SubtleButton.ts
@@ -1,9 +1,6 @@
import BaseUIElement from "../BaseUIElement"
import { Store, UIEventSource } from "../../Logic/UIEventSource"
import { UIElement } from "../UIElement"
-import { VariableUiElement } from "./VariableUIElement"
-import Lazy from "./Lazy"
-import Loading from "./Loading"
import SvelteUIElement from "./SvelteUIElement"
import SubtleLink from "./SubtleLink.svelte"
import Translations from "../i18n/Translations"
diff --git a/src/UI/Image/LinkableImage.svelte b/src/UI/Image/LinkableImage.svelte
index 8675cc8a44..ea692b0832 100644
--- a/src/UI/Image/LinkableImage.svelte
+++ b/src/UI/Image/LinkableImage.svelte
@@ -21,8 +21,8 @@
export let layer: LayerConfig
export let linkable = true
- let isLinked = Object.values(tags.data).some((v) => image.pictureUrl === v)
-
+ let targetValue = Object.values(image.osmTags)[0]
+ let isLinked = new UIEventSource(Object.values(tags.data).some((v) => targetValue === v))
const t = Translations.t.image.nearby
const providedImage: ProvidedImage = {
url: image.thumbUrl ?? image.pictureUrl,
@@ -33,10 +33,11 @@
id: Object.values(image.osmTags)[0],
}
- $: {
+ function applyLink(isLinked :boolean) {
+ console.log("Applying linked image", isLinked, targetValue)
const currentTags = tags.data
const key = Object.keys(image.osmTags)[0]
- const url = image.osmTags[key]
+ const url = targetValue
if (isLinked) {
const action = new LinkImageAction(currentTags.id, key, url, tags, {
theme: tags.data._orig_theme ?? state.layout.id,
@@ -56,6 +57,7 @@
}
}
}
+ isLinked.addCallback(isLinked => applyLink(isLinked))
@@ -68,7 +70,7 @@
{#if linkable}
{/if}
diff --git a/src/UI/InputElement/Validators/PhoneValidator.ts b/src/UI/InputElement/Validators/PhoneValidator.ts
index f8a76ff221..6ef6a50270 100644
--- a/src/UI/InputElement/Validators/PhoneValidator.ts
+++ b/src/UI/InputElement/Validators/PhoneValidator.ts
@@ -35,6 +35,10 @@ export default class PhoneValidator extends Validator {
if (country !== undefined) {
countryCode = country()?.toUpperCase()
}
+ if (this.isShortCode(str, countryCode)) {
+ return true
+ }
+
return parsePhoneNumberFromString(str, countryCode)?.isValid() ?? false
}
@@ -46,9 +50,28 @@ export default class PhoneValidator extends Validator {
if (country) {
countryCode = country()
}
+ if (this.isShortCode(str, countryCode?.toUpperCase())) {
+ return str
+ }
return parsePhoneNumberFromString(
str,
countryCode?.toUpperCase() as any
)?.formatInternational()
}
+
+ /**
+ * Indicates if the given string is a special 'short code' valid in the given country
+ * see https://nl.wikipedia.org/wiki/Short_code
+ * @param str a possible phone number
+ * @param country the upper case, two-letter code for a country
+ * @private
+ */
+ private isShortCode(str: string, country: string) {
+ if (country == "BE" && str.length === 4 && str.match(/[0-9]{4}/)) {
+ return true
+ }
+ if (country == "NL" && str.length === 4 && str.match(/14[0-9]{3}/)) {
+ return true
+ }
+ }
}
diff --git a/src/UI/Popup/MoveWizardState.ts b/src/UI/Popup/MoveWizardState.ts
index 7096386606..a4faa60853 100644
--- a/src/UI/Popup/MoveWizardState.ts
+++ b/src/UI/Popup/MoveWizardState.ts
@@ -12,6 +12,7 @@ import { Feature, Point } from "geojson"
import SvelteUIElement from "../Base/SvelteUIElement"
import Confirm from "../../assets/svg/Confirm.svelte"
import Relocation from "../../assets/svg/Relocation.svelte"
+import Location from "../../assets/svg/Location.svelte"
export interface MoveReason {
text: Translation | string
@@ -62,7 +63,7 @@ export class MoveWizardState {
reasons.push({
text: t.reasons.reasonInaccurate,
invitingText: t.inviteToMove.reasonInaccurate,
- icon: new SvelteUIElement(Confirm),
+ icon: new SvelteUIElement(Location),
changesetCommentValue: "improve_accuracy",
lockBounds: true,
includeSearch: false,
diff --git a/src/UI/Popup/Notes/NoteCommentElement.ts b/src/UI/Popup/Notes/NoteCommentElement.ts
index 5abaa52f9d..4dc3c8990e 100644
--- a/src/UI/Popup/Notes/NoteCommentElement.ts
+++ b/src/UI/Popup/Notes/NoteCommentElement.ts
@@ -1,6 +1,5 @@
import Combine from "../../Base/Combine"
import BaseUIElement from "../../BaseUIElement"
-import Svg from "../../../Svg"
import Link from "../../Base/Link"
import { FixedUiElement } from "../../Base/FixedUiElement"
import Translations from "../../i18n/Translations"
@@ -11,6 +10,10 @@ import { Stores, UIEventSource } from "../../../Logic/UIEventSource"
import { OsmConnection } from "../../../Logic/Osm/OsmConnection"
import { VariableUiElement } from "../../Base/VariableUIElement"
import { SpecialVisualizationState } from "../../SpecialVisualization"
+import SvelteUIElement from "../../Base/SvelteUIElement"
+import Note from "../../../assets/svg/Note.svelte"
+import Resolved from "../../../assets/svg/Resolved.svelte"
+import Speech_bubble from "../../../assets/svg/Speech_bubble.svelte"
export default class NoteCommentElement extends Combine {
constructor(
@@ -32,11 +35,11 @@ export default class NoteCommentElement extends Combine {
let actionIcon: BaseUIElement
if (comment.action === "opened" || comment.action === "reopened") {
- actionIcon = Svg.note_svg()
+ actionIcon = new SvelteUIElement(Note)
} else if (comment.action === "closed") {
- actionIcon = Svg.resolved_svg()
+ actionIcon = new SvelteUIElement(Resolved)
} else {
- actionIcon = Svg.speech_bubble_svg()
+ actionIcon = new SvelteUIElement(Speech_bubble)
}
let user: BaseUIElement
diff --git a/src/UI/Popup/TagRendering/TagRenderingAnswer.svelte b/src/UI/Popup/TagRendering/TagRenderingAnswer.svelte
index 12a53e0bdf..4a5f64cf54 100644
--- a/src/UI/Popup/TagRendering/TagRenderingAnswer.svelte
+++ b/src/UI/Popup/TagRendering/TagRenderingAnswer.svelte
@@ -6,7 +6,6 @@
import type { SpecialVisualizationState } from "../../SpecialVisualization"
import type { Feature } from "geojson"
import { Store, UIEventSource } from "../../../Logic/UIEventSource"
- import { onDestroy } from "svelte"
import LayerConfig from "../../../Models/ThemeConfig/LayerConfig"
import { twMerge } from "tailwind-merge"
@@ -24,7 +23,7 @@
throw "Config is undefined in tagRenderingAnswer"
}
let trs: Store<{ then: Translation; icon?: string; iconClass?: string }[]> = tags.mapD((tags) =>
- Utils.NoNull(config?.GetRenderValues(tags))
+ Utils.NoNull(config?.GetRenderValues(tags)),
)
diff --git a/src/UI/Zoomcontrol.ts b/src/UI/Zoomcontrol.ts
index 5d3687ecdb..898cd7d35e 100644
--- a/src/UI/Zoomcontrol.ts
+++ b/src/UI/Zoomcontrol.ts
@@ -29,9 +29,6 @@ export default class Zoomcontrol {
this._allowZooming.addCallback((allowed) => {
this.apply(allowed ? Zoomcontrol.initialValue : Zoomcontrol.noZoom)
})
- Stores.Chronic(1000).addCallback((_) =>
- console.log(this.viewportElement.getAttribute("content"))
- )
}
private _resetZoom() {
diff --git a/src/index.ts b/src/index.ts
index 2a5b2600c6..3d2e6cd3af 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -5,11 +5,12 @@ import ThemeViewGUI from "./UI/ThemeViewGUI.svelte"
import { FixedUiElement } from "./UI/Base/FixedUiElement"
import Combine from "./UI/Base/Combine"
import { SubtleButton } from "./UI/Base/SubtleButton"
-import Svg from "./Svg"
import { Utils } from "./Utils"
+import Download from "./assets/svg/Download.svelte"
+
function webgl_support() {
try {
- var canvas = document.createElement("canvas")
+ const canvas = document.createElement("canvas")
return (
!!window.WebGLRenderingContext &&
(canvas.getContext("webgl") || canvas.getContext("experimental-webgl"))
@@ -18,6 +19,7 @@ function webgl_support() {
return false
}
}
+
// @ts-ignore
try {
if (!webgl_support()) {
@@ -31,16 +33,22 @@ try {
})
.catch((err) => {
console.error("Error while initializing: ", err, err.stack)
+ const customDefinition = DetermineLayout.getCustomDefinition()
new Combine([
new FixedUiElement(err).SetClass("block alert"),
- new SubtleButton(Svg.download_svg(), "Download the raw file").onClick(() =>
- Utils.offerContentsAsDownloadableFile(
- DetermineLayout.getCustomDefinition(),
- "mapcomplete-theme.json",
- { mimetype: "application/json" }
- )
- ),
+ customDefinition?.length > 0
+ ? new SubtleButton(
+ new SvelteUIElement(Download),
+ "Download the raw file"
+ ).onClick(() =>
+ Utils.offerContentsAsDownloadableFile(
+ DetermineLayout.getCustomDefinition(),
+ "mapcomplete-theme.json",
+ { mimetype: "application/json" }
+ )
+ )
+ : undefined,
]).AttachTo("maindiv")
})
} catch (err) {
"
- : Svg.statistics_svg().SetClass("w-4 h-4 mr-2"),
+ : new SvelteUIElement(Statistics, {class: "w-4 h-4 mr-2"}),
"https://taginfo.openstreetmap.org/keys/" + values.key + "#values",
true
),
diff --git a/src/Models/ThemeConfig/TagRenderingConfig.ts b/src/Models/ThemeConfig/TagRenderingConfig.ts
index 0f70b80b0a..9013ff6395 100644
--- a/src/Models/ThemeConfig/TagRenderingConfig.ts
+++ b/src/Models/ThemeConfig/TagRenderingConfig.ts
@@ -496,7 +496,8 @@ export default class TagRenderingConfig {
for (const leftover of leftovers) {
applicableMappings.push({
then: new TypedTranslation