Changes between Version 57 and Version 58 of Styles/Coloured_Streets

Timestamp:

2014-07-04T00:42:58+02:00 (11 years ago)

Author:

Klumbumbus

Comment:

update to 3.24.xx code

Styles/Coloured_Streets

@@ -159 +159 @@
 {
         title: "Coloured Streets";
-        version: "3.23.[[revision]]_[[date]]";
-        description: "Colouring of buildings, address nodes and streets with the same street name in the same colour. Makes working with addresses a lot easier. Check out the linked page to read how to change some settings of this mappaint style. Min. JOSM version is 6909.";
+        version: "3.24.[[revision]]_[[date]]";
+        description: "Colouring of buildings, address nodes and streets with the same street name in the same colour. Makes working with addresses a lot easier. Check out the linked page to read how to change some settings of this mappaint style. Min. JOSM version is 7287.";
         icon: "http://upload.wikimedia.org/wikipedia/commons/3/3a/ColouredStreetsIcon.png";
         author: "geozeisig, Klumbumbus";
         link: "http://josm.openstreetmap.de/wiki/Styles/Coloured_Streets";
         watch-modified: true;
-        min-josm-version: "6909";
-        /* This mapcss mappaint style was created for JOSM 6909. I try to support future versions of JOSM as long as possible. */
+        min-josm-version: "7287";
+        /* This mapcss mappaint style was created for JOSM 7287. I try to support future versions of JOSM as long as possible. */
 }
 
@@ -172 +172 @@
 {
         title: "Coloured Streets";
-        description: "Einfärben von Gebäuden, Adressnodes und Straßen mit gleichem Straßennamen in der gleichen Farbe. Macht die Arbeit mit Adressen wesentlich leichter. Schau dir die verlinkte Seite an, um zu lesen, wie man einige Einstellungen dieses MapMaint-Stils ändert. Min. JOSM-Version ist 6909.";
+        description: "Einfärben von Gebäuden, Adressnodes und Straßen mit gleichem Straßennamen in der gleichen Farbe. Macht die Arbeit mit Adressen wesentlich leichter. Schau dir die verlinkte Seite an, um zu lesen, wie man einige Einstellungen dieses MapMaint-Stils ändert. Min. JOSM-Version ist 7287.";
         link: "http://josm.openstreetmap.de/wiki/De:Styles/Coloured_Streets";
 }
 
-/* create "settings" with the help of colours: boolean properties with style_... */
-
+/* ------------------------------------------------------------------------------------------------------------------------ */
+/* ------------------------------------------------------------------------------------------------------------------------ */
+/* ------------------------------------------------------------------------------------------------------------------------ */
+
+/* Create settings. After changing a setting in the advanced preferences you need to disable and reenable the style to apply the changes. */
 *
 {
-        allow_postcode_on_highway: Boolean_allow_postcode_on_highway#000000;
-        style_allow_postcode_on_highway: eval(red(prop(allow_postcode_on_highway)))=1;
-        /* default colour is black, that means postcodes on highways are not allowed, that means style_allow_postcode_on_highway=false */
-}
-
-*
-{
-        support_prefix_and_suffix_on_highway_names: Boolean_support_prefix_and_suffix_on_highway_names#000000;
-        style_support_prefix_and_suffix_on_highway_names: eval(red(prop(support_prefix_and_suffix_on_highway_names)))=1;
-        /* default colour is black, that means prefix and suffix is not supported, that means style_support_prefix_and_suffix_on_highway_names=false */
-}
-
-/* create crc32checksums */
+        show_bicycle: JOSM_pref(coloured_streets_setting_show_cycleway_dashes, false);
+        /* Default is false, that means the coloured dashes of streets with cycleway=* and named cycle-/footways are hidden. This is because the coloured dashes can confuse you in Coloured Streets.*/
+        allow_postcode: JOSM_pref(coloured_streets_setting_allow_postcode, false);
+        /* Default is false, that means a warning is displayed, if you put postcode=* on streets. */
+        support_prefix_and_suffix: JOSM_pref(coloured_streets_setting_support_prefix_and_suffix_on_highway_names, false);
+        /* Default is false, that means prefix and suffix are ignored. */
+}
+
+/* create crc32checksums. They are use later in the stylesheet to determine the colour. Due to the division by 429496.7296 crc is always a number between 0 and 10000. */
         /* streets and pedestrian areas */
