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

Fix: fix possible failing upload (error report postmortem)

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-12-13 13:47:47 +01:00
parent db058f4025
commit 22c348af27
3 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/UI/Image/UploadImage.svelte
View file

@ -13,10 +13,10 @@
import FileSelector from "../Base/FileSelector.svelte"
import LoginButton from "../Base/LoginButton.svelte"
import { Translation } from "../i18n/Translation"
import Camera from "@babeard/svelte-heroicons/solid/Camera"
import LayerConfig from "../../Models/ThemeConfig/LayerConfig"
import NoteCommentElement from "../Popup/Notes/NoteCommentElement"
import type { Feature } from "geojson"
import Camera from "@babeard/svelte-heroicons/mini/Camera"
export let state: SpecialVisualizationState
@ -24,7 +24,7 @@
export let targetKey: string = undefined
export let layer: LayerConfig
export let noBlur: boolean = false
export let feature: Feature = undefined
export let feature: Feature
/**
* Image to show in the button
* NOT the image to upload!
@ -65,13 +65,13 @@
}
const url = uploadResult.absoluteUrl
await state.osmConnection.addCommentToNote(tags.data.id, url)
NoteCommentElement.addCommentTo(url, <UIEventSource<any>>tags, {
NoteCommentElement.addCommentTo(url, <UIEventSource<OsmTags>>tags, {
osmConnection: state.osmConnection,
})
return
}
await state?.imageUploadManager?.uploadImageAndApply(file, tags, targetKey, noBlur)
await state?.imageUploadManager?.uploadImageAndApply(file, tags, targetKey, noBlur, feature)
} catch (e) {
console.error(e)
state.reportError(e, "Could not upload image")
@ -133,9 +133,9 @@
cls="flex justify-center md:hidden button"
multiple={true}
on:submit={(e) => {
return handleFiles(e.detail, true)
e.preventDefault()
e.stopPropagation()
return handleFiles(e.detail, true)
}}
>
<Tr t={t.selectFile} />

4
src/UI/SpecialVisualizations.ts
View file

@ -750,7 +750,7 @@ export default class SpecialVisualizations {
feature,
labelText: args[1],
image: args[2],
noBlur: noBlur === "true" || noBlur === "yes",
noBlur: noBlur === "true" || noBlur === "yes"
})
},
},
@ -1090,7 +1090,7 @@ export default class SpecialVisualizations {
tags
.map((tags) => tags[args[0]])
.map((commentsStr) => {
const comments: any[] = JSON.parse(commentsStr)
const comments: { text: string }[] = JSON.parse(commentsStr)
const startLoc = Number(args[1] ?? 0)
if (!isNaN(startLoc) && startLoc > 0) {
comments.splice(0, startLoc)