Changeset 32093 in osm for applications/editors/josm/plugins/seachart/src/render/Rules.java

Timestamp:

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

Author:

malcolmh

Message:

[SeaChart] Fix floats

File:

• applications/editors/josm/plugins/seachart/src/render/Rules.java (modified) (2 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();