-way[highway][name][highway!="platform"][!prop(style_support_prefix_and_suffix_on_highway_names)],
-way[highway][name][highway!="platform"][prop(style_support_prefix_and_suffix_on_highway_names)][!name:prefix][!name:suffix],
-area[highway="pedestrian"][name][!prop(style_support_prefix_and_suffix_on_highway_names)]:closed,
-area[highway="pedestrian"][name][prop(style_support_prefix_and_suffix_on_highway_names)][!name:prefix][!name:suffix]:closed
+way[highway][name][highway!="platform"][prop(support_prefix_and_suffix)=false],
+way[highway][name][highway!="platform"][prop(support_prefix_and_suffix)=true][!name:prefix][!name:suffix],
+area[highway="pedestrian"][name][prop(support_prefix_and_suffix)=false]:closed,
+area[highway="pedestrian"][name][prop(support_prefix_and_suffix)=true][!name:prefix][!name:suffix]:closed
 {
         crc: CRC32_checksum(tag(name))/429496.7296;
 }
-way[highway][name][highway!="platform"][prop(style_support_prefix_and_suffix_on_highway_names)][name:prefix][!name:suffix],
-area[highway="pedestrian"][name][prop(style_support_prefix_and_suffix_on_highway_names)][name:prefix][!name:suffix]:closed
+way[highway][name][highway!="platform"][prop(support_prefix_and_suffix)=true][name:prefix][!name:suffix],
+area[highway="pedestrian"][name][prop(support_prefix_and_suffix)=true][name:prefix][!name:suffix]:closed
 {
         crc: CRC32_checksum(concat(tag("name:prefix"), " ", tag("name")))/429496.7296;
 }
-way[highway][name][highway!="platform"][prop(style_support_prefix_and_suffix_on_highway_names)][!name:prefix][name:suffix],
-area[highway="pedestrian"][name][prop(style_support_prefix_and_suffix_on_highway_names)][!name:prefix][name:suffix]:closed
+way[highway][name][highway!="platform"][prop(support_prefix_and_suffix)=true][!name:prefix][name:suffix],
+area[highway="pedestrian"][name][prop(support_prefix_and_suffix)=true][!name:prefix][name:suffix]:closed
 {
         crc: CRC32_checksum(concat(tag("name"), " ", tag("name:suffix")))/429496.7296;
 }
