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

Timestamp:

2015-02-15T19:38:42+01:00 (11 years ago)

Author:

malcolmh

Message:

Rules debugs

File:

• applications/editors/josm/plugins/seachart/src/render/Signals.java (modified) (6 diffs)

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

@@ -107 +107 @@
                 String str = "";
                 if (atts.containsKey(Att.CATFOG)) {
-                        str += fogSignals.get(atts.get(Att.CATFOG).val);
+                        str += fogSignals.get(((ArrayList<?>)(atts.get(Att.CATFOG).val)).get(0));
                 }
                 if (atts.containsKey(Att.SIGGRP)) {
@@ -128 +128 @@
                 Renderer.symbol(feature, Beacons.RadarStation);
                 String bstr = "";
-                CatRTB cat = (CatRTB) Rules.getAttVal(feature, Obj.RTPBCN, 0, Att.CATRTB);
-                String wal = (String) Rules.getAttVal(feature, Obj.RTPBCN, 0, Att.RADWAL);
+                CatRTB cat = (CatRTB) Rules.getAttEnum(feature, Obj.RTPBCN, 0, Att.CATRTB);
+                String wal = Rules.getAttStr(feature, Obj.RTPBCN, 0, Att.RADWAL);
                 switch (cat) {
                 case RTB_RAMK:
@@ -136 +136 @@
                 case RTB_RACN:
                         bstr += " Racon";
-                        String astr = (String) Rules.getAttVal(feature, Obj.RTPBCN, 0, Att.SIGGRP);
+                        String astr = Rules.getAttStr(feature, Obj.RTPBCN, 0, Att.SIGGRP);
                         if (!astr.isEmpty()) {
                                 bstr += "(" + astr + ")";
@@ -142 +142 @@
                         Double per = (Double) Rules.getAttVal(feature, Obj.RTPBCN, 0, Att.SIGPER);
                         Double mxr = (Double) Rules.getAttVal(feature, Obj.RTPBCN, 0, Att.VALMXR);
-                        if ((per != 0) || (mxr != 0)) {
+                        if ((per != null) || (mxr != null)) {
                                 bstr += (astr.isEmpty() ? " " : "");
-                                bstr += (per != 0) ? per.toString() + "s" : "";
-                                bstr += (mxr != 0) ? mxr.toString() + "M" : "";
+                                if (per != null) bstr += (per != 0) ? per.toString() + "s" : "";
+                                if (mxr != null) bstr += (mxr != 0) ? mxr.toString() + "M" : "";
                         }
                         break;
@@ -151 +151 @@
                         break;
                 }
-                if (wal!= null) {
+                if (!wal.isEmpty()) {
                         switch (wal) {
                         case "0.03-X":
@@ -168 +168 @@
         public static void radioStations(Feature feature) {
                 Renderer.symbol(feature, Beacons.RadarStation);
-                ArrayList<CatROS> cats = (ArrayList<CatROS>)Rules.getAttVal(feature, Obj.RDOSTA, 0, Att.CATROS);
+                ArrayList<CatROS> cats = (ArrayList<CatROS>)Rules.getAttList(feature, Obj.RDOSTA, 0, Att.CATROS);
                 boolean vais = false;
                 String bstr = "";