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

Merge develop

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-12-22 01:09:33 +01:00
commit 70aa6eb003
26 changed files with 89 additions and 1083 deletions
Download patch file Download diff file Expand all files Collapse all files

1
UI/BigComponents/LeftControls.ts
View file

@ -62,7 +62,6 @@ export default class LeftControls extends Combine {
const elem = currentViewFL.layerDef.mapRendering[0]?.GenerateLeafletStyle(new UIEventSource(tags), false, {
noSize: true
})?.html
console.log("Elem is ", elem, "for", tags)
if (elem === undefined) {
return defaultIcon
}

14
UI/Input/LocationInput.ts
View file

@ -15,20 +15,10 @@ import {FixedUiElement} from "../Base/FixedUiElement";
import ShowDataLayer from "../ShowDataLayer/ShowDataLayer";
import BaseUIElement from "../BaseUIElement";
import Toggle from "./Toggle";
import * as matchpoint from "../../assets/layers/matchpoint/matchpoint.json"
export default class LocationInput extends InputElement<Loc> implements MinimapObj {
private static readonly matchLayer = new LayerConfig(
{
id: "matchpoint", source: {
osmTags: {and: []}
},
mapRendering: [{
location: ["point","centroid"],
icon: "./assets/svg/crosshair-empty.svg"
}]
}, "matchpoint icon", true
)
private static readonly matchLayer = new LayerConfig(matchpoint, "LocationInput.matchpoint", true)
IsSelected: UIEventSource<boolean> = new UIEventSource<boolean>(false);
public readonly snappedOnto: UIEventSource<any> = new UIEventSource<any>(undefined)

2
UI/Popup/DeleteWizard.ts
View file

@ -93,7 +93,7 @@ export default class DeleteWizard extends Toggle {
* The button which is shown first. Opening it will trigger the check for deletions
*/
const deleteButton = new SubtleButton(
Svg.delete_icon_ui().SetStyle("width: auto; height: 1.5rem;"), t.delete.Clone()).onClick(
Svg.delete_icon_svg().SetStyle("width: 1.5rem; height: 1.5rem;"), t.delete.Clone()).onClick(
() => {
deleteAbility.CheckDeleteability(true)
confirm.setData(true);

4
UI/Popup/MoveWizard.ts
View file

@ -85,14 +85,14 @@ export default class MoveWizard extends Toggle {
const reason = reasons[0]
moveReason.setData(reason)
moveButton = new SubtleButton(
reason.icon.SetStyle("height: 1.5rem; width: auto;"),
reason.icon.SetStyle("height: 1.5rem; width: 1.5rem;"),
Translations.WT(reason.invitingText)
).onClick(() => {
currentStep.setData("pick_location")
})
} else {
moveButton = new SubtleButton(
Svg.move_ui().SetStyle("height: 1.5rem; width: auto"),
Svg.move_ui().SetStyle("width: 1.5rem; height: 1.5rem"),
t.inviteToMove.generic
).onClick(() => {
currentStep.setData("reason")