-way[highway][name][highway!="platform"][prop(style_support_prefix_and_suffix_on_highway_names)][name:prefix][name:suffix],
-area[highway="pedestrian"][name][prop(style_support_prefix_and_suffix_on_highway_names)][name:prefix][name:suffix]:closed
+way[highway][name][highway!="platform"][prop(support_prefix_and_suffix)=true][name:prefix][name:suffix],
+area[highway="pedestrian"][name][prop(support_prefix_and_suffix)=true][name:prefix][name:suffix]:closed
 {
         crc: CRC32_checksum(concat(tag("name:prefix"), " ", tag("name"), " ", tag("name:suffix")))/429496.7296;
@@ -218 +217 @@
 
         /* associated street relations */
-relation[type="associatedStreet"][name] > area["addr:housenumber"][!prop(style_support_prefix_and_suffix_on_highway_names)],
-relation[type="associatedStreet"][name] > node["addr:housenumber"][!prop(style_support_prefix_and_suffix_on_highway_names)]::halo,
-relation[type="associatedStreet"][name][!name:prefix][!name:suffix] > area["addr:housenumber"][prop(style_support_prefix_and_suffix_on_highway_names)],
-relation[type="associatedStreet"][name][!name:prefix][!name:suffix] > node["addr:housenumber"][prop(style_support_prefix_and_suffix_on_highway_names)]::halo
+relation[type="associatedStreet"][name] > area["addr:housenumber"][prop(support_prefix_and_suffix)=false],
+relation[type="associatedStreet"][name] > node["addr:housenumber"][prop(support_prefix_and_suffix, default)=false]::halo,
+relation[type="associatedStreet"][name][!name:prefix][!name:suffix] > area["addr:housenumber"][prop(support_prefix_and_suffix)=true],
+relation[type="associatedStreet"][name][!name:prefix][!name:suffix] > node["addr:housenumber"][prop(support_prefix_and_suffix, default)=true]::halo
 {
         crc: CRC32_checksum(parent_tag("name"))/429496.7296;
 }
-relation[type="associatedStreet"][name][name:prefix][!name:suffix] > area["addr:housenumber"][prop(style_support_prefix_and_suffix_on_highway_names)],
-relation[type="associatedStreet"][name][name:prefix][!name:suffix] > node["addr:housenumber"][prop(style_support_prefix_and_suffix_on_highway_names)]::halo
+relation[type="associatedStreet"][name][name:prefix][!name:suffix] > area["addr:housenumber"][prop(support_prefix_and_suffix)=true],
+relation[type="associatedStreet"][name][name:prefix][!name:suffix] > node["addr:housenumber"][prop(support_prefix_and_suffix, default)=true]::halo
 {
         crc: CRC32_checksum(concat(parent_tag("name:prefix"), " ", parent_tag("name")))/429496.7296;
 }
-relation[type="associatedStreet"][name][!name:prefix][name:suffix] > area["addr:housenumber"][prop(style_support_prefix_and_suffix_on_highway_names)],
-relation[type="associatedStreet"][name][!name:prefix][name:suffix] > node["addr:housenumber"][prop(style_support_prefix_and_suffix_on_highway_names)]::halo
+relation[type="associatedStreet"][name][!name:prefix][name:suffix] > area["addr:housenumber"][prop(support_prefix_and_suffix)=true],
+relation[type="associatedStreet"][name][!name:prefix][name:suffix] > node["addr:housenumber"][prop(support_prefix_and_suffix, default)=true]::halo
 {
         crc: CRC32_checksum(concat(parent_tag("name"), " ", parent_tag("name:suffix")))/429496.7296;
 }
-relation[type="associatedStreet"][name][name:prefix][name:suffix] > area["addr:housenumber"][prop(style_support_prefix_and_suffix_on_highway_names)],
-relation[type="associatedStreet"][name][name:prefix][name:suffix] > node["addr:housenumber"][prop(style_support_prefix_and_suffix_on_highway_names)]::halo
+relation[type="associatedStreet"][name][name:prefix][name:suffix] > area["addr:housenumber"][prop(support_prefix_and_suffix)=true],
+relation[type="associatedStreet"][name][name:prefix][name:suffix] > node["addr:housenumber"][prop(support_prefix_and_suffix, default)=true]::halo
 {
         crc: CRC32_checksum(concat(parent_tag("name:prefix"), " ", parent_tag("name"), " ", parent_tag("name:suffix")))/429496.7296;
@@ -259 +258 @@
 }
 
+/* ------------------------------------------------------------------------------------------------------------------------ */
+/* ------------------------------------------------------------------------------------------------------------------------ */
 /* ------------------------------------------------------------------------------------------------------------------------ */
 
@@ -308 +309 @@
 
         /* bigger text of nodes and areas on high zoom levels */
-
 node|z20,area|z20       { font-size: 9; }
 node|z21,area|z21       { font-size: 10; }
@@ -314 +314 @@
 
 /* ------------------------------------------------------------------------------------------------------------------------ */
+/* ------------------------------------------------------------------------------------------------------------------------ */
+/* ------------------------------------------------------------------------------------------------------------------------ */
 
 /* tone down landuse fill-color */
-
 area[landuse]
 {
@@ -323 +324 @@
 
 /* disable place fill-color */
-
 area[place]
 {
@@ -329 +329 @@
 }
 
-/* tone down garages and other "small" buildings, as they usually do not have addr:*=* tags. */
-
+/* tone down garages and other "minor" buildings, as they usually do not have addr:*=* tags. */
 area[!"addr:housenumber"][!"addr:street"][!"addr:place"][building=barn],
 area[!"addr:housenumber"][!"addr:street"][!"addr:place"][building=bunker],
 area[!"addr:housenumber"][!"addr:street"][!"addr:place"][building=cabin],
 area[!"addr:housenumber"][!"addr:street"][!"addr:place"][building=cowshed],
-area[!"addr:housenumber"][!"addr:street"][!"addr:place"][building=farm],
 area[!"addr:housenumber"][!"addr:street"][!"addr:place"][building=farm_auxiliary],
 area[!"addr:housenumber"][!"addr:street"][!"addr:place"][building=garage],
@@ -351 +349 @@
 }
 
-/* deactivate the paint style of piste:difficulty from the default josm style elemstyle.mapcss, because it is distracting in Coloured Streets */
-
+/* deactivate the paint style of piste:difficulty from the default josm
+style elemstyle.mapcss, because it is distracting in Coloured Streets */
 way["piste:difficulty"]::core_piste
 {
@@ -360 +358 @@
 area["piste:difficulty"]:closed::core_piste
 {
-    fill-opacity: 1;
-}
-
+        fill-opacity: 1;
+}
+
+/* option to deactivate the paint style of cycleways (lane and track) from the default
+josm style elemstyle.mapcss, because it can be distracting in Coloured Streets */
+way.lR[prop(show_bicycle, default)=false]::core_cycleway,
+way.tR[prop(show_bicycle, default)=false]::core_cycleway,
+way[cycleway=opposite][prop(show_bicycle, default)=false]::core_cycleway
+{
+        width: 0;
+}
+
+/* (grouping the previous and the following block doesn't work correctly, see http://josm.openstreetmap.de/ticket/10106 )*/
+way[prop("tL","core_cycleway")][prop(show_bicycle, default)=false]::core_cycleway2,
+way[prop("lL","core_cycleway")][prop(show_bicycle, default)=false]::core_cycleway2
+{
+        width: 0;
+}
+
+way[prop(show_bicycle)=false][name][highway=path][bicycle=designated][foot=designated],
+way[prop(show_bicycle)=false][name][highway=path][bicycle=official][foot=official],
+way[prop(show_bicycle)=false][name][highway=cycleway][foot=yes],
+way[prop(show_bicycle)=false][name][highway=path][bicycle=designated][foot=yes],
+way[prop(show_bicycle)=false][name][highway=path][bicycle=official][foot=yes],
+way[prop(show_bicycle)=false][name][highway=footway][bicycle=yes],
+way[prop(show_bicycle)=false][name][highway=path][bicycle=yes][foot=designated],
+way[prop(show_bicycle)=false][name][highway=path][bicycle=yes][foot=official]
+{
+        dashes: none;
+}
+
+/* ------------------------------------------------------------------------------------------------------------------------ */
+/* ------------------------------------------------------------------------------------------------------------------------ */
 /* ------------------------------------------------------------------------------------------------------------------------ */
 
@@ -386 +414 @@
 }
                 /* address nodes */
