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

Small tweaks

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-07-28 15:14:13 +02:00
parent 1d2d098167
commit 0ab0d159cc
6 changed files with 52 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

28
UI/ExportPDF.ts
View file

@ -29,6 +29,7 @@ export default class ExportPDF {
private readonly scaling = 2
private readonly freeDivId: string;
private readonly _layout: UIEventSource<LayoutConfig>;
private _screenhotTaken = false;
constructor(
options: {
@ -48,21 +49,24 @@ export default class ExportPDF {
const l = options.location.data;
const loc = {
lat : l.lat,
lat: l.lat,
lon: l.lon,
zoom: l.zoom + 1
}
const minimap = new Minimap({
location: new UIEventSource<Loc>(loc), // We remove the link between the old and the new UI-event source as moving the map while the export is running fucks up the screenshot
background: options.background,
allowMoving: false,
onFullyLoaded: leaflet => window.setTimeout(() => {
try{
self.CreatePdf(leaflet)
.then(() => self.cleanup())
.catch(() => self.cleanup())
}catch(e){
if (self._screenhotTaken) {
return;
}
try {
self.CreatePdf(leaflet)
.then(() => self.cleanup())
.catch(() => self.cleanup())
} catch (e) {
console.error(e)
self.cleanup()
}
@ -94,9 +98,10 @@ export default class ExportPDF {
)
}
private cleanup(){
private cleanup() {
new FixedUiElement("Screenshot taken!").AttachTo(this.freeDivId)
this._screenhotTaken = true;
}
private async CreatePdf(leaflet: L.Map) {
@ -122,7 +127,8 @@ export default class ExportPDF {
doc.roundedRect(12, 5, 125, 30, 5, 5, 'FD')
doc.setFontSize(20)
doc.text(layout.title.txt, 40, 20, { maxWidth: 100
doc.text(layout.title.txt, 40, 20, {
maxWidth: 100
})
doc.setFontSize(10)
doc.text(t.attr.txt, 40, 25, {
@ -141,6 +147,6 @@ export default class ExportPDF {
doc.save("MapComplete_export.pdf");
}
}

22
UI/Popup/FeatureInfoBox.ts
View file

@ -63,13 +63,15 @@ export default class FeatureInfoBox extends ScrollableFullScreen {
}
return new EditableTagRendering(tags, tr, layerConfig.units);
});
let editElements : BaseUIElement[] = []
if (!questionBoxIsUsed) {
renderings.push(questionBox);
editElements.push(questionBox);
}
if (layerConfig.deletion) {
renderings.push(
editElements.push(
new VariableUiElement(tags.map(tags => tags.id).map(id =>
new DeleteWizard(
id,
@ -79,7 +81,7 @@ export default class FeatureInfoBox extends ScrollableFullScreen {
}
if (layerConfig.allowSplit) {
renderings.push(
editElements.push(
new VariableUiElement(tags.map(tags => tags.id).map(id =>
new SplitRoadWizard(id))
))
@ -91,7 +93,7 @@ export default class FeatureInfoBox extends ScrollableFullScreen {
renderings.push(new TagRenderingAnswer(tags, SharedTagRenderings.SharedTagRendering.get("minimap")))
}
renderings.push(
editElements.push(
new VariableUiElement(
State.state.osmConnection.userDetails
.map(ud => ud.csCount)
@ -109,7 +111,7 @@ export default class FeatureInfoBox extends ScrollableFullScreen {
)
renderings.push(
editElements.push(
new VariableUiElement(
State.state.featureSwitchIsDebugging.map(isDebugging => {
if (isDebugging) {
@ -119,6 +121,16 @@ export default class FeatureInfoBox extends ScrollableFullScreen {
})
)
)
const editors = new VariableUiElement(State.state.featureSwitchUserbadge.map(
userbadge => {
if(!userbadge){
return undefined
}
return new Combine(editElements)
}
))
renderings.push(editors)
return new Combine(renderings).SetClass("block")