diff --git a/UI/BigComponents/AddNewMarker.ts b/UI/BigComponents/AddNewMarker.ts index 6c3fe93d6..ab2c72730 100644 --- a/UI/BigComponents/AddNewMarker.ts +++ b/UI/BigComponents/AddNewMarker.ts @@ -24,13 +24,17 @@ export default class AddNewMarker extends Combine { for (const preset of filteredLayer.layerDef.presets) { const tags = TagUtils.KVtoProperties(preset.tags) const icon = layer.mapRendering[0] - .GenerateLeafletStyle(new UIEventSource(tags), false) + .GenerateLeafletStyle(new UIEventSource(tags), false, { + noSize: true, + }) .html.SetClass("block relative") .SetStyle("width: 42px; height: 42px;") icons.push(icon) if (last === undefined) { last = layer.mapRendering[0] - .GenerateLeafletStyle(new UIEventSource(tags), false) + .GenerateLeafletStyle(new UIEventSource(tags), false, { + noSize: true, + }) .html.SetClass("block relative") .SetStyle("width: 42px; height: 42px;") } diff --git a/UI/BigComponents/SimpleAddUI.ts b/UI/BigComponents/SimpleAddUI.ts index b9dbcbb5b..d7f25a5d3 100644 --- a/UI/BigComponents/SimpleAddUI.ts +++ b/UI/BigComponents/SimpleAddUI.ts @@ -285,7 +285,9 @@ export default class SimpleAddUI extends LoginToggle { const tags = TagUtils.KVtoProperties(preset.tags ?? []) let icon: () => BaseUIElement = () => layer.layerDef.mapRendering[0] - .GenerateLeafletStyle(new UIEventSource(tags), false) + .GenerateLeafletStyle(new UIEventSource(tags), false, { + noSize: true, + }) .html.SetClass("w-12 h-12 block relative") const presetInfo: PresetInfo = { layerToAddTo: layer, diff --git a/assets/themes/advertising/advertising.json b/assets/themes/advertising/advertising.json index d2cee0b9e..83e117db4 100644 --- a/assets/themes/advertising/advertising.json +++ b/assets/themes/advertising/advertising.json @@ -170,7 +170,7 @@ "then": { "ca": "Paret Pintada", "es": "Pared Pintada", - "en": "Wall Painted" + "en": "Wall painting" } } ] @@ -258,7 +258,7 @@ "en": "This is a flag" }, "icon": { - "path": "./assets/themes/advertising/icon.svg", + "path": "./assets/themes/advertising/flag.svg", "class": "medium" } }, @@ -306,7 +306,7 @@ "en": "This is a sculpture" }, "icon": { - "path": "./assets/themes/advertising/icon.svg", + "path": "./assets/themes/advertising/sculpture.svg", "class": "medium" } }, @@ -367,7 +367,7 @@ "then": { "ca": "Açò és una paret pintada", "es": "Esto es una pared pintada", - "en": "This is a wall painted" + "en": "This is a wall painting" }, "icon": { "path": "./assets/themes/advertising/icon.svg", @@ -541,7 +541,7 @@ "en": "Digital Prices" }, "hideInAnswer": { - "and": ["advertising:=flag", "advertising:=sculpture", "advertising:=tarp", "advertising:=wall_painting", "advertising:=board"] + "and": ["advertising=flag", "advertising=sculpture", "advertising=tarp", "advertising=wall_painting", "advertising=board"] } }, { @@ -571,7 +571,7 @@ "en": "Trivision" }, "hideInAnswer": { - "or": ["advertising:=screen", "advertising:=column", "advertising:=tarp", "advertising:=wall_painting", "advertising:=column", "advertising:=sculpture", "advertising:=board", "advertising:=sign", "advertising:=flag"] + "or": ["advertising=screen", "advertising=column", "advertising=tarp", "advertising=wall_painting", "advertising=column", "advertising=sculpture", "advertising=board", "advertising=sign", "advertising=flag"] } }, @@ -587,7 +587,7 @@ "en": "Scrolling posters" }, "hideInAnswer": { - "or": ["advertising:=screen", "advertising:=column", "advertising:=tarp", "advertising:=wall_painting", "advertising:=column", "advertising:=sculpture", "advertising:=sign", "advertising:=flag"] + "or": ["advertising=screen", "advertising=column", "advertising=tarp", "advertising=wall_painting", "advertising=column", "advertising=sculpture", "advertising=sign", "advertising=flag"] } }, { @@ -602,7 +602,7 @@ "en": "Rotates on itself" }, "hideInAnswer": { - "or": ["advertising:=flag", "advertising:=board", "advertising:=tarp", "advertising:=wall_painting"] + "or": ["advertising=flag", "advertising=board", "advertising=tarp", "advertising=wall_painting"] } } ] @@ -711,7 +711,7 @@ "en": "To expres your opinion" }, "hideInAnswer": { - "or": ["advertising:=flag", "advertising:=screen"] + "or": ["advertising=flag", "advertising=screen"] } }, { @@ -738,7 +738,7 @@ "en": "Funding sign" }, "hideInAnswer": { - "or": ["advertising:=flag", "advertising:=column"] + "or": ["advertising=flag", "advertising=column"] } } ] @@ -875,7 +875,7 @@ }, { "if": "advertising=flag", - "then": "./assets/themes/advertising/icon.svg" + "then": "./assets/themes/advertising/flag.svg" }, { "if": "advertising=poster_box", @@ -883,11 +883,11 @@ }, { "if": "advertising=screen", - "then": "./assets/themes/advertising/icon.svg" + "then": "./assets/themes/advertising/screen.svg" }, { "if": "advertising=sculpture", - "then": "./assets/themes/advertising/icon.svg" + "then": "./assets/themes/advertising/sculpture.svg" }, { "if": "advertising=sign", @@ -907,7 +907,18 @@ } ] }, - "iconSize": "40,40,bottom" + "iconSize": { + "render": "40,40,bottom", + "mappings": [{ + "if": "advertising=flag", + "then": "60,60,bottom" + }, + { + "if": "advertising=sculpture", + "then":"50,50,bottom" + } + ] + } }, { "width": { @@ -1053,7 +1064,7 @@ "title": { "ca": "una escupltura", "es": "una escultura", - "en": "an sculpture" + "en": "a sculpture" }, "exampleImages":[ "./assets/themes/advertising/Aircraft_Sculpture.jpg", @@ -1125,7 +1136,7 @@ "title": { "ca": "una pintura a la paret", "es": "una pitura en la pared", - "en": "a wall painted" + "en": "a wall painting" }, "preciseInput": { "preferredBackground": "map", diff --git a/assets/themes/advertising/flag.svg b/assets/themes/advertising/flag.svg new file mode 100644 index 000000000..668b69d97 --- /dev/null +++ b/assets/themes/advertising/flag.svg @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + diff --git a/assets/themes/advertising/license_info.json b/assets/themes/advertising/license_info.json index 5084bd498..545f4c2cb 100644 --- a/assets/themes/advertising/license_info.json +++ b/assets/themes/advertising/license_info.json @@ -279,6 +279,21 @@ "https://wiki.openstreetmap.org/wiki/File:Column.svg" ] }, + { + "path": "flag.svg", + "license": "CC BY-SA 3.0", + "authors": [ + "Barnes38", + "Ash Crow", + "Happy-melon", + "Aris Katsaris", + "Pietervdvn" + ], + "sources": [ + "https://wiki.openstreetmap.org/wiki/File:Column.svg", + "https://commons.wikimedia.org/wiki/File:Flag_icon_darkblue.svg" + ] + }, { "path": "icon.svg", "license": "CC-BY-SA 4.0", @@ -329,6 +344,29 @@ "https://imgur.com/HKsRycm" ] }, + { + "path": "screen.svg", + "license": "CC-BY-SA 4.0", + "authors": [ + "Barnes38", + "Pietervdvn" + ], + "sources": [ + "https://wiki.openstreetmap.org/wiki/File:Poster_box.svg" + ] + }, + { + "path": "sculpture.svg", + "license": "CC BY 3.0", + "authors": [ + "Nathaniel Smith", + "Pietervdvn" + ], + "sources": [ + "https://wiki.openstreetmap.org/wiki/File:Column.svg", + "https://commons.wikimedia.org/wiki/File:Sculpture_(NP100738).svg" + ] + }, { "path": "tarp_feder.jpg", "license": "CC-BY SA 4.0", diff --git a/assets/themes/advertising/screen.svg b/assets/themes/advertising/screen.svg new file mode 100644 index 000000000..40b676f5e --- /dev/null +++ b/assets/themes/advertising/screen.svg @@ -0,0 +1,127 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/themes/advertising/sculpture.svg b/assets/themes/advertising/sculpture.svg new file mode 100644 index 000000000..ec063bc4e --- /dev/null +++ b/assets/themes/advertising/sculpture.svg @@ -0,0 +1,64 @@ + +