Index: /applications/editors/josm/plugins/smed2/src/render/Rules.java =================================================================== --- /applications/editors/josm/plugins/smed2/src/render/Rules.java (revision 30387) +++ /applications/editors/josm/plugins/smed2/src/render/Rules.java (revision 30388) @@ -335,24 +335,27 @@ BcnSHP shape = (BcnSHP) getAttVal(feature, feature.type, 0, Att.BCNSHP); - if (((shape == BcnSHP.BCN_PRCH) || (shape == BcnSHP.BCN_WTHY)) - && (feature.type == Obj.BCNLAT)) { - CatLAM cat = (CatLAM) getAttVal(feature, feature.type, 0, - Att.CATLAM); + if ((shape == BcnSHP.BCN_WTHY) && (feature.type == Obj.BCNLAT)) { + CatLAM cat = (CatLAM) getAttVal(feature, feature.type, 0, Att.CATLAM); switch (cat) { case LAM_PORT: - if (shape == BcnSHP.BCN_PRCH) - Renderer.symbol(feature, Beacons.PerchPort); - else - Renderer.symbol(feature, Beacons.WithyPort); + Renderer.symbol(feature, Beacons.WithyPort); break; case LAM_STBD: - if (shape == BcnSHP.BCN_PRCH) - Renderer.symbol(feature, Beacons.PerchStarboard); - else - Renderer.symbol(feature, Beacons.WithyStarboard); + Renderer.symbol(feature, Beacons.WithyStarboard); break; default: - Renderer.symbol(feature, Beacons.Stake, - getScheme(feature, feature.type)); + Renderer.symbol(feature, Beacons.Stake, getScheme(feature, feature.type)); + } + } else if ((shape == BcnSHP.BCN_PRCH) && (feature.type == Obj.BCNLAT) && !(feature.objs.containsKey(Obj.TOPMAR))) { + CatLAM cat = (CatLAM) getAttVal(feature, feature.type, 0, Att.CATLAM); + switch (cat) { + case LAM_PORT: + Renderer.symbol(feature, Beacons.PerchPort); + break; + case LAM_STBD: + Renderer.symbol(feature, Beacons.PerchStarboard); + break; + default: + Renderer.symbol(feature, Beacons.Stake, getScheme(feature, feature.type)); } } else { @@ -665,4 +668,13 @@ default: break; + } + 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.LightDelta); + } 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.LightDelta); } Signals.addSignals(feature); Index: /applications/editors/josm/plugins/smed2/src/s57/S57att.java =================================================================== --- /applications/editors/josm/plugins/smed2/src/s57/S57att.java (revision 30387) +++ /applications/editors/josm/plugins/smed2/src/s57/S57att.java (revision 30388) @@ -134,11 +134,11 @@ AttStr.put(Att.NATCON, "construction"); AttStr.put(Att.NATSUR, "surface"); AttStr.put(Att.NATQUA, "surface_qualification"); AttStr.put(Att.NMDATE, "nm_date"); AttStr.put(Att.OBJNAM, "name"); AttStr.put(Att.ORIENT, "orientation"); AttStr.put(Att.PEREND, "end_date"); AttStr.put(Att.PERSTA, "start_date"); - AttStr.put(Att.PICREP, "representation"); AttStr.put(Att.PILDST, "pilot_district"); AttStr.put(Att.PRCTRY, "producing_country"); AttStr.put(Att.PRODCT, "product"); + AttStr.put(Att.PICREP, ""); AttStr.put(Att.PILDST, "pilot_district"); AttStr.put(Att.PRCTRY, "producing_country"); AttStr.put(Att.PRODCT, "product"); AttStr.put(Att.PUBREF, "reference"); AttStr.put(Att.QUASOU, "quality"); AttStr.put(Att.RADWAL, "wavelength"); AttStr.put(Att.RADIUS, "radius"); AttStr.put(Att.RECDAT, "date"); AttStr.put(Att.RECIND, "indication"); AttStr.put(Att.RYRMGV, "year"); AttStr.put(Att.RESTRN, "restriction"); AttStr.put(Att.SECTR1, "sector_start"); AttStr.put(Att.SECTR2, "sector_end"); AttStr.put(Att.SHIPAM, "shift"); AttStr.put(Att.SIGFRQ, "frequency"); AttStr.put(Att.SIGGEN, "generation"); AttStr.put(Att.SIGGRP, "group"); AttStr.put(Att.SIGPER, "period"); AttStr.put(Att.SIGSEQ, "sequence"); - AttStr.put(Att.SOUACC, "accuracy"); AttStr.put(Att.SDISMX, "maximum_sounding"); AttStr.put(Att.SDISMN, "minimum_sounding"); AttStr.put(Att.SORDAT, "source_date"); - AttStr.put(Att.SORIND, "source"); AttStr.put(Att.STATUS, "status"); AttStr.put(Att.SURATH, "authority"); AttStr.put(Att.SUREND, "end_date"); + AttStr.put(Att.SOUACC, "accuracy"); AttStr.put(Att.SDISMX, "maximum_sounding"); AttStr.put(Att.SDISMN, "minimum_sounding"); AttStr.put(Att.SORDAT, ""); + AttStr.put(Att.SORIND, ""); AttStr.put(Att.STATUS, "status"); AttStr.put(Att.SURATH, "authority"); AttStr.put(Att.SUREND, "end_date"); AttStr.put(Att.SURSTA, "start_date"); AttStr.put(Att.SURTYP, "survey"); AttStr.put(Att.TECSOU, "technique"); AttStr.put(Att.TXTDSC, "description"); AttStr.put(Att.TIMEND, "end_time"); AttStr.put(Att.TIMSTA, "start_time"); AttStr.put(Att.TOPSHP, "shape"); AttStr.put(Att.TRAFIC, "traffic_flow"); Index: /applications/editors/josm/plugins/smed2/src/symbols/Beacons.java =================================================================== --- /applications/editors/josm/plugins/smed2/src/symbols/Beacons.java (revision 30387) +++ /applications/editors/josm/plugins/smed2/src/symbols/Beacons.java (revision 30388) @@ -187,4 +187,5 @@ Shapes.put(BcnSHP.BCN_LATT, Beacons.Beacon); Shapes.put(BcnSHP.BCN_PILE, Beacons.Beacon); Shapes.put(BcnSHP.BCN_POLE, Beacons.Stake); Shapes.put(BcnSHP.BCN_CARN, Beacons.Cairn); Shapes.put(BcnSHP.BCN_BUOY, Beacons.Beacon); Shapes.put(BcnSHP.BCN_POST, Beacons.Stake); + Shapes.put(BcnSHP.BCN_PRCH, Beacons.Stake); } } Index: /applications/editors/josm/plugins/smed2/src/symbols/Topmarks.java =================================================================== --- /applications/editors/josm/plugins/smed2/src/symbols/Topmarks.java (revision 30387) +++ /applications/editors/josm/plugins/smed2/src/symbols/Topmarks.java (revision 30388) @@ -20,4 +20,20 @@ public class Topmarks { + public static final Symbol TopBesom = new Symbol(); + static { + TopBesom.add(new Instr(Form.BBOX, new Rectangle2D.Double(-20,-80,40,80))); + TopBesom.add(new Instr(Form.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER))); + TopBesom.add(new Instr(Form.FILL, Color.black)); + Path2D.Double p = new Path2D.Double(); p.moveTo(-15.0,0.0); p.lineTo(0.0,-30.0); p.lineTo(15.0,0.0); p.moveTo(0.0,0.0); p.lineTo(0.0,-28.0); + TopBesom.add(new Instr(Form.PLIN, p)); + } + public static final Symbol TopIBesom = new Symbol(); + static { + TopIBesom.add(new Instr(Form.BBOX, new Rectangle2D.Double(-20,-80,40,80))); + TopIBesom.add(new Instr(Form.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER))); + TopIBesom.add(new Instr(Form.FILL, Color.black)); + Path2D.Double p = new Path2D.Double(); p.moveTo(-15.0,-30.0); p.lineTo(0.0,0.0); p.lineTo(15.0,-30.0); + TopIBesom.add(new Instr(Form.PLIN, p)); + } public static final Symbol TopBoard = new Symbol(); static { @@ -230,4 +246,8 @@ Path2D.Double p = new Path2D.Double(); p.moveTo(-15.0,-1.0); p.lineTo(0.0,-29.0); p.lineTo(15.0,-1.0); p.closePath(); colours.add(new Instr(Form.P1, p)); + p = new Path2D.Double(); p.setWindingRule(GeneralPath.WIND_EVEN_ODD); + p.moveTo(-15.0,-1.0); p.lineTo(0.0,-29.0); p.lineTo(15.0,-1.0); p.closePath(); + p.moveTo(-10.0,-6.0); p.lineTo(0.0,-24.0); p.lineTo(10.0,-6.0); p.closePath(); + colours.add(new Instr(Form.B1, p)); TopTriangle.add(new Instr(Form.COLR, colours)); TopTriangle.add(new Instr(Form.STRK, new BasicStroke(2, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER))); @@ -242,4 +262,8 @@ Path2D.Double p = new Path2D.Double(); p.moveTo(-15.0,-29.0); p.lineTo(0.0,-1.0); p.lineTo(15.0,-29.0); p.closePath(); colours.add(new Instr(Form.P1, p)); + p = new Path2D.Double(); p.setWindingRule(GeneralPath.WIND_EVEN_ODD); + p.moveTo(-15.0,-29.0); p.lineTo(0.0,-1.0); p.lineTo(15.0,-29.0); p.closePath(); + p.moveTo(-10.0,-24.0); p.lineTo(0.0,-6.0); p.lineTo(10.0,-24.0); p.closePath(); + colours.add(new Instr(Form.B1, p)); TopItriangle.add(new Instr(Form.COLR, colours)); TopItriangle.add(new Instr(Form.STRK, new BasicStroke(2, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER))); @@ -284,8 +308,9 @@ public static final EnumMap Shapes = new EnumMap(TopSHP.class); static { - Shapes.put(TopSHP.TOP_BORD, TopBoard); Shapes.put(TopSHP.TOP_CAN, TopCan); Shapes.put(TopSHP.TOP_CONE, TopCone); Shapes.put(TopSHP.TOP_CROS, TopCross); - Shapes.put(TopSHP.TOP_EAST, TopEast); Shapes.put(TopSHP.TOP_ICONE, TopIcone); Shapes.put(TopSHP.TOP_ISD, TopIsol); Shapes.put(TopSHP.TOP_NORTH, TopNorth); - Shapes.put(TopSHP.TOP_SOUTH, TopSouth); Shapes.put(TopSHP.TOP_SPHR, TopSphere); Shapes.put(TopSHP.TOP_SQUR, TopSquare); Shapes.put(TopSHP.TOP_TRI, TopTriangle); - Shapes.put(TopSHP.TOP_ITRI, TopItriangle); Shapes.put(TopSHP.TOP_WEST, TopWest); Shapes.put(TopSHP.TOP_SALT, TopX); Shapes.put(TopSHP.TOP_RHOM, TopRhombus); + Shapes.put(TopSHP.TOP_BESM, TopBesom); Shapes.put(TopSHP.TOP_IBESM, TopIBesom); Shapes.put(TopSHP.TOP_BORD, TopBoard); Shapes.put(TopSHP.TOP_CAN, TopCan); + Shapes.put(TopSHP.TOP_CONE, TopCone); Shapes.put(TopSHP.TOP_CROS, TopCross); Shapes.put(TopSHP.TOP_EAST, TopEast); Shapes.put(TopSHP.TOP_ICONE, TopIcone); + Shapes.put(TopSHP.TOP_ISD, TopIsol); Shapes.put(TopSHP.TOP_NORTH, TopNorth); Shapes.put(TopSHP.TOP_SOUTH, TopSouth); Shapes.put(TopSHP.TOP_SPHR, TopSphere); + Shapes.put(TopSHP.TOP_SQUR, TopSquare); Shapes.put(TopSHP.TOP_TRI, TopTriangle); Shapes.put(TopSHP.TOP_ITRI, TopItriangle); Shapes.put(TopSHP.TOP_WEST, TopWest); + Shapes.put(TopSHP.TOP_SALT, TopX); Shapes.put(TopSHP.TOP_RHOM, TopRhombus); } public static final EnumMap BuoyDeltas = new EnumMap(BoySHP.class); @@ -302,4 +327,5 @@ public static final Delta FloatDelta = new Delta(Handle.BC, AffineTransform.getTranslateInstance(0.0, -42.0)); public static final Delta BeaconDelta = new Delta(Handle.BC, AffineTransform.getTranslateInstance(0.0, -70.0)); + public static final Delta LightDelta = new Delta(Handle.BC, AffineTransform.getTranslateInstance(0.0, -20.0)); }