-
 node|z17-["addr:street"]::halo,
 node|z17-["addr:place"]::halo,
@@ -673 +700 @@
         text-halo-color: #6b8e23;
 }
-way["highway"]["name"][prop(crc)>=1818][prop(crc)<2121] 
+way["highway"]["name"][prop(crc)>=1818][prop(crc)<2121]
 {
         color: #6b8e23;
@@ -717 +744 @@
         text-halo-color: #7fffd4;
 }
-way["highway"]["name"][prop(crc)>=2424][prop(crc)<2727] 
+way["highway"]["name"][prop(crc)>=2424][prop(crc)<2727]
 {
         color: #7fffd4;
@@ -761 +788 @@
         text-halo-color: #a52a2a;
 }
-way["highway"]["name"][prop(crc)>=3030][prop(crc)<3333] 
+way["highway"]["name"][prop(crc)>=3030][prop(crc)<3333]
 {
         color: #a52a2a;
@@ -783 +810 @@
         text-halo-color: #f0b9a6;
 }
-way["highway"]["name"][prop(crc)>=3333][prop(crc)<3636] 
+way["highway"]["name"][prop(crc)>=3333][prop(crc)<3636]
 {
         color: #f0b9a6;
@@ -805 +832 @@
         text-halo-color: #8fbc8f;
 }
-way["highway"]["name"][prop(crc)>=3636][prop(crc)<3939] 
+way["highway"]["name"][prop(crc)>=3636][prop(crc)<3939]
 {
         color: #8fbc8f;
@@ -827 +854 @@
         text-halo-color: #1b7777;
 }
-way["highway"]["name"][prop(crc)>=3939][prop(crc)<4242] 
+way["highway"]["name"][prop(crc)>=3939][prop(crc)<4242]
 {
         color: #1b7777;
@@ -849 +876 @@
         text-halo-color: #ff1493;
 }
-way["highway"]["name"][prop(crc)>=4242][prop(crc)<4545] 
+way["highway"]["name"][prop(crc)>=4242][prop(crc)<4545]
 {
         color: #ff1493;
@@ -871 +898 @@
         text-halo-color: #0072e2;
 }
-way["highway"]["name"][prop(crc)>=4545][prop(crc)<4848] 
+way["highway"]["name"][prop(crc)>=4545][prop(crc)<4848]
 {
         color: #0072e2;
@@ -893 +920 @@
         text-halo-color: #008f00;
 }
-way["highway"]["name"][prop(crc)>=4848][prop(crc)<5151] 
+way["highway"]["name"][prop(crc)>=4848][prop(crc)<5151]
 {
         color: #008f00;
@@ -915 +942 @@
         text-halo-color: #ffcc00;
 }
