From 21341972f12f55fd5a4486b711a9962632e9650c Mon Sep 17 00:00:00 2001
From: Taylor Smock <taylor.smock@kaart.com>
Date: Wed, 29 Jul 2020 15:51:05 -0600
Subject: [PATCH] Update in-tree copy of mapcss file

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
---
 .../resources/styles/standard/mapwithai.mapcss     | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/styles/standard/mapwithai.mapcss b/src/main/resources/styles/standard/mapwithai.mapcss
index 930bda2..434f321 100644
--- a/src/main/resources/styles/standard/mapwithai.mapcss
+++ b/src/main/resources/styles/standard/mapwithai.mapcss
@@ -15,6 +15,10 @@ meta
     settings::show_all {
         label: tr("Show possible MapWithAI objects");
     }
+    settings::colors {
+        label: tr("Source Colors");
+    }
+
 }
 
 setting::show_new {
@@ -57,28 +61,28 @@ setting::toggle_with_layer {
  * Set .mapwithai for all known MapWithAI datasets *
  ***************************************************/
 
-way["source"][regexp_test(concat("^(", JOSM_pref("mapwithai.mappaint.sources", "microsoft/BuildingFootprints|digitalglobe"), ")$"), tag("source"))][setting("show_new")]:new,
+way["source"][regexp_test(concat("^(", JOSM_pref("mapwithai.mappaint.sources", "microsoft/.*|digitalglobe|maxar|esri/.*"), ")$"), tag("source"))][setting("show_new")]:new,
 way["mapwithai:source"][setting("show_new")] {
     set .mapwithai;
     set_color: JOSM_pref(concat("mapwithai.mappaint.", any(tag("source"), tag("mapwithai:source")), "_new"), #FF00FF);
 }
-way["source"][regexp_test(concat("^(", JOSM_pref("mapwithai.mappaint.sources", "microsoft/BuildingFootprints|digitalglobe"), ")$"), tag("source"))][setting("show_old")]!:new!:modified,
+way["source"][regexp_test(concat("^(", JOSM_pref("mapwithai.mappaint.sources", "microsoft/.*|digitalglobe|maxar|esri/.*"), ")$"), tag("source"))][setting("show_old")]!:new!:modified,
 way["mapwithai:source"][setting("show_old")]!:new!:modified {
     set .mapwithai;
     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/BuildingFootprints|digitalglobe"), ")$"), tag("source"))][setting("show_modified")]:modified,
+way[regexp_test(concat("^(", JOSM_pref("mapwithai.mappaint.sources", "microsoft/.*|digitalglobe|maxar|esri/.*"), ")$"), tag("source"))][setting("show_modified")]:modified,
 way["mapwithai:source"][setting("show_modified")]:modified {
     set .mapwithai;
     set_color: JOSM_pref(concat("mapwithai.mappaint.", any(tag("source"), tag("mapwithai:source")), "_modified"), #FF00FF);
 }
 
 way.mapwithai {
-    color: prop("set_color");
+    color: any(prop("set_color_programatic"), prop("set_color"));
 }
 
 way.mapwithai:closed2 {
-    fill-color: prop("set_color");
+    fill-color: any(prop("set_color_programatic"), prop("set_color"));
 }
 
 way.mapwithai[setting("decemberHolidayStyle")] {