Changeset 35388 in osm for applications/editors/josm/plugins/seachart/src/render

Timestamp:

2020-03-21T09:42:31+01:00 (6 years ago)

Author:

malcolmh

Message:

add new jchart utility

Location:

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

Files:

• Rules.java (modified) (6 diffs)
• Signals.java (modified) (1 diff)

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

@@ -356 +356 @@
                         return false;
                 } catch (Exception e) {
+                    e.printStackTrace();
                         return true;
                 }
@@ -979 +980 @@
                                         fncSym = Landmarks.RadioTV;
                                 Renderer.symbol(catSym);
-                                if (catSym != Landmarks.Spire)
-                                        Renderer.symbol(fncSym);
+                                Renderer.symbol(fncSym);
                                 break;
                         case SILTNK:
@@ -1049 +1049 @@
                         ArrayList<CatSCF> scfs = (ArrayList<CatSCF>) getAttList(Obj.SMCFAC, Att.CATSCF);
                         for (CatSCF scf : scfs) {
-                                symbols.add(Facilities.Cats.get(scf));
+                            Symbol sym = Facilities.Cats.get(scf);
+                            if (sym != null) symbols.add(sym);
                         }
                         Renderer.cluster(symbols);
@@ -1059 +1060 @@
                         switch ((CatMOR) getAttEnum(feature.type, Att.CATMOR)) {
                         case MOR_DLPN:
-                                Renderer.symbol(Harbours.Dolphin);
+                            if (feature.geom.prim == Pflag.AREA) {
+                                Renderer.lineVector(new LineStyle(Color.black, 4, Symbols.Yland));
+                            } else {
+                                Renderer.symbol(Harbours.Dolphin);
+                            }
                     Signals.addSignals();
                                 break;
@@ -1079 +1084 @@
                                 Renderer.symbol(Topmarks.TopMooring, Topmarks.BuoyDeltas.get(shape));
                             Signals.addSignals();
+                            addName(15, new Font("Arial", Font.BOLD, 40), new Delta(Handle.BL, AffineTransform.getTranslateInstance(60, -50)));
                             }
                                 break;
@@ -1542 +1548 @@
             }
         }
+        addName(15, new Font("Arial", Font.BOLD, 40), new Delta(Handle.BL, AffineTransform.getTranslateInstance(50, 0)));
         if (Renderer.zoom >= 15) {
                 Renderer.labelText("V-AIS", new Font("Arial", Font.PLAIN, 40), Symbols.Msymb, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, 70)));

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

@@ -469 +469 @@
                     str += "." + df.format(atts.get(Att.SIGPER).val) + "s";
                 }
-                if ((s1 <= 360) && (s2 <= 360) && (s1 != s2))
+                if ((s1 < 360) && (s2 < 360) && (s1 != s2))
                     Renderer.lightSector(LightColours.get(col1), LightColours.get(col2), radius, s1, s2, dir, (Renderer.zoom >= 15) ? str : "");
             }