Changeset 35086 in osm for applications/editors/josm/plugins/seachart/src/render/Signals.java

Timestamp:

2019-08-15T09:28:54+02:00 (7 years ago)

Author:

malcolmh

Message:

[Seachart] Publish new release

File:

• applications/editors/josm/plugins/seachart/src/render/Signals.java (modified) (1 diff)

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

@@ -208 +208 @@
                         CatRTB cat = (CatRTB) getAttEnum(Obj.RTPBCN, Att.CATRTB);
                         String wal = getAttStr(Obj.RTPBCN, Att.RADWAL);
-                        switch (cat) {
-                        case RTB_RAMK:
-                                bstr += " Ramark";
-                                break;
-                        case RTB_RACN:
-                                bstr += " Racon";
-                                String astr = getAttStr(Obj.RTPBCN, Att.SIGGRP);
-                                if (!astr.isEmpty()) {
-                                        bstr += "(" + astr + ")";
-                                }
-                                Double per = (Double) getAttVal(Obj.RTPBCN, Att.SIGPER);
-                                Double mxr = (Double) getAttVal(Obj.RTPBCN, Att.VALMXR);
-                                if ((per != null) || (mxr != null)) {
-                                        bstr += (astr.isEmpty() ? " " : "");
-                                        if (per != null)
-                                                bstr += (per != 0) ? per.toString() + "s" : "";
-                                        if (mxr != null)
-                                                bstr += (mxr != 0) ? mxr.toString() + "M" : "";
-                                }
-                                break;
-                        default:
-                                break;
-                        }
+            if ((cat == CatRTB.RTB_RAMK) || (cat == CatRTB.RTB_RACN)) {
+                switch (cat) {
+                case RTB_RAMK:
+                    bstr += " Ramark";
+                    break;
+                case RTB_RACN:
+                    bstr += " Racon";
+                    break;
+                default:
+                    break;
+                }
+                String astr = getAttStr(Obj.RTPBCN, Att.SIGGRP);
+                if (!astr.isEmpty()) {
+                    bstr += "(" + astr + ")";
+                }
+                Double per = (Double) getAttVal(Obj.RTPBCN, Att.SIGPER);
+                Double mxr = (Double) getAttVal(Obj.RTPBCN, Att.VALMXR);
+                if ((per != null) || (mxr != null)) {
+                    bstr += (astr.isEmpty() ? " " : "");
+                    if (per != null)
+                        bstr += (per != 0) ? per.toString() + "s" : "";
+                    if (mxr != null)
+                        bstr += (mxr != 0) ? mxr.toString() + "M" : "";
+                }
+            }
                         if (!wal.isEmpty()) {
                                 switch (wal) {