Changeset 32093 in osm for applications/editors/josm/plugins/seachart

Timestamp:

2016-03-03T17:21:33+01:00 (8 years ago)

Author:

malcolmh

Message:

[SeaChart] Fix floats

Location:

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

Files:

• Rules.java (modified) (2 diffs)
• Signals.java (modified) (3 diffs)

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

@@ -628 +628 @@
         }
         
+        @SuppressWarnings("unchecked")
         private static void floats() {
                 if (Renderer.zoom >= 12) {
@@ -643 +644 @@
                                 break;
                         }
-                        if (feature.objs.get(Obj.TOPMAR) != null)
-                                Renderer.symbol(Topmarks.Shapes.get(feature.objs.get(Obj.TOPMAR).get(0).get(Att.TOPSHP).val), getScheme(Obj.TOPMAR), Topmarks.FloatDelta);
+                        if (feature.objs.containsKey(Obj.TOPMAR)) {
+                                AttMap topmap = feature.objs.get(Obj.TOPMAR).get(0);
+                                if (topmap.containsKey(Att.TOPSHP)) {
+                                        Renderer.symbol(Topmarks.Shapes.get(((ArrayList<TopSHP>)(topmap.get(Att.TOPSHP).val)).get(0)), getScheme(Obj.TOPMAR), Topmarks.FloatDelta);
+                                }
+                        } else if (feature.objs.containsKey(Obj.DAYMAR)) {
+                                AttMap topmap = feature.objs.get(Obj.DAYMAR).get(0);
+                                if (topmap.containsKey(Att.TOPSHP)) {
+                                        Renderer.symbol(Topmarks.Shapes.get(((ArrayList<TopSHP>)(topmap.get(Att.TOPSHP).val)).get(0)), getScheme(Obj.DAYMAR), Topmarks.FloatDelta);
+                                }
+                        }
                         addName(15, new Font("Arial", Font.BOLD, 40), new Delta(Handle.BL, AffineTransform.getTranslateInstance(20, -50)));
                         Signals.addSignals();

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

@@ -117 +117 @@
                         case BCNSAW:
                         case BCNSPP:
+                                if ((Rules.feature.objs.containsKey(Obj.TOPMAR)) || (Rules.feature.objs.containsKey(Obj.DAYMAR))) {
+                                        Renderer.symbol(Topmarks.RadarReflector, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -140)));
+                                } else {
+                                        Renderer.symbol(Topmarks.RadarReflector, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -80)));
+                                }
+                                break;
                         case LITFLT:
                         case LITVES:
                         case BOYINB:
                                 if ((Rules.feature.objs.containsKey(Obj.TOPMAR)) || (Rules.feature.objs.containsKey(Obj.DAYMAR))) {
-                                        Renderer.symbol(Topmarks.RadarReflector, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -140)));
+                                        Renderer.symbol(Topmarks.RadarReflector, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -110)));
                                 } else {
-                                        Renderer.symbol(Topmarks.RadarReflector, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -80)));
+                                        Renderer.symbol(Topmarks.RadarReflector, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -60)));
                                 }
                                 break;
@@ -140 +146 @@
                         case BOYSPP:
                                 if ((Rules.feature.objs.containsKey(Obj.TOPMAR)) || (Rules.feature.objs.containsKey(Obj.DAYMAR))) {
-                                        if (Rules.testAttribute(Rules.feature.type, Att.BOYSHP, BoySHP.BOY_PILR) || Rules.testAttribute(Rules.feature.type, Att.BOYSHP, BoySHP.BOY_PILR)) {
-                                                Renderer.symbol(Topmarks.RadarReflector, new Delta(Handle.BC, AffineTransform.getTranslateInstance(45, -140)));
+                                        if (Rules.testAttribute(Rules.feature.type, Att.BOYSHP, BoySHP.BOY_PILR) || Rules.testAttribute(Rules.feature.type, Att.BOYSHP, BoySHP.BOY_SPAR)) {
+                                                Renderer.symbol(Topmarks.RadarReflector, new Delta(Handle.BC, AffineTransform.getTranslateInstance(50, -160)));
                                         } else {
                                                 Renderer.symbol(Topmarks.RadarReflector, new Delta(Handle.BC, AffineTransform.getTranslateInstance(25, -80)));
                                         }
                                 } else {
-                                        if (Rules.testAttribute(Rules.feature.type, Att.BOYSHP, BoySHP.BOY_PILR) || Rules.testAttribute(Rules.feature.type, Att.BOYSHP, BoySHP.BOY_PILR)) {
+                                        if (Rules.testAttribute(Rules.feature.type, Att.BOYSHP, BoySHP.BOY_PILR) || Rules.testAttribute(Rules.feature.type, Att.BOYSHP, BoySHP.BOY_SPAR)) {
                                                 Renderer.symbol(Topmarks.RadarReflector, new Delta(Handle.BC, AffineTransform.getTranslateInstance(30, -100)));
                                         } else {
@@ -164 +170 @@
                 if (Renderer.zoom >= 15) {
                         AttMap atts = Rules.feature.objs.get(Obj.FOGSIG).get(0);
-                        String str = "";
-                        if (atts.containsKey(Att.CATFOG)) {
-                                str += fogSignals.get(((ArrayList<?>) (atts.get(Att.CATFOG).val)).get(0));
-                        }
-                        if (atts.containsKey(Att.SIGGRP)) {
-                                str += "(" + atts.get(Att.SIGGRP).val + ")";
-                        } else {
-                                str += " ";
-                        }
-                        if (atts.containsKey(Att.SIGPER)) {
-                                str += df.format(atts.get(Att.SIGPER).val) + "s";
-                        }
-                        if (atts.containsKey(Att.VALMXR)) {
-                                str += df.format(atts.get(Att.VALMXR).val) + "M";
-                        }
-                        if (!str.isEmpty()) {
-                                Renderer.labelText(str, new Font("Arial", Font.PLAIN, 40), Color.black, new Delta(Handle.TR, AffineTransform.getTranslateInstance(-60, -30)));
+                        if (atts != null) {
+                                String str = "";
+                                if (atts.containsKey(Att.CATFOG)) {
+                                        str += fogSignals.get(((ArrayList<?>) (atts.get(Att.CATFOG).val)).get(0));
+                                }
+                                if (atts.containsKey(Att.SIGGRP)) {
+                                        str += "(" + atts.get(Att.SIGGRP).val + ")";
+                                } else {
+                                        str += " ";
+                                }
+                                if (atts.containsKey(Att.SIGPER)) {
+                                        str += df.format(atts.get(Att.SIGPER).val) + "s";
+                                }
+                                if (atts.containsKey(Att.VALMXR)) {
+                                        str += df.format(atts.get(Att.VALMXR).val) + "M";
+                                }
+                                if (!str.isEmpty()) {
+                                        Renderer.labelText(str, new Font("Arial", Font.PLAIN, 40), Color.black, new Delta(Handle.TR, AffineTransform.getTranslateInstance(-60, -30)));
+                                }
                         }
                 }