Changeset 29340 in osm for applications/editors/josm/plugins

Timestamp:

2013-03-03T23:15:59+01:00 (12 years ago)

Author:

malcolmh

Message:

save

Location:

applications/editors/josm/plugins/smed2/src

Files:

• seamap/Lights.java (moved) (moved from applications/editors/josm/plugins/smed2/src/seamap/LightRender.java ) (1 diff)
• seamap/NoticeRender.java (deleted)
• seamap/Rules.java (modified) (2 diffs)
• smed2/Smed2Action.java (modified) (3 diffs)
• symbols/Notices.java (modified) (6 diffs)

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

@@ -10 +10 @@
 package seamap;
 
-public class LightRender {
+public class Lights {
 
 /*

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

@@ -15 +15 @@
 import java.util.ArrayList;
 
+import s57.S57val;
 import s57.S57val.*;
 import s57.S57att.*;
@@ -466 +467 @@
 */
         }
+
         private static void notices(Feature feature) {
                 if (zoom >= 14) {
+                        double dx = 0.0, dy = 0.0;
+                        switch (feature.type) {
+                        case BCNCAR:
+                        case BCNISD:
+                        case BCNLAT:
+                        case BCNSAW:
+                        case BCNSPP:
+                        case BCNWTW:
+                                dy = 45.0;
+                                break;
+                        case NOTMRK:
+                                dy = 0.0;
+                                break;
+                        default:
+                                return;
+                        }
+                        Symbol s1 = null, s2 = null;
+                        MarSYS sys = MarSYS.SYS_CEVN;
+                        AttItem att = feature.atts.get(Att.MARSYS);
+                        if (att != null) sys = (MarSYS)att.val;
+                        ObjTab objs = feature.objs.get(Obj.NOTMRK);
+                        int n = objs.size();
+                        if (n > 2) {
+                                s1 = Notices.Notice;
+                                n = 1;
+                        } else {
+                                for (AttMap atts : objs.values()) {
+                                        if (atts.get(Att.MARSYS) != null) sys = (MarSYS)atts.get(Att.MARSYS).val;
+                                        CatNMK cat = CatNMK.NMK_UNKN;
+                                        if (atts.get(Att.CATNMK) != null) cat = (CatNMK)atts.get(Att.CATNMK).val;
+                                        s2 = Notices.getNotice(cat, sys);
+                                }
+                        }
+/*      Obj_t *obj = getObj(item, NOTMRK, i);
+      if (obj == NULL) continue;
+      Atta_t add;
+      int idx = 0;
+      while ((add = getAttEnum(obj, ADDMRK, idx++)) != MRK_UNKN) {
+        if ((add == MRK_LTRI) && (i == 2)) swap = true;
+        if ((add == MRK_RTRI) && (i != 2)) swap = true;
+      }
+    }
+  } else {
+        
+  }
+  for (int i = 0; i <=2; i++) {
+    Obj_t *obj = getObj(item, NOTMRK, i);
+    if (obj == NULL) continue;
+    Atta_t category = getAttEnum(obj, CATNMK, i);
+    Atta_t add;
+    int idx = 0;
+    int top=0, bottom=0, left=0, right=0;
+    while ((add = getAttEnum(obj, ADDMRK, idx++)) != MRK_UNKN) {
+      switch (add) {
+        case MRK_TOPB:
+          top = add;
+          break;
+        case MRK_BOTB:
+        case MRK_BTRI:
+          bottom = add;
+          break;
+        case MRK_LTRI:
+          left = add;
+          break;
+        case MRK_RTRI:
+          right = add;
+          break;
+        default:
+          break;
+      }
+    }
+    double orient = getAtt(obj, ORIENT) != NULL ? getAtt(obj, ORIENT)->val.val.f : 0.0;
+    int system = getAtt(obj, MARSYS) != NULL ? getAtt(obj, MARSYS)->val.val.e : 0;
+    double flip = 0.0;
+    char *symb = "";
+    char *base = "";
+    char *colour = "black";
+    if ((system == SYS_BWR2) || (system == SYS_BNWR)) {
+      symb = bniwr_map[category];
+      switch (category) {
+        case NMK_NANK:
+        case NMK_LMHR:
+        case NMK_KTPM...NMK_RSPD:
+        {
+          int bank = getAtt(obj, BNKWTW) != NULL ? getAtt(obj, BNKWTW)->val.val.e : 0;
+          switch (bank) {
+            case BWW_LEFT:
+              base = "notice_blb";
+              colour = "red";
+              break;
+            case BWW_RGHT:
+              base = "notice_brb";
+              colour = "green";
+              break;
+            default:
+              base = "notice_bsi";
+              colour = "black";
+              break;
+          }
+        }
+        default:
+          break;
+      }
+    } else if (system == SYS_PPWB) {
+      int bank = getAtt(obj, BNKWTW) != NULL ? getAtt(obj, BNKWTW)->val.val.e : 0;
+      if (bank != 0) {
+        switch (category) {
+          case NMK_WLAR:
+            if (bank == BNK_LEFT)
+              base = "notice_pwlarl";
+            else
+              base = "notice_pwlarr";
+            break;
+          case NMK_WRAL:
+            if (bank == BNK_LEFT)
+              base = "notice_pwrall";
+            else
+              base = "notice_pwralr";
+            break;
+          case NMK_KTPM:
+            if (bank == BNK_LEFT)
+              base = "notice_ppml";
+            else
+              base = "notice_ppmr";
+            break;
+          case NMK_KTSM:
+            if (bank == BNK_LEFT)
+              base = "notice_psml";
+            else
+              base = "notice_psmr";
+            break;
+          case NMK_KTMR:
+            if (bank == BNK_LEFT)
+              base = "notice_pmrl";
+            else
+              base = "notice_pmrr";
+            break;
+          case NMK_CRTP:
+          if (bank == BNK_LEFT)
+              base = "notice_pcpl";
+            else
+              base = "notice_pcpr";
+            break;
+          case NMK_CRTS:
+            if (bank == BNK_LEFT)
+              base = "notice_pcsl";
+            else
+              base = "notice_pcsr";
+            break;
+          default:
+            break;
+        }
+      }
+    } else {
+      symb = notice_map[category];
+      switch (category) {
+        case NMK_NOVK...NMK_NWSH:
+        case NMK_NMTC...NMK_NLBG:
+          base = "notice_a";
+          break;
+        case NMK_MVTL...NMK_CHDR:
+          base = "notice_b";
+          break;
+        case NMK_PRTL...NMK_PRTR:
+        case NMK_OVHC...NMK_LBGP:
+          base = "notice_e";
+          colour = "white";
+          break;
+        default:
+          break;
+      }
+      switch (category) {
+        case NMK_MVTL:
+        case NMK_ANKP:
+        case NMK_PRTL:
+        case NMK_MWAL:
+        case NMK_MWAR:
+          flip = 180.0;
+          break;
+        case NMK_SWWR:
+        case NMK_WRSL:
+        case NMK_WARL:
+          flip = -90.0;
+          break;
+        case NMK_SWWC:
+        case NMK_SWWL:
+        case NMK_WLSR:
+        case NMK_WALR:
+          flip = 90.0;
+          break;
+        default:
+          break;
+      }
+    }
+    if (n == 2) {
+      dx = (((i != 2) && swap) || ((i == 2) && !swap)) ? -30.0 : 30.0;
+    }
+    if (top == MRK_TOPB)
+      renderSymbol(item, NOTMRK, "notice_board", "", "", BC, dx, dy, orient);
+    if (bottom == MRK_BOTB)
+      renderSymbol(item, NOTMRK, "notice_board", "", "", BC, dx, dy, orient+180);
+    if (bottom == MRK_BTRI)
+      renderSymbol(item, NOTMRK, "notice_triangle", "", "", BC, dx, dy, orient+180);
+    if (left == MRK_LTRI)
+      renderSymbol(item, NOTMRK, "notice_triangle", "", "", BC, dx, dy, orient-90);
+    if (right == MRK_RTRI)
+      renderSymbol(item, NOTMRK, "notice_triangle", "", "", BC, dx, dy, orient+90);
+    renderSymbol(item, NOTMRK, base, "", "", CC, dx, dy, orient);
+    renderSymbol(item, NOTMRK, symb, "", colour, CC, dx, dy, orient+flip);
+  }
+*/
                 }
         }

applications/editors/josm/plugins/smed2/src/smed2/Smed2Action.java

@@ -50 +50 @@
                 @Override
                 public void dataChanged(DataChangedEvent e) {
-//                      System.out.println("DataChangedEvent");
-                        makeMap();
-                        if (rendering != null) rendering.zoomChanged();
+                        makeMap();
                 }
 
                 @Override
                 public void nodeMoved(NodeMovedEvent e) {
-//                      System.out.println("NodeMovedEvent");
-                        makeMap();
-                        if (rendering != null) rendering.zoomChanged();
+                        makeMap();
                 }
 
                 @Override
                 public void otherDatasetChange(AbstractDatasetChangedEvent e) {
-//                      System.out.println("AbstractDatasetChangedEvent");
-                        makeMap();
-                        if (rendering != null) rendering.zoomChanged();
+                        makeMap();
                 }
 
                 @Override
                 public void primitivesAdded(PrimitivesAddedEvent e) {
-//                      System.out.println("PrimitivesAddedEvent");
-                        makeMap();
-                        if (rendering != null) rendering.zoomChanged();
+                        makeMap();
                 }
 
                 @Override
                 public void primitivesRemoved(PrimitivesRemovedEvent e) {
-//                      System.out.println("PrimitivesRemovedEvent");
-                        makeMap();
-                        if (rendering != null) rendering.zoomChanged();
+                        makeMap();
                 }
 
                 @Override
                 public void relationMembersChanged(RelationMembersChangedEvent e) {
-//                      System.out.println("RelationMembersChangedEvent");
-                        makeMap();
-                        if (rendering != null) rendering.zoomChanged();
+                        makeMap();
                 }
 
                 @Override
                 public void tagsChanged(TagsChangedEvent e) {
-//                      System.out.println("TagsChangedEvent");
-                        makeMap();
-                        if (rendering != null) rendering.zoomChanged();
+                        makeMap();
                 }
 
                 @Override
                 public void wayNodesChanged(WayNodesChangedEvent e) {
-//                      System.out.println("WayNodesChangedEvent");
-                        makeMap();
-                        if (rendering != null) rendering.zoomChanged();
+                        makeMap();
                 }
         };
