Changeset 33350 in osm for applications

Timestamp:

2017-05-31T16:43:56+02:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 11722

Location:

applications/editors/josm/plugins/public_transport_layer

Files:

• build.xml (modified) (1 diff)
• src/ptl/PublicTransportLayer.java (modified) (4 diffs)

applications/editors/josm/plugins/public_transport_layer/build.xml

@@ -3 +3 @@
 
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="10808"/>
+    <property name="plugin.main.version" value="11722"/>
 
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/public_transport_layer/src/ptl/PublicTransportLayer.java

@@ -6 +6 @@
 import java.awt.BasicStroke;
 import java.awt.Color;
-import java.awt.Font;
 import java.awt.Graphics2D;
 import java.awt.event.ActionEvent;
@@ -28 +27 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.gui.mappaint.styleelement.LabelCompositionStrategy;
+import org.openstreetmap.josm.gui.mappaint.Cascade;
+import org.openstreetmap.josm.gui.mappaint.Environment;
+import org.openstreetmap.josm.gui.mappaint.MultiCascade;
+import org.openstreetmap.josm.gui.mappaint.StyleKeys;
 import org.openstreetmap.josm.gui.mappaint.styleelement.TextLabel;
 import org.openstreetmap.josm.tools.ColorHelper;
@@ -51 +53 @@
         }
         final StyledMapRenderer renderer = new StyledMapRenderer(g, mv, false);
+        renderer.getSettings(false);
 
         final Collection<Relation> selectedRelations = mv.getLayerManager().getEditLayer().data.getSelectedRelations();
@@ -87 +90 @@
 
     protected void drawRefLabels(StyledMapRenderer renderer, MultiMap<Pair<Node, Node>, String> segmentRefs) {
+        Environment env = new Environment();
+        env.mc = new MultiCascade();
+        Cascade c = env.mc.getOrCreateCascade("default");
+        c.put(StyleKeys.FONT_FAMILY, "SansSerif");
+        c.put(StyleKeys.FONT_SIZE, 16);
+        Color color = new Color(0x80FFFFFF, true);
+
         for (Pair<Node, Node> nodePair : segmentRefs.keySet()) {
             final String label = Utils.join(tr(", "), new TreeSet<>(segmentRefs.get(nodePair)));
-            final TextLabel text = new TextLabel(new LabelCompositionStrategy.StaticLabelCompositionStrategy(label),
-                    new Font("SansSerif", Font.PLAIN, 16), 0, 0, new Color(0x80FFFFFF, true), 0f, null);
+            c.put(StyleKeys.TEXT, label);
+            final TextLabel text = TextLabel.create(env, color, false);
             final Way way = new Way();
             way.addNode(nodePair.a);
             way.addNode(nodePair.b);
-            renderer.drawTextOnPath(way, text);
+            renderer.drawText(way, text);
         }
     }