Changeset 7383 in josm

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.

Location:

trunk

Files:

• data/fonts (added)
• data/fonts/DroidSans-Bold.ttf (added)
• data/fonts/DroidSans.ttf (added)
• src/org/openstreetmap/josm/gui/MainApplication.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/mappaint/LineTextElemStyle.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/mappaint/TextElement.java (modified) (1 diff)
• src/org/openstreetmap/josm/tools/FontsManager.java (added)
• styles/standard/elemstyles.mapcss (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -60 +60 @@
 import org.openstreetmap.josm.plugins.PluginInformation;
 import org.openstreetmap.josm.tools.BugReportExceptionHandler;
+import org.openstreetmap.josm.tools.FontsManager;
 import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -346 +347 @@
         Main.pref.updateSystemProperties();
 
+        FontsManager.initialize();
+        
         final JFrame mainFrame = new JFrame(tr("Java OpenStreetMap Editor"));
         Main.parent = mainFrame;

trunk/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java

@@ -34 +34 @@
     }
 
-    public static AreaElemStyle create(Cascade c) {
+    public static AreaElemStyle create(final Environment env) {
+        final Cascade c = env.mc.getCascade(env.layer);
         MapImage fillImage = null;
         Color color = null;
@@ -75 +76 @@
         Keyword textPos = c.get(TEXT_POSITION, null, Keyword.class);
         if (textPos == null || "center".equals(textPos.val)) {
-            text = TextElement.create(c, PaintColors.AREA_TEXT.get(), true);
+            text = TextElement.create(env, PaintColors.AREA_TEXT.get(), true);
         }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java

@@ -111 +111 @@
         Cascade c = env.mc.getCascade(env.layer);
 
-        TextElement text = TextElement.create(c, DEFAULT_TEXT_COLOR, false);
+        TextElement text = TextElement.create(env, DEFAULT_TEXT_COLOR, false);
         if (text == null) return null;
         // Skip any primitives that don't have text to draw. (Styles are recreated for any tag change.)

trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java

@@ -112 +112 @@
                 n = DEFAULT_FONT_NAME;
                 if (n == null) {
-                    DEFAULT_FONT_NAME = n = Main.pref.get("mappaint.font", "Helvetica");
+                    DEFAULT_FONT_NAME = n = Main.pref.get("mappaint.font", "Droid Sans");
                 }
             }
@@ -174 +174 @@
     }
 
-    protected static Font getFont(Cascade c) {
+    protected static Font getFont(Cascade c, String s) {
         String name = c.get("font-family", getDefaultFontName(), String.class);
         float size = c.get("font-size", getDefaultFontSize(), Float.class);
@@ -185 +185 @@
             style = Font.ITALIC;
         }
-        return getCachedFont(name, style | weight, Math.round(size));
+        Font f = getCachedFont(name, style | weight, Math.round(size));
+        if (f.canDisplayUpTo(s) == -1)
+            return f;
+        else {
+            // fallback if the string contains characters that cannot be
+            // rendered by the selected font
+            return getCachedFont("SansSerif", style | weight, Math.round(size));
+        }
     }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java

@@ -337 +337 @@
             Cascade c = e.getValue();
             if (osm instanceof Way) {
-                addIfNotNull(sl, AreaElemStyle.create(c));
+                addIfNotNull(sl, AreaElemStyle.create(env));
                 addIfNotNull(sl, RepeatImageElemStyle.create(env));
                 addIfNotNull(sl, LineElemStyle.createLine(env));
@@ -354 +354 @@
             } else if (osm instanceof Relation) {
                 if (((Relation)osm).isMultipolygon()) {
-                    addIfNotNull(sl, AreaElemStyle.create(c));
+                    addIfNotNull(sl, AreaElemStyle.create(env));
                     addIfNotNull(sl, RepeatImageElemStyle.create(env));
                     addIfNotNull(sl, LineElemStyle.createLine(env));

trunk/src/org/openstreetmap/josm/gui/mappaint/LineTextElemStyle.java

@@ -18 +18 @@
         this.text = text;
     }
-    public static LineTextElemStyle create(Environment env) {
-        Cascade c = env.mc.getCascade(env.layer);
+    public static LineTextElemStyle create(final Environment env) {
+        final Cascade c = env.mc.getCascade(env.layer);
 
         Keyword textPos = c.get(TEXT_POSITION, null, Keyword.class);
@@ -25 +25 @@
             return null;
 
-        TextElement text = TextElement.create(c, PaintColors.TEXT.get(), false);
+        TextElement text = TextElement.create(env, PaintColors.TEXT.get(), false);
         if (text == null)
             return null;

trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java

@@ -116 +116 @@
      * @throws IllegalArgumentException thrown if {@code defaultTextColor} is null
      */
-    public static TextElement create(Cascade c, Color defaultTextColor, boolean defaultAnnotate)  throws IllegalArgumentException{
+    public static TextElement create(Environment env, Color defaultTextColor, boolean defaultAnnotate)  throws IllegalArgumentException{
         CheckParameterUtil.ensureParameterNotNull(defaultTextColor);
+        Cascade c = env.mc.getCascade(env.layer);
 
         LabelCompositionStrategy strategy = buildLabelCompositionStrategy(c, defaultAnnotate);
         if (strategy == null) return null;
-        Font font = ElemStyle.getFont(c);
+        String s = strategy.compose(env.osm);
+        if (s == null) return null;
+        Font font = ElemStyle.getFont(c, s);
 
         float xOffset = 0;

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; }
 
 /**************/