@@ -180 +164 @@
                         data = newLayer.data;
                         makeMap();
-                        if (rendering != null) rendering.zoomChanged();
                 } else {
                         data = null;
@@ -259 +242 @@
                                 map.tagsDone(rel.getUniqueId());
                         }
+                        if (rendering != null) rendering.zoomChanged();
                 }
         }

applications/editors/josm/plugins/smed2/src/symbols/Notices.java

@@ -15 +15 @@
 import java.awt.Rectangle;
 import java.awt.geom.*;
-
+import java.util.EnumMap;
+
+import s57.S57val.*;
 import symbols.Symbols.*;
 
@@ -252 +254 @@
                 NoticeA20.add(new Instr(Prim.SYMB, new Symbols.SubSymbol(Notices.Waterbike, 1.0, 0, 0, null, null)));
         }
+        public static final Symbol NoticeB1a = new Symbol();
+        public static final Symbol NoticeB1b = new Symbol();
         public static final Symbol NoticeB2a = new Symbol();
         public static final Symbol NoticeB2b = new Symbol();
@@ -259 +263 @@
         public static final Symbol NoticeB4b = new Symbol();
         public static final Symbol NoticeB5 = new Symbol();
+        public static final Symbol NoticeB6 = new Symbol();
         public static final Symbol NoticeB7 = new Symbol();
         public static final Symbol NoticeB8 = new Symbol();
