Changes between Version 13 and Version 14 of Styles/MapWithAI

Timestamp:

2020-05-13T15:55:11+02:00 (6 years ago)

Author:

taylor.smock

Comment:

Allow users to change colours for different sources (i.e., third party sources)

Styles/MapWithAI

@@ -14 +14 @@
 }
 
-/***************************************************
- * Set .mapwithai for all known MapWithAI datasets *
- ***************************************************/
+/********************************
+ * Settings for the paint style *
+ ********************************/
 @supports (min-josm-version: 15289) {
     settings::show_all {
@@ -55 +55 @@
 }
 
-way[source=~/^(?i)(microsoft.*|digitalglobe|maxar)$/][setting("show_old")]!:new!:modified,
-way[source=~/^(?i)(microsoft.*|digitalglobe|maxar)$/][setting("show_new")]:new,
-way[source=~/^(?i)(microsoft.*|digitalglobe|maxar)$/][setting("show_modified")]:modified {
+/************************************
+ * End Settings for the paint style *
+ ************************************/
+
+/***************************************************
+ * 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["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["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["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: mapwithai#FF00FF;
+    color: prop("set_color");
 }
 
 way.mapwithai:closed2 {
-    fill-color: mapwithai#FF00FF;
+    fill-color: prop("set_color");
 }
 
@@ -73 +91 @@
 }
 
+
+/*****************
+ * Holiday Theme *
+ *****************/
 way.mapwithai[is_prop_set("holidayColour") && prop("holidayColour")] {
     color: mapwithaiDecemberGreen#00FF00;
@@ -94 +116 @@
     dashes: 0;
 }
+/*********************
+ * End Holiday Theme *
+ *********************/
 }}}