Changeset 26550 in osm for applications/editors/josm/plugins/smed

Timestamp:

2011-08-19T21:33:21+02:00 (13 years ago)

Author:

malcolmh

Message:

save

File:

• applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java (modified) (2 diffs)

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java

@@ -576 +576 @@
 
                 for (Obj obj : ObjMAP.keySet()) {
-                        if (keys.containsKey("seamark:" + ObjMAP.get(obj) + ":system")) {
-                                str = keys.get("seamark:" + ObjMAP.get(obj) + ":system");
-                                if (str.equals("iala-a"))
-                                        setRegion(Reg.A);
-                                else if (str.equals("iala-b"))
-                                        setRegion(Reg.B);
-                                else setRegion(Reg.C);
-                        }
-                }
-
-                for (Obj obj : ObjMAP.keySet()) {
                         if (keys.containsKey("seamark:" + ObjMAP.get(obj) + ":category")) {
                                 str = keys.get("seamark:" + ObjMAP.get(obj) + ":category");
@@ -637 +626 @@
                                         if (PatMAP.get(pat).equals(str)) {
                                                 setPattern(Ent.BODY, pat);
+                                        }
+                                }
+                        }
+                }
+
+                for (Obj obj : ObjMAP.keySet()) {
+                        if (keys.containsKey("seamark:" + ObjMAP.get(obj) + ":system")) {
+                                str = keys.get("seamark:" + ObjMAP.get(obj) + ":system");
+                                if (str.equals("iala-a"))
+                                        setRegion(Reg.A);
+                                else if (str.equals("iala-b"))
+                                        setRegion(Reg.B);
+                                else setRegion(Reg.C);
+                        } else if (GrpMAP.get(object) == Grp.LAT) {
+                                if (getCategory() != Cat.UNKNOWN) {
+                                        switch (getCategory()) {
+                                        case LAT_PORT:
+                                        case LAT_PREF_PORT:
+                                                if (getColour(Ent.BODY, 0) == Col.RED) {
+                                                        setRegion(Reg.A);
+                                                        if (getColour(Ent.BODY, 1) == Col.WHITE)
+                                                                setRegion(Reg.C);
+                                                }
+                                                if (getColour(Ent.BODY, 0) == Col.GREEN)
+                                                        setRegion(Reg.B);
+                                                break;
+                                        case LAT_STBD:
+                                        case LAT_PREF_STBD:
+                                                if (getColour(Ent.BODY, 0) == Col.GREEN) {
+                                                        setRegion(Reg.A);
+                                                        if (getColour(Ent.BODY, 1) == Col.WHITE)
+                                                                setRegion(Reg.C);
+                                                }
+                                                if (getColour(Ent.BODY, 0) == Col.RED)
+                                                        setRegion(Reg.B);
+                                                break;
                                         }
                                 }