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

Fix deploy

Browse source
This commit is contained in:
Pieter Vander Vennet 2020-11-06 01:58:26 +01:00
parent 9c53fe9868
commit 3f8b6e88d3
39 changed files with 381 additions and 562 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Logic/FilteredLayer.ts
View file

@ -53,7 +53,7 @@ export class FilteredLayer {
this._showOnPopup = showOnPopup;
this._style = (tags) => {
const iconUrl = layerDef.icon?.GetRenderValue(tags)?.txt ?? "./assets/bug.svg";
const iconUrl = layerDef.icon?.GetRenderValue(tags)?.txt;
const iconSize = (layerDef.iconSize?.GetRenderValue(tags)?.txt ?? "40,40,center").split(",");

6
Logic/PersonalLayersPanel.ts
View file

@ -9,6 +9,8 @@ import {PersonalLayout} from "./PersonalLayout";
import {Layout} from "../Customizations/Layout";
import {SubtleButton} from "../UI/Base/SubtleButton";
import {FixedUiElement} from "../UI/Base/FixedUiElement";
import {Img} from "../UI/Img";
import Svg from "../Svg";
export class PersonalLayersPanel extends UIElement {
private checkboxes: UIElement[] = [];
@ -50,10 +52,10 @@ export class PersonalLayersPanel extends UIElement {
if (typeof layer === "string") {
continue;
}
let icon = layer.icon ?? "./assets/checkmark.svg";
let icon = layer.icon ?? Img.AsData(Svg.checkmark);
let iconUnset = layer.icon ?? "";
if (layer.icon !== undefined && typeof (layer.icon) !== "string") {
icon = layer.icon.GetContent({"id": "node/-123456"}).txt ?? "./assets/checkmark.svg";
icon = layer.icon.GetRenderValue({"id": "node/-123456"}).txt ?? Img.AsData(Svg.checkmark)
iconUnset = icon;
}

4
Logic/PersonalLayout.ts
View file

@ -1,5 +1,7 @@
import {Layout} from "../Customizations/Layout";
import Translations from "../UI/i18n/Translations";
import {Img} from "../UI/Img";
import Svg from "../Svg";
export class PersonalLayout extends Layout {
@ -18,7 +20,7 @@ export class PersonalLayout extends Layout {
);
this.maintainer = "MapComplete"
this.description = "The personal theme allows to select one or more layers from all the layouts, creating a truly personal editor"
this.icon = "./assets/add.svg"
this.icon = Img.AsData(Svg.add)
}
}