Changeset 29884 in osm for applications/editors/josm/plugins/smed2

Timestamp:

2013-08-31T11:15:35+02:00 (11 years ago)

Author:

malcolmh

Message:

save

Location:

applications/editors/josm/plugins/smed2/src

Files:

• seamap/Rules.java (modified) (2 diffs)
• symbols/Notices.java (modified) (2 diffs)

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

@@ -488 +488 @@
                         Symbol s1 = null, s2 = null;
                         MarSYS sys = MarSYS.SYS_CEVN;
+                        BnkWTW bnk = BnkWTW.BWW_UNKN;
                         AttItem att = feature.atts.get(Att.MARSYS);
                         if (att != null) sys = (MarSYS)att.val;
@@ -500 +501 @@
                                         CatNMK cat = CatNMK.NMK_UNKN;
                                         if (atts.get(Att.CATNMK) != null) cat = (CatNMK)atts.get(Att.CATNMK).val;
-                                        s2 = Notices.getNotice(cat, sys);
+                                        s2 = Notices.getNotice(cat, sys, bnk);
                                 }
                         }

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

@@ -971 +971 @@
   };
 
+        public static final Symbol NoticeBnank = new Symbol();
+        public static final Symbol NoticeBlmhr = new Symbol();
+        public static final Symbol NoticeBwral = new Symbol();
+        public static final Symbol NoticeBwrar = new Symbol();
+        public static final Symbol NoticeBktpm = new Symbol();
+        public static final Symbol NoticeBktsm = new Symbol();
+        public static final Symbol NoticeBktmr = new Symbol();
+        public static final Symbol NoticeBcrtp = new Symbol();
+        public static final Symbol NoticeBcrts = new Symbol();
+        public static final Symbol NoticeBtrbm = new Symbol();
+        public static final Symbol NoticeBrspd = new Symbol();
         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);
+                NmkBniwr.put(CatNMK.NMK_NANK, NoticeBnank); NmkBniwr.put(CatNMK.NMK_LMHR, NoticeBlmhr); NmkBniwr.put(CatNMK.NMK_OPTR, NoticeD2a); NmkBniwr.put(CatNMK.NMK_OPTL, NoticeD2b);
+                NmkBniwr.put(CatNMK.NMK_WRAL, NoticeBwral); NmkBniwr.put(CatNMK.NMK_WLAR, NoticeBwrar); NmkBniwr.put(CatNMK.NMK_KTPM, NoticeBktpm); NmkBniwr.put(CatNMK.NMK_KTSM, NoticeBktsm);
+                NmkBniwr.put(CatNMK.NMK_KTMR, NoticeBktmr); NmkBniwr.put(CatNMK.NMK_CRTP, NoticeBcrtp); NmkBniwr.put(CatNMK.NMK_CRTS, NoticeBcrts); NmkBniwr.put(CatNMK.NMK_TRBM, NoticeBtrbm);
+                NmkBniwr.put(CatNMK.NMK_RSPD, NoticeBrspd);
         }
 
@@ -985 +996 @@
         }
         
-        public static Symbol getNotice(CatNMK cat, MarSYS sys) {
+        public static Symbol getNotice(CatNMK cat, MarSYS sys, BnkWTW bank) {
                 Symbol symbol = null;
                 switch (sys) {