Changeset 34896 in osm for applications/editors/josm/plugins/seachart/src/render/Rules.java

Timestamp:

2019-02-15T18:17:18+01:00 (6 years ago)

Author:

malcolmh

Message:

refine light sectors

File:

• applications/editors/josm/plugins/seachart/src/render/Rules.java (modified) (4 diffs)

applications/editors/josm/plugins/seachart/src/render/Rules.java

@@ -121 +121 @@
                         }
                 }
-                return (name != null) ? (String) name.val : null;
+                return (name != null) ? ((String) name.val).replace(""", "\"") : null;
         }
 
@@ -430 +430 @@
                         if (testAttribute(feature.type, Att.CATPRA, CatPRA.PRA_WFRM)) {
                                 Renderer.symbol(Areas.WindFarm);
-                                Renderer.lineVector(new LineStyle(Color.black, 20, new float[] { 40, 40 }));
-                                addName(15, new Font("Arial", Font.BOLD, 80), new Delta(Handle.TC, AffineTransform.getTranslateInstance(0, 10)));
+                                Renderer.lineVector(new LineStyle(Color.black, 12, new float[] { 40, 40 }));
+                                addName(15, new Font("Arial", Font.BOLD, 80), new Delta(Handle.TC, AffineTransform.getTranslateInstance(0, 120)));
                         }
                         break;
@@ -954 +954 @@
         @SuppressWarnings("unchecked")
         private static void landmarks() {
-                if (!hasAttribute(Obj.LNDMRK, Att.CATLMK) && (!hasAttribute(Obj.LNDMRK, Att.FUNCTN) || testAttribute(Obj.LNDMRK, Att.FUNCTN, FncFNC.FNC_LGHT)) && hasObject(Obj.LIGHTS))
+                if (!hasAttribute(Obj.LNDMRK, Att.CATLMK) && (!hasAttribute(Obj.LNDMRK, Att.FUNCTN) || testAttribute(Obj.LNDMRK, Att.FUNCTN, FncFNC.FNC_LGHT)) && hasObject(Obj.LIGHTS)) {
                         lights();
+                        addName(15, new Font("Arial", Font.BOLD, 40), new Delta(Handle.BL, AffineTransform.getTranslateInstance(60, -50)));
+                }
                 else if (Renderer.zoom >= 12) {
                         switch (feature.type) {
@@ -981 +983 @@
                                 break;
                         }
-                        if (Renderer.zoom >= 15)
-                                addName(15, new Font("Arial", Font.BOLD, 40), new Delta(Handle.BL, AffineTransform.getTranslateInstance(60, -50)));
                         Signals.addSignals();
+            addName(15, new Font("Arial", Font.BOLD, 40), new Delta(Handle.BL, AffineTransform.getTranslateInstance(60, -50)));
                 }
         }