Changeset 35114 in osm

Timestamp:

2019-09-19T14:24:33+02:00 (5 years ago)

Author:

malcolmh

Message:

[Seachart] Publish new release

Location:

applications/editors/josm/plugins/seachart/src/render

Files:

• Rules.java (modified) (1 diff)
• Signals.java (modified) (4 diffs)

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

@@ -963 +963 @@
                 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) {
+                } else if (Renderer.zoom >= 12) {
                         switch (feature.type) {
                         case LNDMRK:

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

@@ -18 +18 @@
 import s57.S57val.CatROS;
 import s57.S57val.CatRTB;
+import s57.S57val.CatRAS;
 import s57.S57val.ColCOL;
 import s57.S57val.LitCHR;
@@ -108 +109 @@
                         fogSignals();
                 if (feature.objs.containsKey(Obj.RTPBCN))
-                        radarStations();
+                        radarTransponders();
                 if (feature.objs.containsKey(Obj.RADSTA))
                         radarStations();
@@ -201 +202 @@
         }
 
-        public static void radarStations() {
-                if (Renderer.zoom >= 11)
-                        Renderer.symbol(Beacons.RadarStation);
-                if (Renderer.zoom >= 15) {
-                        String bstr = "";
-                        CatRTB cat = (CatRTB) getAttEnum(Obj.RTPBCN, Att.CATRTB);
-                        String wal = getAttStr(Obj.RTPBCN, Att.RADWAL);
+    public static void radarStations() {
+        if (Renderer.zoom >= 11)
+            Renderer.symbol(Beacons.RadarStation);
+        if (Renderer.zoom >= 15) {
+            CatRAS cat = (CatRAS) getAttEnum(Obj.RADSTA, Att.CATRAS);
+            if (cat == CatRAS.RAS_COST) {
+                Renderer.labelText("Ra", new Font("Arial", Font.PLAIN, 40), Symbols.Msymb, new Delta(Handle.TR, AffineTransform.getTranslateInstance(-60, -70)));
+            }
+        }
+    }
+
+    public static void radarTransponders() {
+        if (Renderer.zoom >= 11)
+            Renderer.symbol(Beacons.RadarStation);
+        if (Renderer.zoom >= 15) {
+            String bstr = "";
+            CatRTB cat = (CatRTB) getAttEnum(Obj.RTPBCN, Att.CATRTB);
+            String wal = getAttStr(Obj.RTPBCN, Att.RADWAL);
             if ((cat == CatRTB.RTB_RAMK) || (cat == CatRTB.RTB_RACN)) {
                 switch (cat) {
@@ -233 +245 @@
                 }
             }
-                        if (!wal.isEmpty()) {
-                                switch (wal) {
-                                case "0.03-X":
-                                        bstr += "(3cm)";
-                                        break;
-                                case "0.10-S":
-                                        bstr += "(10cm)";
-                                        break;
-                                }
-                        }
-                        if (!bstr.isEmpty()) {
-                                Renderer.labelText(bstr, new Font("Arial", Font.PLAIN, 40), Symbols.Msymb, new Delta(Handle.TR, AffineTransform.getTranslateInstance(-30, -70)));
-                        }
-                }
-        }
+            if (!wal.isEmpty()) {
+                switch (wal) {
+                case "0.03-X":
+                    bstr += "(3cm)";
+                    break;
+                case "0.10-S":
+                    bstr += "(10cm)";
+                    break;
+                }
+            }
+            if (!bstr.isEmpty()) {
+                Renderer.labelText(bstr, new Font("Arial", Font.PLAIN, 40), Symbols.Msymb, new Delta(Handle.TR, AffineTransform.getTranslateInstance(-30, -70)));
+            }
+        }
+    }
 
         @SuppressWarnings("unchecked")