Changeset 31344 in osm for applications/editors/josm/plugins/seachart
- Timestamp:
- 2015-07-06T19:01:27+02:00 (9 years ago)
- Location:
- applications/editors/josm/plugins/seachart
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/seachart/jicons/src/jicons/Jicons.java
r31343 r31344 34 34 import s57.S57map; 35 35 import s57.S57map.*; 36 import symbols.Symbols;37 36 import render.*; 38 37 import render.Rules.RuleSet; -
applications/editors/josm/plugins/seachart/src/render/Rules.java
r31343 r31344 441 441 Renderer.symbol(feature, Beacons.Shapes.get(shape), getScheme(feature, feature.type)); 442 442 if (feature.objs.containsKey(Obj.TOPMAR)) { 443 Symbol topmark = Topmarks.Shapes.get(feature.objs.get(Obj.TOPMAR).get(0).get(Att.TOPSHP).val); 444 if (topmark != null) 445 Renderer.symbol(feature, Topmarks.Shapes.get(feature.objs.get(Obj.TOPMAR).get(0).get(Att.TOPSHP).val), getScheme(feature, Obj.TOPMAR), Topmarks.BeaconDelta); 443 AttMap topmap = feature.objs.get(Obj.TOPMAR).get(0); 444 if (topmap.containsKey(Att.TOPSHP)) { 445 Symbol topmark = Topmarks.Shapes.get(((ArrayList<TopSHP>)(topmap.get(Att.TOPSHP).val)).get(0)); 446 if (topmark != null) 447 Renderer.symbol(feature, topmark, getScheme(feature, Obj.TOPMAR), Topmarks.BeaconDelta); 448 } 446 449 } else if (feature.objs.containsKey(Obj.DAYMAR)) { 447 Symbol topmark = Topmarks.Shapes.get(feature.objs.get(Obj.DAYMAR).get(0).get(Att.TOPSHP).val); 448 if (topmark != null) 449 Renderer.symbol(feature, Topmarks.Shapes.get(feature.objs.get(Obj.DAYMAR).get(0).get(Att.TOPSHP).val), getScheme(feature, Obj.DAYMAR), Topmarks.BeaconDelta); 450 AttMap topmap = feature.objs.get(Obj.DAYMAR).get(0); 451 if (topmap.containsKey(Att.TOPSHP)) { 452 Symbol topmark = Topmarks.Shapes.get(((ArrayList<TopSHP>)(topmap.get(Att.TOPSHP).val)).get(0)); 453 if (topmark != null) 454 Renderer.symbol(feature, topmark, getScheme(feature, Obj.DAYMAR), Topmarks.BeaconDelta); 455 } 450 456 } 451 457 } … … 462 468 AttMap topmap = feature.objs.get(Obj.TOPMAR).get(0); 463 469 if (topmap.containsKey(Att.TOPSHP)) { 464 Symbol topmark = Topmarks.Shapes.get( topmap.get(Att.TOPSHP).val);470 Symbol topmark = Topmarks.Shapes.get(((ArrayList<TopSHP>)(topmap.get(Att.TOPSHP).val)).get(0)); 465 471 if (topmark != null) 466 472 Renderer.symbol(feature, topmark, getScheme(feature, Obj.TOPMAR), Topmarks.BuoyDeltas.get(shape)); … … 469 475 AttMap topmap = feature.objs.get(Obj.DAYMAR).get(0); 470 476 if (topmap.containsKey(Att.TOPSHP)) { 471 Symbol topmark = Topmarks.Shapes.get( topmap.get(Att.TOPSHP).val);477 Symbol topmark = Topmarks.Shapes.get(((ArrayList<TopSHP>)(topmap.get(Att.TOPSHP).val)).get(0)); 472 478 if (topmark != null) 473 479 Renderer.symbol(feature, topmark, getScheme(feature, Obj.DAYMAR), Topmarks.BuoyDeltas.get(shape));
Note:
See TracChangeset
for help on using the changeset viewer.