Changeset 31344 in osm for applications

Timestamp:

2015-07-06T19:01:27+02:00 (9 years ago)

Author:

malcolmh

Message:

update jicons

Location:

applications/editors/josm/plugins/seachart

Files:

• jicons/jicons.zip (modified) ( previous)
• jicons/src/jicons/Jicons.java (modified) (1 diff)
• src/render/Rules.java (modified) (3 diffs)

applications/editors/josm/plugins/seachart/jicons/src/jicons/Jicons.java

@@ -34 +34 @@
 import s57.S57map;
 import s57.S57map.*;
-import symbols.Symbols;
 import render.*;
 import render.Rules.RuleSet;

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

@@ -441 +441 @@
                                 Renderer.symbol(feature, Beacons.Shapes.get(shape), getScheme(feature, feature.type));
                                 if (feature.objs.containsKey(Obj.TOPMAR)) {
-                                        Symbol topmark = Topmarks.Shapes.get(feature.objs.get(Obj.TOPMAR).get(0).get(Att.TOPSHP).val);
-                                        if (topmark != null)
-                                                Renderer.symbol(feature, Topmarks.Shapes.get(feature.objs.get(Obj.TOPMAR).get(0).get(Att.TOPSHP).val), getScheme(feature, Obj.TOPMAR), Topmarks.BeaconDelta);
+                                        AttMap topmap = feature.objs.get(Obj.TOPMAR).get(0);
+                                        if (topmap.containsKey(Att.TOPSHP)) {
+                                                Symbol topmark = Topmarks.Shapes.get(((ArrayList<TopSHP>)(topmap.get(Att.TOPSHP).val)).get(0));
+                                                if (topmark != null)
+                                                        Renderer.symbol(feature, topmark, getScheme(feature, Obj.TOPMAR), Topmarks.BeaconDelta);
+                                        }
                                 } else if (feature.objs.containsKey(Obj.DAYMAR)) {
-                                        Symbol topmark = Topmarks.Shapes.get(feature.objs.get(Obj.DAYMAR).get(0).get(Att.TOPSHP).val);
-                                        if (topmark != null)
-                                                Renderer.symbol(feature, Topmarks.Shapes.get(feature.objs.get(Obj.DAYMAR).get(0).get(Att.TOPSHP).val), getScheme(feature, Obj.DAYMAR), Topmarks.BeaconDelta);
+                                        AttMap topmap = feature.objs.get(Obj.DAYMAR).get(0);
+                                        if (topmap.containsKey(Att.TOPSHP)) {
+                                                Symbol topmark = Topmarks.Shapes.get(((ArrayList<TopSHP>)(topmap.get(Att.TOPSHP).val)).get(0));
+                                                if (topmark != null)
+                                                        Renderer.symbol(feature, topmark, getScheme(feature, Obj.DAYMAR), Topmarks.BeaconDelta);
+                                        }
                                 }
                         }
@@ -462 +468 @@
                                 AttMap topmap = feature.objs.get(Obj.TOPMAR).get(0);
                                 if (topmap.containsKey(Att.TOPSHP)) {
-                                        Symbol topmark = Topmarks.Shapes.get(topmap.get(Att.TOPSHP).val);
+                                        Symbol topmark = Topmarks.Shapes.get(((ArrayList<TopSHP>)(topmap.get(Att.TOPSHP).val)).get(0));
                                         if (topmark != null)
                                                 Renderer.symbol(feature, topmark, getScheme(feature, Obj.TOPMAR), Topmarks.BuoyDeltas.get(shape));
@@ -469 +475 @@
                                 AttMap topmap = feature.objs.get(Obj.DAYMAR).get(0);
                                 if (topmap.containsKey(Att.TOPSHP)) {
-                                        Symbol topmark = Topmarks.Shapes.get(topmap.get(Att.TOPSHP).val);
+                                        Symbol topmark = Topmarks.Shapes.get(((ArrayList<TopSHP>)(topmap.get(Att.TOPSHP).val)).get(0));
                                         if (topmark != null)
                                                 Renderer.symbol(feature, topmark, getScheme(feature, Obj.DAYMAR), Topmarks.BuoyDeltas.get(shape));