Skip to content

Commit

Permalink
Themes: better support billboard on walls
Browse files Browse the repository at this point in the history
  • Loading branch information
pietervdvn committed Aug 24, 2024
1 parent a3c910b commit 0a1c90b
Show file tree
Hide file tree
Showing 8 changed files with 236 additions and 1 deletion.
24 changes: 23 additions & 1 deletion assets/layers/advertising/advertising.json
Original file line number Diff line number Diff line change
Expand Up @@ -291,10 +291,15 @@
"mappings": [
{
"if": {
"or": [
"and": [
"_referencing_ways~*",
"advertising=billboard"
]
},
"then": "./assets/themes/advertising/billboard_wall.svg"
},
{
"if": "advertising=billboard",
"then": "./assets/themes/advertising/billboard.svg"
},
{
Expand Down Expand Up @@ -454,6 +459,23 @@
"./assets/themes/advertising/Repsol_Billboard.jpg"
]
},
{
"tags": [
"advertising=billboard"
],
"snapToLayer": [
"walls_and_buildings"
],
"title": {
"en": "a billboard mounted to a wall"
},
"description": {
"en": "A large outdoor advertising structure, typically found in high-traffic areas such as alongside busy roads mounted on a wall"
},
"exampleImages": [
"./assets/themes/advertising/billboard_wall.jpg"
]
},
{
"tags": [
"advertising=poster_box"
Expand Down
2 changes: 2 additions & 0 deletions assets/themes/advertising/billboard_wall.jpeg.license
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
SPDX-FileCopyrightText: https://www.openstreetmap.org/user/GEO%20ECLA
SPDX-License-Identifier: CC0-1.0
Binary file added assets/themes/advertising/billboard_wall.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions assets/themes/advertising/billboard_wall.jpg.license
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
SPDX-FileCopyrightText: https://www.openstreetmap.org/user/GEO%20ECLA
SPDX-License-Identifier: CC0-1.0
184 changes: 184 additions & 0 deletions assets/themes/advertising/billboard_wall.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions assets/themes/advertising/billboard_wall.svg.license
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
SPDX-FileCopyrightText: Barnes38
SPDX-License-Identifier: CC-BY-SA-3.0
20 changes: 20 additions & 0 deletions assets/themes/advertising/license_info.json
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,26 @@
"https://wiki.openstreetmap.org/wiki/File:Billboard_trunk.svg"
]
},
{
"path": "billboard_wall.jpg",
"license": "CC0-1.0",
"authors": [
"https://www.openstreetmap.org/user/GEO%20ECLA"
],
"sources": [
"https://imgur.com/billboard-eHdb1ir"
]
},
{
"path": "billboard_wall.svg",
"license": "CC-BY-SA-3.0",
"authors": [
"Barnes38"
],
"sources": [
"https://wiki.openstreetmap.org/wiki/File:Billboard_trunk.svg"
]
},
{
"path": "board.svg",
"license": "CC-BY-SA-3.0",
Expand Down
3 changes: 3 additions & 0 deletions src/UI/Popup/AddNewPoint/PresetList.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@
for (const preset of layer.presets) {
const tags = TagUtils.KVtoProperties(preset.tags ?? [])
if(preset.preciseInput.snapToLayers){
tags["_referencing_ways"] = '["way/-1"]'
}
const markers = layer.mapRendering.map((mr, i) =>
mr
Expand Down

0 comments on commit 0a1c90b

Please sign in to comment.