diff --git a/src/UI/Popup/NoteCommentElement.ts b/src/UI/Popup/Notes/NoteCommentElement.ts
similarity index 64%
rename from src/UI/Popup/NoteCommentElement.ts
rename to src/UI/Popup/Notes/NoteCommentElement.ts
index 4d4e59c7e..5abaa52f9 100644
--- a/src/UI/Popup/NoteCommentElement.ts
+++ b/src/UI/Popup/Notes/NoteCommentElement.ts
@@ -1,26 +1,33 @@
-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"
-import { Utils } from "../../Utils"
-import Img from "../Base/Img"
-import { SlideShow } from "../Image/SlideShow"
-import { Stores, UIEventSource } from "../../Logic/UIEventSource"
-import { OsmConnection } from "../../Logic/Osm/OsmConnection"
-import { VariableUiElement } from "../Base/VariableUIElement"
+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"
+import { Utils } from "../../../Utils"
+import Img from "../../Base/Img"
+import { SlideShow } from "../../Image/SlideShow"
+import { Stores, UIEventSource } from "../../../Logic/UIEventSource"
+import { OsmConnection } from "../../../Logic/Osm/OsmConnection"
+import { VariableUiElement } from "../../Base/VariableUIElement"
+import { SpecialVisualizationState } from "../../SpecialVisualization"
export default class NoteCommentElement extends Combine {
- constructor(comment: {
- date: string
- uid: number
- user: string
- user_url: string
- action: "closed" | "opened" | "reopened" | "commented"
- text: string
- html: string
- }) {
+ constructor(
+ comment: {
+ date: string
+ uid: number
+ user: string
+ user_url: string
+ action: "closed" | "opened" | "reopened" | "commented"
+ text: string
+ html: string
+ highlighted: boolean
+ },
+ state?: SpecialVisualizationState,
+ index?: number,
+ totalNumberOfComments?: number
+ ) {
const t = Translations.t.notes
let actionIcon: BaseUIElement
@@ -68,7 +75,15 @@ export default class NoteCommentElement extends Combine {
let imagesEl: BaseUIElement = undefined
if (images.length > 0) {
const imageEls = images.map((i) =>
- new Img(i).SetClass("w-full block").SetStyle("min-width: 50px; background: grey;")
+ new Img(i)
+ .SetClass("w-full block cursor-pointer")
+ .onClick(() =>
+ state?.previewedImage?.setData(
{
+ url_hd: i,
+ url: i,
+ })
+ )
+ .SetStyle("min-width: 50px; background: grey;")
)
imagesEl = new SlideShow(new UIEventSource(imageEls)).SetClass("mb-1")
}
@@ -84,6 +99,16 @@ export default class NoteCommentElement extends Combine {
),
])
this.SetClass("flex flex-col pb-2 mb-2 border-gray-500 border-b")
+ if (comment.highlighted) {
+ this.SetClass("glowing-shadow")
+ console.log(">>>", index, totalNumberOfComments)
+ if (index + 2 === totalNumberOfComments) {
+ console.log("Scrolling into view")
+ requestAnimationFrame(() => {
+ this.ScrollIntoView()
+ })
+ }
+ }
}
public static addCommentTo(
@@ -107,6 +132,7 @@ export default class NoteCommentElement extends Combine {
action: "commented",
text: txt,
html: html,
+ highlighted: true,
})
tags.data["comments"] = JSON.stringify(comments)
tags.ping()
diff --git a/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte b/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte
index 34d1ea19b..7a910f08f 100644
--- a/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte
+++ b/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte
@@ -105,7 +105,9 @@
}
// TODO this has _to much_ values
freeformInput.setData(unseenFreeformValues.join(";"))
- checkedMappings.push(unseenFreeformValues.length > 0)
+ if(checkedMappings.length + 1 < mappings.length ){
+ checkedMappings.push(unseenFreeformValues.length > 0)
+ }
}
}
if (confg.freeform?.key) {
@@ -125,13 +127,31 @@
initialize($tags, config)
}
+ freeformInput.addCallbackAndRun(freeformValue => {
+ console.log("FreeformValue:", freeformValue)
+ if (!mappings || mappings?.length == 0 || config.freeform?.key === undefined) {
+ return
+ }
+ // If a freeform value is given, mark the 'mapping' as marked
+ if (config.multiAnswer) {
+ if (checkedMappings === undefined) {
+ // Initialization didn't yet run
+ return
+ }
+ checkedMappings[mappings.length] = freeformValue?.length > 0
+ return
+ }
+ if (freeformValue?.length > 0) {
+ selectedMapping = mappings.length
+ }
+ })
$: {
try {
selectedTags = config?.constructChangeSpecification(
$freeformInput,
selectedMapping,
checkedMappings,
- tags.data
+ tags.data,
)
} catch (e) {
console.error("Could not calculate changeSpecification:", e)
@@ -182,19 +202,6 @@
}
}
- $: {
- try {
- selectedTags = config?.constructChangeSpecification(
- $freeformInput,
- selectedMapping,
- checkedMappings,
- tags.data
- )
- } catch (e) {
- console.error("Could not calculate changeSpecification:", e)
- selectedTags = undefined
- }
- }
let featureSwitchIsTesting = state?.featureSwitchIsTesting ?? new ImmutableStore(false)
let featureSwitchIsDebugging =
@@ -207,148 +214,151 @@
onDestroy(
state.osmConnection?.userDetails?.addCallbackAndRun((ud) => {
numberOfCs = ud.csCount
- })
+ }),
)
}
{#if question !== undefined}
- onSave()}
>
-
- {#if config.questionhint}
-
+ {/if}
+
+ {#if config.mappings?.length >= 8}
+
+
+
+
+ {/if}
+
+ {#if config.freeform?.key && !(mappings?.length > 0)}
+
+
-
-
-
-
- {/if}
-
- {#if config.freeform?.key && !(mappings?.length > 0)}
-
-
- {:else if mappings !== undefined && !config.multiAnswer}
-
-
+ {/if}
+
@@ -391,5 +401,5 @@
{/if}
-
+
{/if}
diff --git a/src/UI/Reviews/ReviewForm.svelte b/src/UI/Reviews/ReviewForm.svelte
index aa43f7fc1..a020267a1 100644
--- a/src/UI/Reviews/ReviewForm.svelte
+++ b/src/UI/Reviews/ReviewForm.svelte
@@ -85,9 +85,12 @@
/>
{#if confirmedScore !== undefined}
+
