Changeset 29340 in osm for applications/editors/josm/plugins/smed2/src/seamap

Timestamp:

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

Author:

malcolmh

Message:

save

Location:

applications/editors/josm/plugins/smed2/src/seamap

Files:

• Lights.java (moved) (moved from applications/editors/josm/plugins/smed2/src/seamap/LightRender.java ) (1 diff)
• NoticeRender.java (deleted)
• Rules.java (modified) (2 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);
+  }
+*/
                 }
         }