From 3813ece2a2fec70c11590bc8c86d039887d15247 Mon Sep 17 00:00:00 2001 From: Taylor Smock Date: Wed, 13 May 2020 08:50:49 -0600 Subject: [PATCH] Update paint style Signed-off-by: Taylor Smock --- .../resources/styles/standard/mapwithai.mapcss | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/resources/styles/standard/mapwithai.mapcss b/src/main/resources/styles/standard/mapwithai.mapcss index 1232c74..930bda2 100644 --- a/src/main/resources/styles/standard/mapwithai.mapcss +++ b/src/main/resources/styles/standard/mapwithai.mapcss @@ -57,17 +57,20 @@ setting::toggle_with_layer { * Set .mapwithai for all known MapWithAI datasets * ***************************************************/ -way[regexp_test(concat("^(", JOSM_pref("mapwithai.mappaint.sources", "microsoft|digitalglobe"), ")$"), tag("source"))][setting("show_new")]:new { +way["source"][regexp_test(concat("^(", JOSM_pref("mapwithai.mappaint.sources", "microsoft/BuildingFootprints|digitalglobe"), ")$"), tag("source"))][setting("show_new")]:new, +way["mapwithai:source"][setting("show_new")] { set .mapwithai; - set_color: JOSM_pref(concat("mapwithai.mappaint.", tag("source"), "_new"), #FF00FF); + set_color: JOSM_pref(concat("mapwithai.mappaint.", any(tag("source"), tag("mapwithai:source")), "_new"), #FF00FF); } -way[regexp_test(concat("^(", JOSM_pref("mapwithai.mappaint.sources", "microsoft|digitalglobe"), ")$"), tag("source"))][setting("show_old")]!:new!:modified { +way["source"][regexp_test(concat("^(", JOSM_pref("mapwithai.mappaint.sources", "microsoft/BuildingFootprints|digitalglobe"), ")$"), tag("source"))][setting("show_old")]!:new!:modified, +way["mapwithai:source"][setting("show_old")]!:new!:modified { set .mapwithai; - set_color: JOSM_pref(concat("mapwithai.mappaint.", tag("source"), "_old"), #FF00FF); + set_color: JOSM_pref(concat("mapwithai.mappaint.", any(tag("source"), tag("mapwithai:source")), "_old"), #FF00FF); } -way[regexp_test(concat("^(", JOSM_pref("mapwithai.mappaint.sources", "microsoft|digitalglobe"), ")$"), tag("source"))][setting("show_modified")]:modified { +way[regexp_test(concat("^(", JOSM_pref("mapwithai.mappaint.sources", "microsoft/BuildingFootprints|digitalglobe"), ")$"), tag("source"))][setting("show_modified")]:modified, +way["mapwithai:source"][setting("show_modified")]:modified { set .mapwithai; - set_color: JOSM_pref(concat("mapwithai.mappaint.", tag("source"), "_modified"), #FF00FF); + set_color: JOSM_pref(concat("mapwithai.mappaint.", any(tag("source"), tag("mapwithai:source")), "_modified"), #FF00FF); } way.mapwithai {