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

Some finetuning of GPX trace uploading

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-08-05 19:47:24 +02:00
parent 312db3ad50
commit 06b5df833f
4 changed files with 43 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

36
UI/BigComponents/UploadTraceToOsmUI.ts
View file

@ -17,7 +17,7 @@ export default class UploadTraceToOsmUI extends Toggle {
constructor(
trace: () => string,
trace: (title: string) => string,
state: {
layoutToUse: LayoutConfig;
osmConnection: OsmConnection
@ -25,7 +25,7 @@ export default class UploadTraceToOsmUI extends Toggle {
whenUploaded?: () => void | Promise<void>
}) {
const t = Translations.t.general.uploadGpx
const uploadFinished = new UIEventSource(false)
const traceVisibilities: {
key: "private" | "public",
name: Translation,
@ -33,11 +33,11 @@ export default class UploadTraceToOsmUI extends Toggle {
}[] = [
{
key: "private",
...Translations.t.general.uploadGpx.modes.private
...t.modes.private
},
{
key: "public",
...Translations.t.general.uploadGpx.modes.public
...t.modes.public
}
]
@ -52,7 +52,10 @@ export default class UploadTraceToOsmUI extends Toggle {
}
)
const description = new TextField({
placeholder: t.placeHolder
placeholder: t.meta.descriptionPlaceHolder
})
const title = new TextField({
placeholder: t.meta.titlePlaceholder
})
const clicked = new UIEventSource<boolean>(false)
@ -63,15 +66,17 @@ export default class UploadTraceToOsmUI extends Toggle {
t.choosePermission,
dropdown,
new Title(t.description.title, 4),
t.description.intro,
new Title(t.meta.title, 4),
t.meta.intro,
title,
t.meta.descriptionIntro,
description,
new Combine([
new SubtleButton(Svg.close_svg(), Translations.t.general.cancel).onClick(() => {
clicked.setData(false)
}).SetClass(""),
new SubtleButton(Svg.upload_svg(), t.confirm).OnClickWithLoading(t.uploading, async () => {
await state?.osmConnection?.uploadGpxTrack(trace(), {
await state?.osmConnection?.uploadGpxTrack(trace(title.GetValue().data), {
visibility: dropdown.GetValue().data,
description: description.GetValue().data,
labels: ["MapComplete", state?.layoutToUse?.id]
@ -80,17 +85,20 @@ export default class UploadTraceToOsmUI extends Toggle {
if (options?.whenUploaded !== undefined) {
await options.whenUploaded()
}
uploadFinished.setData(true)
}).SetClass("")
})
]).SetClass("flex flex-wrap flex-wrap-reverse justify-between items-stretch")
]).SetClass("flex flex-col p-4 rounded border-2 m-2 border-subtle")
super(
confirmPanel,
new SubtleButton(Svg.upload_svg(), t.title)
.onClick(() => clicked.setData(true)),
clicked
)
new Combine([Svg.confirm_svg(),t.uploadFinished]).SetClass("flex"),
new Toggle(
confirmPanel,
new SubtleButton(Svg.upload_svg(), t.title)
.onClick(() => clicked.setData(true)),
clicked
), uploadFinished)
}
}

21
UI/SpecialVisualizations.ts
View file

@ -881,26 +881,31 @@ export default class SpecialVisualizations {
{
funcName: "upload_to_osm",
docs: "Uploads the GPS-history as GPX to OpenStreetMap.org; clears the history afterwards. The actual feature is ignored.",
args:[],
args: [],
constr(state, featureTags, args) {
function getTrace() {
const userLocations : Feature<Point, GeoLocationPointProperties>[] = state.historicalUserLocations.features.data.map(f => f.feature)
function getTrace(title: string) {
title = title?.trim()
if (title === undefined || title === "") {
title = "Uploaded with MapComplete"
}
title = Utils.EncodeXmlValue(title)
const userLocations: Feature<Point, GeoLocationPointProperties>[] = state.historicalUserLocations.features.data.map(f => f.feature)
const trackPoints: string[] = []
for (const l of userLocations) {
let trkpt = ` <trkpt lat="${l.geometry.coordinates[1]}" lon="${l.geometry.coordinates[0]}">`
trkpt += ` <time>${l.properties.date}</time>`
if(l.properties.altitude !== null && l.properties.altitude !== undefined ){
if (l.properties.altitude !== null && l.properties.altitude !== undefined) {
trkpt += ` <ele>${l.properties.altitude}</ele>`
}
trkpt += " </trkpt>"
trackPoints.push(trkpt)
}
const header = '<gpx version="1.1" creator="MapComplete track uploader" xmlns="http://www.topografix.com/GPX/1/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd">'
return header+"\n<trk><trkseg>\n"+trackPoints.join("\n")+"\n</trkseg></trk></gpx>"
return header + "\n<name>" + title + "</name>\n<trk><trkseg>\n" + trackPoints.join("\n") + "\n</trkseg></trk></gpx>"
}
return new UploadTraceToOsmUI(getTrace, state,{
return new UploadTraceToOsmUI(getTrace, state, {
whenUploaded: async () => {
state.historicalUserLocations.features.setData([])
}