Bastian-Greshake-Tzovaras/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Fix: note themes uses full URL now instead of Panoramax-id

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-09-28 02:44:03 +02:00
parent 4395e88390
commit ce363dfb59
4 changed files with 41 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,11 +14,14 @@
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"
export let state: SpecialVisualizationState
export let tags: UIEventSource<OsmTags>
export let targetKey: string = undefined
export let layer: LayerConfig
/**
* Image to show in the button
* NOT the image to upload!
@ -30,11 +33,9 @@
export let labelText: string = undefined
const t = Translations.t.image
let licenseStore = state?.userRelatedState?.imageLicense ?? new ImmutableStore("CC0")
let errors = new UIEventSource<Translation[]>([])
function handleFiles(files: FileList) {
async function handleFiles(files: FileList) {
const errs = []
for (let i = 0; i < files.length; i++) {
const file = files.item(i)
@ -45,7 +46,21 @@
errs.push(canBeUploaded.error)
continue
}
state?.imageUploadManager.uploadImageAndApply(file, tags, targetKey)
if(layer.id === "note"){
const uploadResult = await state?.imageUploadManager.uploadImageWithLicense(file, tags, targetKey)
if(!uploadResult){
return
}
const url = uploadResult.absoluteUrl
await this._osmConnection.addCommentToNote(tags.data.id, url)
NoteCommentElement.addCommentTo(url, <UIEventSource<any>>tags, {
osmConnection: this._osmConnection,
})
return
}
await state?.imageUploadManager.uploadImageAndApply(file, tags, targetKey)
} catch (e) {
alert(e)
}

5
src/UI/SpecialVisualizations.ts
View file

@ -1100,11 +1100,10 @@ export default class SpecialVisualizations {
],
needsUrls: [Imgur.apiUrl, ...Imgur.supportingUrls],
constr: (state, tags, args) => {
constr: (state, tags, args, feature, layer) => {
const id = tags.data[args[0] ?? "id"]
tags = state.featureProperties.getStore(id)
console.log("Id is", id)
return new SvelteUIElement(UploadImage, { state, tags })
return new SvelteUIElement(UploadImage, { state, tags, layer })
},
},
{