Changeset 30123 in osm for applications/editors/josm/plugins/smed2/src/seamap/Rules.java

Timestamp:

2013-12-10T22:02:45+01:00 (12 years ago)

Author:

malcolmh

Message:

save

File:

• applications/editors/josm/plugins/smed2/src/seamap/Rules.java (modified) (4 diffs)

applications/editors/josm/plugins/smed2/src/seamap/Rules.java

@@ -381 +381 @@
                                         Renderer.lineSymbols(feature, Areas.CableDash, 0, Areas.CableDot, null, 2, Color.black);
                                 }
+                                if (atts != null) {
+                                        if (atts.containsKey(Att.VERCLR)) {
+                                                Renderer.labelText(feature, String.valueOf((Double) atts.get(Att.VERCLR).val), new Font("Arial", Font.PLAIN, 50), LabelStyle.VCLR, Color.black, new Delta(Handle.TC, AffineTransform.getTranslateInstance(0,25)));
+                                        } else if (atts.containsKey(Att.VERCSA)) {
+                                                Renderer.labelText(feature, String.valueOf((Double) atts.get(Att.VERCSA).val), new Font("Arial", Font.PLAIN, 50), LabelStyle.PCLR, Color.black, new Delta(Handle.TC, AffineTransform.getTranslateInstance(0,25)));
+                                        }
+                                }
                         }
                 }
@@ -876 +883 @@
 
         private static void pipelines(Feature feature) {
-                if (zoom >= 14) {
+                if ((zoom >= 16) && (feature.length < 2)) {
                         if (feature.type == Obj.PIPSOL) {
                                 Renderer.lineSymbols(feature, Areas.Pipeline, 1.0, null, null, 0, Renderer.Mline);
                         } else if (feature.type == Obj.PIPOHD) {
-
+                                Renderer.lineVector(feature, new LineStyle(Color.black, 8));
+                                AttMap atts = feature.objs.get(Obj.PIPOHD).get(0);
+                                double verclr = 0;
+                                if (atts != null) {
+                                        if (atts.containsKey(Att.VERCLR)) {
+                                                verclr = (Double) atts.get(Att.VERCLR).val;
+                                        } else {
+                                                verclr = atts.containsKey(Att.VERCSA) ? (Double) atts.get(Att.VERCSA).val : 0;
+                                        }
+                                        if (verclr > 0) {
+                                                Renderer.labelText(feature, String.valueOf(verclr), new Font("Arial", Font.PLAIN, 50), LabelStyle.VCLR, Color.black, new Delta(Handle.TC, AffineTransform.getTranslateInstance(0,25)));
+                                        }
+                                }
                         }
                 }
@@ -961 +980 @@
         private static void stations(Feature feature) {
                 if (zoom >= 14) {
+                        String str = "";
                         switch (feature.type) {
                         case SISTAT:
                         case SISTAW:
                                 Renderer.symbol(feature, Harbours.SignalStation);
-                                String str = "SS";
+                                str = "SS";
                                 //  Append (cat) to str
-                                Renderer.labelText(feature, str, new Font("Arial", Font.PLAIN, 40), LabelStyle.NONE, Color.black, null, new Delta(Handle.LC, AffineTransform.getTranslateInstance(30, 0)));
                                 break;
                         case RDOSTA:
@@ -982 +1001 @@
                         case CGUSTA:
                                 Renderer.symbol(feature, Harbours.SignalStation);
-                                Renderer.labelText(feature, "CG", new Font("Arial", Font.PLAIN, 40), LabelStyle.NONE, Color.black, null, new Delta(Handle.LC, AffineTransform.getTranslateInstance(30, 0)));
+                                str = "CG";
                                 break;
                         case RSCSTA:
                                 Renderer.symbol(feature, Harbours.Rescue);
                                 break;
+                        }
+                        if ((zoom >= 15) && !str.isEmpty()) {
+                                Renderer.labelText(feature, str, new Font("Arial", Font.PLAIN, 40), LabelStyle.NONE, Color.black, null, new Delta(Handle.LC, AffineTransform.getTranslateInstance(30, 0)));
                         }
                 }