Merge branch 'fix/badge-and-upload' into feature/climbing-layer

This commit is contained in:
Christian Neumann 2020-11-18 12:54:36 +01:00
commit 8f92d30189
2 changed files with 3 additions and 2 deletions

View file

@ -1,3 +1,4 @@
import escapeHtml from "escape-html";
import {OsmConnection, UserDetails} from "./OsmConnection"; import {OsmConnection, UserDetails} from "./OsmConnection";
import {UIEventSource} from "../UIEventSource"; import {UIEventSource} from "../UIEventSource";
import {ElementStorage} from "../ElementStorage"; import {ElementStorage} from "../ElementStorage";
@ -105,7 +106,7 @@ export class ChangesetHandler {
`<tag k="theme" v="${layout.id}"/>`, `<tag k="theme" v="${layout.id}"/>`,
`<tag k="language" v="${Locale.language.data}"/>`, `<tag k="language" v="${Locale.language.data}"/>`,
surveySource, surveySource,
layout.maintainer !== undefined ? `<tag k="theme-creator" v="${layout.maintainer}"/>` : "", layout.maintainer !== undefined ? `<tag k="theme-creator" v="${escapeHtml(layout.maintainer)}"/>` : "",
`</changeset></osm>`].join("") `</changeset></osm>`].join("")
}, function (err, response) { }, function (err, response) {
if (response === undefined) { if (response === undefined) {

View file

@ -109,7 +109,7 @@ export class UserBadge extends UIElement {
const userName = new Link( const userName = new Link(
new FixedUiElement(user.name), new FixedUiElement(user.name),
`https://www.openstreetmap.org/user/${user.name}'`, `https://www.openstreetmap.org/user/${user.name}`,
true); true);