-        public static final Symbol NoticeB11a = new Symbol();
-        static {
-                NoticeB11a.add(new Instr(Prim.SYMB, new Symbols.SubSymbol(Notices.NoticeB, 1.0, 0, 0, null, null)));
-                NoticeB11a.add(new Instr(Prim.SYMB, new Symbols.SubSymbol(Notices.VHF, 1.0, 0, 0, null, null)));
+        public static final Symbol NoticeB9a = new Symbol();
+        public static final Symbol NoticeB9b = new Symbol();
+        public static final Symbol NoticeB11 = new Symbol();
+        static {
+                NoticeB11.add(new Instr(Prim.SYMB, new Symbols.SubSymbol(Notices.NoticeB, 1.0, 0, 0, null, null)));
+                NoticeB11.add(new Instr(Prim.SYMB, new Symbols.SubSymbol(Notices.VHF, 1.0, 0, 0, null, null)));
         }
         public static final Symbol NoticeC1 = new Symbol();
         public static final Symbol NoticeC2 = new Symbol();
         public static final Symbol NoticeC3 = new Symbol();
+        public static final Symbol NoticeC4 = new Symbol();
         public static final Symbol NoticeC5a = new Symbol();
         public static final Symbol NoticeC5b = new Symbol();
@@ -275 +283 @@
         public static final Symbol NoticeD2a = new Symbol();
         public static final Symbol NoticeD2b = new Symbol();
+        public static final Symbol NoticeD3a = new Symbol();
+        public static final Symbol NoticeD3b = new Symbol();
         public static final Symbol NoticeE1 = new Symbol();
         public static final Symbol NoticeE2 = new Symbol();
@@ -280 +290 @@
         public static final Symbol NoticeE4a = new Symbol();
         public static final Symbol NoticeE4b = new Symbol();
+        public static final Symbol NoticeE5 = new Symbol();
+        public static final Symbol NoticeE5_1 = new Symbol();
+        public static final Symbol NoticeE5_2 = new Symbol();
+        public static final Symbol NoticeE5_3 = new Symbol();
         public static final Symbol NoticeE5_4 = new Symbol();
         public static final Symbol NoticeE5_5 = new Symbol();
@@ -292 +306 @@
         public static final Symbol NoticeE5_14 = new Symbol();
         public static final Symbol NoticeE5_15 = new Symbol();
+        public static final Symbol NoticeE6 = new Symbol();
+        public static final Symbol NoticeE7 = new Symbol();
         public static final Symbol NoticeE7_1 = new Symbol();
-        public static final Symbol Notice11 = new Symbol();
-        public static final Symbol Notice13 = new Symbol();
-        public static final Symbol Notice14 = new Symbol();
+        public static final Symbol NoticeE8 = new Symbol();
+        public static final Symbol NoticeE9a = new Symbol();
+        public static final Symbol NoticeE9b = new Symbol();
+        public static final Symbol NoticeE9c = new Symbol();
+        public static final Symbol NoticeE9d = new Symbol();
+        public static final Symbol NoticeE9e = new Symbol();
+        public static final Symbol NoticeE9f = new Symbol();
+        public static final Symbol NoticeE9g = new Symbol();
+        public static final Symbol NoticeE9h = new Symbol();
+        public static final Symbol NoticeE9i = new Symbol();
+        public static final Symbol NoticeE10a = new Symbol();
+        public static final Symbol NoticeE10b = new Symbol();
+        public static final Symbol NoticeE10c = new Symbol();
+        public static final Symbol NoticeE10d = new Symbol();
+        public static final Symbol NoticeE10e = new Symbol();
+        public static final Symbol NoticeE10f = new Symbol();
+        public static final Symbol NoticeE11 = new Symbol();
+        public static final Symbol NoticeE13 = new Symbol();
+        public static final Symbol NoticeE14 = new Symbol();
+        public static final Symbol NoticeE15 = new Symbol();
+        public static final Symbol NoticeE16 = new Symbol();
+        public static final Symbol NoticeE17 = new Symbol();
+        public static final Symbol NoticeE18 = new Symbol();
+        public static final Symbol NoticeE19 = new Symbol();
+        public static final Symbol NoticeE20 = new Symbol();
+        public static final Symbol NoticeE21 = new Symbol();
+        public static final Symbol NoticeE22 = new Symbol();
+        public static final Symbol NoticeE23 = new Symbol();
+        public static final Symbol NoticeE24 = new Symbol();
+
+        public static final EnumMap<CatNMK, Symbol> NmkCevni = new EnumMap<CatNMK, Symbol>(CatNMK.class);
+        static {
+                NmkCevni.put(CatNMK.NMK_UNKN, Notice); NmkCevni.put(CatNMK.NMK_NENT, NoticeA1); NmkCevni.put(CatNMK.NMK_CLSA, NoticeA1a); NmkCevni.put(CatNMK.NMK_NOVK, NoticeA2);
+                NmkCevni.put(CatNMK.NMK_NCOV, NoticeA3); NmkCevni.put(CatNMK.NMK_NPAS, NoticeA4); NmkCevni.put(CatNMK.NMK_NBRT, NoticeA5); NmkCevni.put(CatNMK.NMK_NBLL, NoticeA5_1);
+                NmkCevni.put(CatNMK.NMK_NANK, NoticeA6); NmkCevni.put(CatNMK.NMK_NMOR, NoticeA7); NmkCevni.put(CatNMK.NMK_NTRN, NoticeA8); NmkCevni.put(CatNMK.NMK_NWSH, NoticeA9);
+                NmkCevni.put(CatNMK.NMK_NPSL, NoticeA10a); NmkCevni.put(CatNMK.NMK_NPSR, NoticeA10b); NmkCevni.put(CatNMK.NMK_NMTC, NoticeA12); NmkCevni.put(CatNMK.NMK_NSPC, NoticeA13);
+                NmkCevni.put(CatNMK.NMK_NWSK, NoticeA14); NmkCevni.put(CatNMK.NMK_NSLC, NoticeA15); NmkCevni.put(CatNMK.NMK_NUPC, NoticeA16); NmkCevni.put(CatNMK.NMK_NSLB, NoticeA17);
+                NmkCevni.put(CatNMK.NMK_NWBK, NoticeA20); NmkCevni.put(CatNMK.NMK_NHSC, NoticeA18); NmkCevni.put(CatNMK.NMK_NLBG, NoticeA19);
+                NmkCevni.put(CatNMK.NMK_MVTL, NoticeB1a); NmkCevni.put(CatNMK.NMK_MVTR, NoticeB1b); NmkCevni.put(CatNMK.NMK_MVTP, NoticeB2a); NmkCevni.put(CatNMK.NMK_MVTS, NoticeB2b);
+                NmkCevni.put(CatNMK.NMK_KPTP, NoticeB3a); NmkCevni.put(CatNMK.NMK_KPTS, NoticeB3b); NmkCevni.put(CatNMK.NMK_CSTP, NoticeB4a); NmkCevni.put(CatNMK.NMK_CSTS, NoticeB4b);
+                NmkCevni.put(CatNMK.NMK_STOP, NoticeB5); NmkCevni.put(CatNMK.NMK_SPDL, NoticeB6); NmkCevni.put(CatNMK.NMK_SHRN, NoticeB7); NmkCevni.put(CatNMK.NMK_KPLO, NoticeB8);
+                NmkCevni.put(CatNMK.NMK_GWJN, NoticeB9a); NmkCevni.put(CatNMK.NMK_GWCS, NoticeB9b); NmkCevni.put(CatNMK.NMK_MKRC, NoticeB11);
+                NmkCevni.put(CatNMK.NMK_LMDP, NoticeC1); NmkCevni.put(CatNMK.NMK_LMHR, NoticeC2);       NmkCevni.put(CatNMK.NMK_LMWD, NoticeC3); NmkCevni.put(CatNMK.NMK_NAVR, NoticeC4);
+                NmkCevni.put(CatNMK.NMK_CHDL, NoticeC5a); NmkCevni.put(CatNMK.NMK_CHDR, NoticeC5b);
+                NmkCevni.put(CatNMK.NMK_CHTW, NoticeD1a); NmkCevni.put(CatNMK.NMK_CHOW, NoticeD1b); NmkCevni.put(CatNMK.NMK_OPTR, NoticeD2a); NmkCevni.put(CatNMK.NMK_OPTL, NoticeD2b);
+                NmkCevni.put(CatNMK.NMK_PRTL, NoticeD3a); NmkCevni.put(CatNMK.NMK_PRTR, NoticeD3b);
+                NmkCevni.put(CatNMK.NMK_ENTP, NoticeE1); NmkCevni.put(CatNMK.NMK_OVHC, NoticeE2);       NmkCevni.put(CatNMK.NMK_WEIR, NoticeE3); NmkCevni.put(CatNMK.NMK_FERN, NoticeE4a);
+                NmkCevni.put(CatNMK.NMK_FERI, NoticeE4b); NmkCevni.put(CatNMK.NMK_BRTP, NoticeE5);      NmkCevni.put(CatNMK.NMK_BTLL, NoticeE5_1); NmkCevni.put(CatNMK.NMK_BTLS, NoticeE5_2);
+                NmkCevni.put(CatNMK.NMK_BTRL, NoticeE5_3); NmkCevni.put(CatNMK.NMK_BTUP, NoticeE5_4);   NmkCevni.put(CatNMK.NMK_BTP1, NoticeE5_5); NmkCevni.put(CatNMK.NMK_BTP2, NoticeE5_6);
+                NmkCevni.put(CatNMK.NMK_BTP3, NoticeE5_7); NmkCevni.put(CatNMK.NMK_BTUN, NoticeE5_8);   NmkCevni.put(CatNMK.NMK_BTN1, NoticeE5_9); NmkCevni.put(CatNMK.NMK_BTN2, NoticeE5_10);
+                NmkCevni.put(CatNMK.NMK_BTN3, NoticeE5_11); NmkCevni.put(CatNMK.NMK_BTUM, NoticeE5_12); NmkCevni.put(CatNMK.NMK_BTU1, NoticeE5_13); NmkCevni.put(CatNMK.NMK_BTU2, NoticeE5_14);
+                NmkCevni.put(CatNMK.NMK_BTU3, NoticeE5_15); NmkCevni.put(CatNMK.NMK_ANKP, NoticeE6);    NmkCevni.put(CatNMK.NMK_MORP, NoticeE7); NmkCevni.put(CatNMK.NMK_VLBT, NoticeE7_1);
+                NmkCevni.put(CatNMK.NMK_TRNA, NoticeE8); NmkCevni.put(CatNMK.NMK_SWWC, NoticeE9a);      NmkCevni.put(CatNMK.NMK_SWWR, NoticeE9b); NmkCevni.put(CatNMK.NMK_SWWL, NoticeE9c);
+                NmkCevni.put(CatNMK.NMK_WRSA, NoticeE9d); NmkCevni.put(CatNMK.NMK_WLSA, NoticeE9e);     NmkCevni.put(CatNMK.NMK_WRSL, NoticeE9f); NmkCevni.put(CatNMK.NMK_WLSR, NoticeE9g);
+                NmkCevni.put(CatNMK.NMK_WRAL, NoticeE9h); NmkCevni.put(CatNMK.NMK_WLAR, NoticeE9i);     NmkCevni.put(CatNMK.NMK_MWWC, NoticeE10a); NmkCevni.put(CatNMK.NMK_MWWJ, NoticeE10b);
+                NmkCevni.put(CatNMK.NMK_MWAR, NoticeE10c); NmkCevni.put(CatNMK.NMK_MWAL, NoticeE10d);   NmkCevni.put(CatNMK.NMK_WARL, NoticeE10e); NmkCevni.put(CatNMK.NMK_WALR, NoticeE10f);
+                NmkCevni.put(CatNMK.NMK_PEND, NoticeE11); NmkCevni.put(CatNMK.NMK_DWTR, NoticeE13);     NmkCevni.put(CatNMK.NMK_TELE, NoticeE14); NmkCevni.put(CatNMK.NMK_MTCP, NoticeE15);
+                NmkCevni.put(CatNMK.NMK_SPCP, NoticeE16); NmkCevni.put(CatNMK.NMK_WSKP, NoticeE17);     NmkCevni.put(CatNMK.NMK_SLCP, NoticeE18); NmkCevni.put(CatNMK.NMK_UPCP, NoticeE19);
+                NmkCevni.put(CatNMK.NMK_SLBP, NoticeE20); NmkCevni.put(CatNMK.NMK_RADI, NoticeE23);     NmkCevni.put(CatNMK.NMK_WTBP, NoticeE24); NmkCevni.put(CatNMK.NMK_HSCP, NoticeE21);
+                NmkCevni.put(CatNMK.NMK_LBGP, NoticeE22);
+  };
+
+        public static final EnumMap<CatNMK, Symbol> NmkBniwr = new EnumMap<CatNMK, Symbol>(CatNMK.class);
+        static {
+                NmkBniwr.put(CatNMK.NMK_NANK, Notice); NmkBniwr.put(CatNMK.NMK_LMHR, Notice); NmkBniwr.put(CatNMK.NMK_OPTR, Notice); NmkBniwr.put(CatNMK.NMK_OPTL, Notice);
+                NmkBniwr.put(CatNMK.NMK_WRAL, Notice); NmkBniwr.put(CatNMK.NMK_WLAR, Notice); NmkBniwr.put(CatNMK.NMK_KTPM, Notice); NmkBniwr.put(CatNMK.NMK_KTSM, Notice);
+                NmkBniwr.put(CatNMK.NMK_KTMR, Notice); NmkBniwr.put(CatNMK.NMK_CRTP, Notice); NmkBniwr.put(CatNMK.NMK_CRTS, Notice); NmkBniwr.put(CatNMK.NMK_TRBM, Notice);
+                NmkBniwr.put(CatNMK.NMK_RSPD, Notice);
+        }
+
+        public static final EnumMap<CatNMK, Symbol> NmkPpwbc = new EnumMap<CatNMK, Symbol>(CatNMK.class);
+        static {
+                NmkPpwbc.put(CatNMK.NMK_WRAL, Notice); NmkPpwbc.put(CatNMK.NMK_WLAR, Notice); NmkPpwbc.put(CatNMK.NMK_KTPM, Notice); NmkPpwbc.put(CatNMK.NMK_KTSM, Notice);
+                NmkPpwbc.put(CatNMK.NMK_KTMR, Notice); NmkPpwbc.put(CatNMK.NMK_CRTP, Notice); NmkPpwbc.put(CatNMK.NMK_CRTS, Notice);
+        }
+        
+        public static Symbol getNotice(CatNMK cat, MarSYS sys) {
+                Symbol symbol = null;
+                switch (sys) {
+                case SYS_CEVN:
+                        symbol = NmkCevni.get(cat);
+                        break;
+                case SYS_BNWR:
+                        symbol = NmkBniwr.get(cat);
+                        break;
+                case SYS_PPWB:
+                        symbol = NmkPpwbc.get(cat);
+                        break;
+                }
+                return symbol;
+        }
 }