Changeset 35483 in osm for applications/editors/josm

Timestamp:

2020-06-04T10:36:16+02:00 (4 years ago)

Author:

malcolmh

Message:

[Seachart] Publish new release

Location:

applications/editors/josm/plugins/seachart/src/render

Files:

• Renderer.java (modified) (1 diff)
• Rules.java (modified) (2 diffs)
• Signals.java (modified) (1 diff)

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

@@ -100 +100 @@
         Point2D point = context.getPoint(Rules.feature.geom.centre);
         Symbols.drawSymbol(g2, symbol, sScale, point.getX(), point.getY(), scheme, delta);
+    }
+
+    public static void colLetters(ArrayList<?> cols) {
+                String str = "";
+                for (int i = 0; (i < cols.size()) && (i < 4); i++) {
+                        str = str.concat(Rules.colourLetters.get(cols.get(i)));
+                }
+                labelText(str, new Font("Arial", Font.PLAIN, 40), Color.black, new Delta(Handle.TC, AffineTransform.getTranslateInstance(0, 40)));
     }
 

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

@@ -102 +102 @@
                 bodyColours.put(ColCOL.COL_MAG, new Color(0xf000f0));
                 bodyColours.put(ColCOL.COL_PNK, Color.pink);
+        }
+
+        static final EnumMap<ColCOL, String> colourLetters = new EnumMap<>(ColCOL.class);
+        static {
+                colourLetters.put(ColCOL.COL_UNK, "");
+                colourLetters.put(ColCOL.COL_WHT, "W");
+                colourLetters.put(ColCOL.COL_BLK, "B");
+                colourLetters.put(ColCOL.COL_RED, "R");
+                colourLetters.put(ColCOL.COL_GRN, "G");
+                colourLetters.put(ColCOL.COL_BLU, "Bu");
+                colourLetters.put(ColCOL.COL_YEL, "Y");
+                colourLetters.put(ColCOL.COL_GRY, "Gr");
+                colourLetters.put(ColCOL.COL_BRN, "Bn");
+                colourLetters.put(ColCOL.COL_AMB, "Am");
+                colourLetters.put(ColCOL.COL_VIO, "Vi");
+                colourLetters.put(ColCOL.COL_ORG, "Or");
+                colourLetters.put(ColCOL.COL_MAG, "Mg");
+                colourLetters.put(ColCOL.COL_PNK, "Pk");
         }
 
@@ -1009 +1027 @@
                                 break;
                         }
+                        if (Renderer.zoom >= 15) {
+                                Renderer.colLetters(getAttList(feature.type, Att.COLOUR));
+                        }
                         Signals.addSignals();
             addName(15, new Font("Arial", Font.BOLD, 40), new Delta(Handle.BL, AffineTransform.getTranslateInstance(60, -50)));

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

@@ -609 +609 @@
                     cats = (ArrayList<CatLIT>) atts.get(Att.CATLIT).val;
                 }
-                str = cats.contains(CatLIT.LIT_DIR) ? "Dir" : "";
+                str = (cats.contains(CatLIT.LIT_AIR) || cats.contains(CatLIT.LIT_AERO)) ? "Aero" : cats.contains(CatLIT.LIT_DIR) ? "Dir" : "";
                 str += atts.containsKey(Att.MLTYLT) ? atts.get(Att.MLTYLT).val : "";
                 if (atts.containsKey(Att.LITCHR)) {