Changeset 7383 in josm for trunk/styles

Timestamp:

2014-08-13T16:42:17+02:00 (10 years ago)

Author:

bastiK

Message:

applied #10301 - extend display of maxspeed nodes (patch by Klumbumbus)
Include Droid Sans font in the JOSM binary distribution.
This unifies the font rendering on different platforms and allows geometric constructions with text (as demonstrated for maxspeed). Both regular and bold style are available.

File:

• trunk/styles/standard/elemstyles.mapcss (modified) (3 diffs)

trunk/styles/standard/elemstyles.mapcss

@@ -272 +272 @@
 node[maxlength] {
     icon-image: "vehicle/restriction/maxlength.png";
-}
-node[maxspeed] {
-    icon-image: "vehicle/restriction/speed.png";
 }
 node[minspeed] {
@@ -3546 +3543 @@
 }
 
+/******************/
+/* maxspeed nodes */
+/******************/
+node[maxspeed=none] {
+    icon-image: "vehicle/restriction/maxspeed_none.svg";
+}
+node[maxspeed=~/^[0-9]+$/] {
+    maxspeedprop: tag(maxspeed);
+    set maxspeedclass;
+}
+node[maxspeed=signals] {
+    maxspeedprop: " ?";
+    set maxspeedclass;
+}
+node[maxspeed=~/^[0-9]+ mph/] {
+    maxspeedprop: get(split(" mph",tag(maxspeed)),0);
+    set maxspeedclass;
+}
+node[maxspeed=~/[0-9]+ km\/h/] {
+    maxspeedprop: get(split(" km/h",tag(maxspeed)),0);
+    set maxspeedclass;
+}
+node[maxspeed=~/[0-9]+ knots/] {
+    maxspeedprop: get(split(" knots",tag(maxspeed)),0);
+    set maxspeedclass;
+}
+node[prop(maxspeedclass, default)][!is_prop_set(icon-image, default)]::core_maxnodebg {
+    /* background (white) */
+    symbol-shape: circle;
+    symbol-size: 17;
+    symbol-fill-color: white;
+    major-z-index: 4.2;
+}
+node[maxspeed]["maxspeed:variable"]["maxspeed:variable"!="no"][!is_prop_set(icon-image, default)]::core_maxnodebg,
+node[maxspeed=signals][!is_prop_set(icon-image, default)]::core_maxnodebg {
+    /* background (black) */
+    symbol-fill-color: black;
+}
+node[prop(maxspeedclass, default)][!is_prop_set(icon-image, default)]::core_maxnodefg {
+    /* foreground (black text and red circle) */
+    symbol-shape: circle;
+    symbol-size: 15;
+    symbol-stroke-color: crimson;
+    symbol-stroke-width: 2;
+    text: prop(maxspeedprop, default);
+    font-size: 8;
+    font-weight: bold;
+    font-family: "Droid Sans";
+    text-color: black;
+    text-anchor-horizontal: center;
+    text-anchor-vertical: center;
+    text-offset-x: 0;
+    text-offset-y: -1;
+    major-z-index: 4.2;
+}
+node[maxspeed]["maxspeed:variable"]["maxspeed:variable"!="no"][!is_prop_set(icon-image, default)]::core_maxnodefg,
+node[maxspeed=signals][!is_prop_set(icon-image, default)]::core_maxnodefg {
+    /* foreground (white text) */
+    text-color: white;
+}
+
 /***************/
 /* zoom levels */
@@ -3590 +3648 @@
 }
 
-node|z20,area|z20   { font-size: 9; }
-node|z21,area|z21   { font-size: 10; }
-node|z22-,area|z22- { font-size: 11; }
+node|z19,area|z19   { font-size: 9; }
+node|z20-,area|z20-   { font-size: 10; }
 
 /**************/