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

Timestamp:

2016-02-27T16:14:25+01:00 (10 years ago)

Author:

malcolmh

Message:

[seachart] update

File:

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

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

@@ -323 +323 @@
                 }
                 Renderer.symbol(feature, Beacons.LightFlare, new Scheme(LightColours.get(col)), new Delta(Handle.BC, AffineTransform.getRotateInstance(Math.toRadians(120))));
-                if (Renderer.zoom >= 15) {
                         String str = "";
                         if (lights.get(1) != null) {
@@ -375 +374 @@
                                                         str += LightLetters.get(cols.get(1));
                                         }
+                                        if (atts.containsKey(Att.SIGPER)) {
+                                                str += "." + df.format(atts.get(Att.SIGPER).val) + "s";
+                                        }
                                         if (dir && atts.containsKey(Att.ORIENT)) {
                                                 double orient = (Double) atts.get(Att.ORIENT).val;
@@ -390 +392 @@
                                         Renderer.lightSector(feature, LightColours.get(col1), LightColours.get(col2), radius, s1, s2, dir, (Renderer.zoom >= 15) ? str : "");
                                 }
+                        if (Renderer.zoom >= 15) {
                                 class LitSect {
                                         boolean dir;
@@ -404 +407 @@
                                 for (AttMap atts : lights.values()) {
                                         LitSect sect = new LitSect();
-                                        litatts.add(sect);
                                         sect.dir = (atts.containsKey(Att.CATLIT)) && (atts.get(Att.CATLIT).val == CatLIT.LIT_DIR);
                                         sect.chr = atts.containsKey(Att.LITCHR) ? ((ArrayList<LitCHR>) atts.get(Att.LITCHR).val).get(0) : LitCHR.CHR_UNKN;
@@ -433 +435 @@
                                         sect.col = cols.size() > 0 ? cols.get(0) : ColCOL.COL_UNK;
                                         sect.alt = cols.size() > 1 ? cols.get(1) : ColCOL.COL_UNK;
+                                        if ((sect.chr != LitCHR.CHR_UNKN) && (sect.col != null))
+                                                litatts.add(sect);
                                 }
                                 ArrayList<ArrayList<LitSect>> groupings = new ArrayList<>();
@@ -507 +511 @@
                                                 str += LightLetters.get(cr.col);
                                         }
+                                        if ((tmp.per > 0) || (tmp.hgt > 0) || (colrng.get(0).rng > 0))
+                                                str += ".";
                                         if (tmp.per > 0)
                                                 str += df.format(tmp.per) + "s";
@@ -517 +523 @@
                                         str = "";
                                 }
-                        } else {
+                        }
+                } else {
+                        if (Renderer.zoom >= 15) {
                                 AttMap atts = lights.get(0);
                                 ArrayList<CatLIT> cats = new ArrayList<>();