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

Add the possibility to load layouts from the OSM-wiki. What could possibly go wrong?

Browse source
This commit is contained in:
Pieter Vander Vennet 2020-09-07 02:25:45 +02:00
parent 115dc0249c
commit d9cae0fc46
7 changed files with 297 additions and 222 deletions
Download patch file Download diff file Expand all files Collapse all files

2
UI/CustomGenerator/CustomGeneratorPanel.ts
View file

@ -86,7 +86,7 @@ export default class CustomGeneratorPanel extends UIElement {
},
{
header: "<img src='./assets/share.svg'>",
content: new SharePanel(es, liveUrl)
content: new SharePanel(es, liveUrl, userDetails)
}
])
}

1
UI/CustomGenerator/SavePanel.ts
View file

@ -7,7 +7,6 @@ import {OsmConnection} from "../../Logic/Osm/OsmConnection";
import {FixedUiElement} from "../Base/FixedUiElement";
import {TextField} from "../Input/TextField";
import {SubtleButton} from "../Base/SubtleButton";
import {FromJSON} from "../../Customizations/JSON/FromJSON";
export default class SavePanel extends UIElement {
private json: UIElement;

30
UI/CustomGenerator/SharePanel.ts
View file

@ -3,22 +3,50 @@ import {UIEventSource} from "../../Logic/UIEventSource";
import {LayoutConfigJson} from "../../Customizations/JSON/LayoutConfigJson";
import Combine from "../Base/Combine";
import {VariableUiElement} from "../Base/VariableUIElement";
import {UserDetails} from "../../Logic/Osm/OsmConnection";
export default class SharePanel extends UIElement {
private _config: UIEventSource<LayoutConfigJson>;
private _panel: UIElement;
constructor(config: UIEventSource<LayoutConfigJson>, liveUrl: UIEventSource<string>) {
constructor(config: UIEventSource<LayoutConfigJson>, liveUrl: UIEventSource<string>, userDetails: UserDetails) {
super(undefined);
this._config = config;
const proposedName = `User:${userDetails.name}/${config.data.id}`
const proposedNameEnc = encodeURIComponent(`wiki:User:${userDetails.name}/${config.data.id}`)
this._panel = new Combine([
"<h2>share</h2>",
"Share the following link with friends:<br/>",
new VariableUiElement(liveUrl.map(url => `<a href='${url}' target="_blank">${url}</a>`)),
"<h2>Publish on OSM Wiki</h2>",
"In the list of 'hacks upon hacks to make MapComplete work', it is now possible to put the JSON-file onto a Wikipage*.<br/>" +
"This is a <i>very stable</i> and <i>very well-tested</i> solution. Using wikipages as source control! What could possibly go wrong???? /s<br/><br/>",
"Why to publish the layout as a wikipage?",
"<ul>",
...["If something breaks, it can be fixed centrally",
"If someone has a remark about your preset, the talk page can be used to point this out and discuss the preset",
"In case of a grave error, everyone can step in to fix the prest"].map(li => `<li>${li}</li>`),
"</ul>",
"In order to make this work:",
"<ol>",
...[`Create a new page on the OSM-wiki, e.g. <a href='https://wiki.osm.org/wiki/${proposedName}' target="_blank">${proposedName}</a>`,
"Click 'create page'",
"Type <span class='literal-code'>&lt;nowiki&gt;</span>, a few newlines and <span class='literal-code'>&lt;/nowiki&gt;</span>",
"Copy the json configuration from the 'save-tab', paste it between the 'nowiki'-tags in the Wiki",
"Click 'save' to save the wiki page",
"Share the link with the url parameter <span class='literal-code'>userlayout=wiki:YOURWIKIPAGE</span>, e.g. " +
`<a href='./index.html?userlayout=${proposedNameEnc}' target='_blank'>https://pietervdvn.github.io/MapComplete/index.html?userlayout=${proposedNameEnc}</a>`
].map(li => `<li>${li}</li>`),
"</ol>",
"(* This has made a lot of people very angry and been widely regarded as a bad move.)",
"</div>"
]);
}

3
UI/CustomGenerator/TagRenderingPanel.ts
View file

@ -88,7 +88,8 @@ export default class TagRenderingPanel extends InputElement<TagRenderingConfigJs
"<h3>Mappings</h3>",
setting(new MultiInput<{ if: AndOrTagConfigJson, then: (string | any), hideInAnswer?: boolean }>("Add a mapping",
() => ({if: undefined, then: undefined}),
() => new MappingInput(languages, options?.disableQuestions ?? false)), "mappings",
() => new MappingInput(languages, options?.disableQuestions ?? false),
undefined, {allowMovement: true}), "mappings",
"If a tag matches, then show the first respective text", "")
];