Update paint style to match version on website

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>

src/main/resources/styles/standard/mapwithai.mapcss

@@ -2,19 +2,21 @@ meta
 {
     title: "MapWithAI";
     description: "Visualization of MapWithAI data";
+    icon: "mapwithai.svg";
     author: "Taylor Smock";
-    version: "1_2019-09-21";
+    version: "1.[[revision]]_[[date]]";
     min-josm-version: "15229";
 }
 
-/***************************************************
+/********************************
- * Set .mapwithai for all known MapWithAI datasets *
+ * Settings for the paint style *
- ***************************************************/
+ ********************************/
 @supports (min-josm-version: 15289) {
     settings::show_all {
         label: tr("Show possible MapWithAI objects");
     }
 }
+
 setting::show_new {
     type: boolean;
     label: tr("New");
@@ -33,23 +35,78 @@ setting::show_old {
     default: false;
     group: "show_all";
 }
+
+setting::decemberHolidayStyle {
+    type: boolean;
+    label: tr("Mappy Holidays!");
+    default: false;
+}
+
 /* This requires support in the plugin (will read key for mapwithai.mapcss:boolean:toggle_with_layer) */
 setting::toggle_with_layer {
     type: boolean;
     label: tr("Toggle paintstyle on/off with layer");
-    default: false;
+    default: true;
 }
 
-way[source=~/^(?i)(microsoft|digitalglobe)$/][setting("show_old")]!:new!:modified,
+/************************************
-way[source=~/^(?i)(microsoft|digitalglobe)$/][setting("show_new")]:new,
+ * End Settings for the paint style *
-way[source=~/^(?i)(microsoft|digitalglobe)$/][setting("show_modified")]:modified {
+ ************************************/
+
+/***************************************************
+ * Set .mapwithai for all known MapWithAI datasets *
+ ***************************************************/
+
+way[regexp_test(concat("^(", JOSM_pref("mapwithai.mappaint.sources", "microsoft|digitalglobe"), ")$"), tag("source"))][setting("show_new")]:new {
     set .mapwithai;
+    set_color: JOSM_pref(concat("mapwithai.mappaint.", tag("source"), "_new"), #FF00FF);
+}
+way[regexp_test(concat("^(", JOSM_pref("mapwithai.mappaint.sources", "microsoft|digitalglobe"), ")$"), tag("source"))][setting("show_old")]!:new!:modified {
+    set .mapwithai;
+    set_color: JOSM_pref(concat("mapwithai.mappaint.", tag("source"), "_old"), #FF00FF);
+}
+way[regexp_test(concat("^(", JOSM_pref("mapwithai.mappaint.sources", "microsoft|digitalglobe"), ")$"), tag("source"))][setting("show_modified")]:modified {
+    set .mapwithai;
+    set_color: JOSM_pref(concat("mapwithai.mappaint.", tag("source"), "_modified"), #FF00FF);
 }
 
 way.mapwithai {
-    color: mapwithai#FF00FF;
+    color: prop("set_color");
 }
 
 way.mapwithai:closed2 {
-    fill-color: mapwithai#FF00FF;
+    fill-color: prop("set_color");
 }
+
+way.mapwithai[setting("decemberHolidayStyle")] {
+    holidayColour: CRC32_checksum(osm_id()) > 2147483647.5
+}
+
+
+/*****************
+ * Holiday Theme *
+ *****************/
+way.mapwithai[is_prop_set("holidayColour") && prop("holidayColour")] {
+    color: mapwithaiDecemberGreen#00FF00;
+    dashes: 20;
+    dashes-background-color: mapwithaiDecemberWhite#FFFFFF;
+}
+way.mapwithai[is_prop_set("holidayColour") && !prop("holidayColour")] {
+    color: mapwithaiDecemberRed#FC6262;
+    dashes: 20;
+    dashes-background-color: mapwithaiDecemberWhite#FFFFFF;
+}
+way.mapwithai[is_prop_set("holidayColour") && prop("holidayColour")]:closed2 {
+    fill-color: mapwithaiDecemberGreen#00FF00;
+}
+way.mapwithai[is_prop_set("holidayColour") && !prop("holidayColour")]:closed2 {
+    fill-color: mapwithaiDecemberRed#FC6262;
+}
+
+way.mapwithai[is_prop_set("holidayColour")]:selected {
+    color: mapWithAIDecemberSelected#FF0000;
+    dashes: 0;
+}
+/*********************
+ * End Holiday Theme *
+ *********************/