-way["highway"]["name"][prop(crc)>=5151][prop(crc)<5454] 
+way["highway"]["name"][prop(crc)>=5151][prop(crc)<5454]
 {
         color: #ffcc00;
@@ -959 +986 @@
         text-halo-color: #adff2f;
 }
-way["highway"]["name"][prop(crc)>=5757][prop(crc)<6060] 
+way["highway"]["name"][prop(crc)>=5757][prop(crc)<6060]
 {
         color: #adff2f;
@@ -981 +1008 @@
         text-halo-color: #ff69b4;
 }
-way["highway"]["name"][prop(crc)>=6060][prop(crc)<6363] 
+way["highway"]["name"][prop(crc)>=6060][prop(crc)<6363]
 {
         color: #ff69b4;
@@ -1025 +1052 @@
         text-halo-color: #7d5a07;
 }
-way["highway"]["name"][prop(crc)>=6666][prop(crc)<6969]  
+way["highway"]["name"][prop(crc)>=6666][prop(crc)<6969]
 {
         color: #7d5a07;
@@ -1047 +1074 @@
         text-halo-color: #824600;
 }
-way["highway"]["name"][prop(crc)>=6969][prop(crc)<7272] 
+way["highway"]["name"][prop(crc)>=6969][prop(crc)<7272]
 {
         color: #824600;
@@ -1069 +1096 @@
         text-halo-color: #f08080;
 }
-way["highway"]["name"][prop(crc)>=7272][prop(crc)<7575] 
+way["highway"]["name"][prop(crc)>=7272][prop(crc)<7575]
 {
         color: #f08080;
@@ -1091 +1118 @@
         text-halo-color: #F75617;
 }
-way["highway"]["name"][prop(crc)>=7575][prop(crc)<7878] 
+way["highway"]["name"][prop(crc)>=7575][prop(crc)<7878]
 {
         color: #F75617;
@@ -1113 +1140 @@
         text-halo-color: #54d954;
 }
-way["highway"]["name"][prop(crc)>=7878][prop(crc)<8181] 
+way["highway"]["name"][prop(crc)>=7878][prop(crc)<8181]
 {
         color: #54d954;
@@ -1135 +1162 @@
         text-halo-color: #ba55d3;
 }
-way["highway"]["name"][prop(crc)>=8181][prop(crc)<8484] 
+way["highway"]["name"][prop(crc)>=8181][prop(crc)<8484]
 {
         color: #ba55d3;
@@ -1157 +1184 @@
         text-halo-color: #9370db;
 }
-way["highway"]["name"][prop(crc)>=8484][prop(crc)<8787] 
+way["highway"]["name"][prop(crc)>=8484][prop(crc)<8787]
 {
         color: #9370db;
@@ -1179 +1206 @@
         text-halo-color: #ff7c00;
 }
-way["highway"]["name"][prop(crc)>=8787][prop(crc)<9090] 
+way["highway"]["name"][prop(crc)>=8787][prop(crc)<9090]
 {
         color: #ff7c00;
@@ -1201 +1228 @@
         text-halo-color: #3cb371;
 }
-way["highway"]["name"][prop(crc)>=9090][prop(crc)<9393] 
+way["highway"]["name"][prop(crc)>=9090][prop(crc)<9393]
 {
         color: #3cb371;
@@ -1224 +1251 @@
 
 }
-way["highway"]["name"][prop(crc)>=9393][prop(crc)<9696] 
+way["highway"]["name"][prop(crc)>=9393][prop(crc)<9696]
 {
         color: #707000;
@@ -1252 +1279 @@
 }
 
+/* ------------------------------------------------------------------------------------------------------------------------ */
+/* ------------------------------------------------------------------------------------------------------------------------ */
 /* ------------------------------------------------------------------------------------------------------------------------ */
 
@@ -1324 +1353 @@
         /* street with addr:*=* */
 way["highway"]["addr:country"],
-way["highway"]["addr:postcode"][!prop(style_allow_postcode_on_highway)],
+way["highway"]["addr:postcode"][prop(allow_postcode)=false],
 way["highway"]["addr:city"],
 way["highway"]["addr:street"],
@@ -1338 +1367 @@
         text-halo-color: red;
         text-halo-radius: 2;
-
 }
 
@@ -1361 +1389 @@
 }
 
-
         /* names of nodes */
 node["addr:housenumber"]
@@ -1401 +1428 @@
         font-size: 12;
         text-position: center;
-
 }
 
@@ -1427 +1453 @@
         dashes: 20,4;
         dashes-background-color: #FFFF00;
-        
 }
 }}}