Changeset 33949 in osm for applications

Timestamp:

2017-12-10T13:59:43+01:00 (7 years ago)

Author:

malcolmh

Message:

arrow topmark

Location:

applications/editors/josm

Files:

• dist/SeaChart.jar (modified) ( previous)
• plugins/seachart/jicons/examples.xml (modified) (1 diff)
• plugins/seachart/src/render/Rules.java (modified) (5 diffs)
• plugins/seachart/src/symbols/Beacons.java (modified) (1 diff)
• plugins/seachart/src/symbols/Topmarks.java (modified) (1 diff)

applications/editors/josm/plugins/seachart/jicons/examples.xml

@@ -23 +23 @@
     <tag k="seamark:type" v="light" />
     <tag k="seamark:light:category" v="floodlight" />
+  </icon>
+  <icon width="100" height="150" scale="0.5" file="beacon" format="PNG" >
+    <tag k="seamark:type" v="beacon_lateral" />
+    <tag k="seamark:beacon_lateral:shape" v="stake" />
+    <tag k="seamark:light:category" v="floodlight" />
     <tag k="seamark:topmark:shape" v="arrow" />
+    <tag k="seamark:topmark:status" v="illuminated" />
     <tag k="seamark:topmark:orientation" v="45" />
   </icon>

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

@@ -555 +555 @@
                         } else {
                                 Renderer.symbol(Beacons.Shapes.get(shape), getScheme(feature.type));
-                                AffineTransform tr = new AffineTransform(Topmarks.BeaconDelta.t);
                                 if (feature.objs.containsKey(Obj.TOPMAR)) {
                                         AttMap topmap = feature.objs.get(Obj.TOPMAR).get(0);
@@ -563 +562 @@
                                         if (topmap.containsKey(Att.TOPSHP)) {
                                                 if (topmap.containsKey(Att.ORIENT)) {
-                                                        tr.rotate(Math.toRadians((Double)topmap.get(Att.ORIENT).val));
+//                                                      tr.rotate(Math.toRadians((Double)topmap.get(Att.ORIENT).val));
                                                 }
-                                                Renderer.symbol(Topmarks.Shapes.get(((ArrayList<TopSHP>) (topmap.get(Att.TOPSHP).val)).get(0)), getScheme(Obj.TOPMAR), new Delta(Handle.BC, tr));
+                                                Renderer.symbol(Topmarks.Shapes.get(((ArrayList<TopSHP>) (topmap.get(Att.TOPSHP).val)).get(0)), getScheme(Obj.TOPMAR), Topmarks.BeaconDelta);
                                         }
                                 } else if (feature.objs.containsKey(Obj.DAYMAR)) {
                                         AttMap topmap = feature.objs.get(Obj.DAYMAR).get(0);
-                                        if (topmap.containsKey(Att.STATUS) && (testAttribute(Obj.DAYMAR, Att.STATUS, StsSTS.STS_ILLD))) {
-                                                Renderer.symbol(Beacons.Floodlight);
-                                        }
                                         if (topmap.containsKey(Att.TOPSHP)) {
-                                                if (topmap.containsKey(Att.ORIENT)) {
-                                                        tr.rotate(Math.toRadians((Double)topmap.get(Att.ORIENT).val));
-                                                }
-                                                Renderer.symbol(Topmarks.Shapes.get(((ArrayList<TopSHP>) (topmap.get(Att.TOPSHP).val)).get(0)), getScheme(Obj.DAYMAR), new Delta(Handle.BC, tr));
+                                                Renderer.symbol(Topmarks.Shapes.get(((ArrayList<TopSHP>) (topmap.get(Att.TOPSHP).val)).get(0)), getScheme(Obj.DAYMAR), Topmarks.BeaconDelta);
                                         }
                                 }
@@ -1006 +999 @@
                         if (Renderer.zoom >= 14) {
                                 if (hasAttribute(Obj.LIGHTS, Att.CATLIT) && (testAttribute(Obj.LIGHTS, Att.CATLIT, CatLIT.LIT_FLDL))) {
-                                        Renderer.symbol(Beacons.Floodlight);
+                                        Renderer.symbol(Beacons.Floodlight, new Delta(Handle.CC, AffineTransform.getRotateInstance(Math.toRadians(180))));
                                         Renderer.symbol(Harbours.SignalStation);
                                 } else {
@@ -1018 +1011 @@
                 }
                 if (ok) {
-                        AffineTransform tr = new AffineTransform();
                         if (feature.objs.containsKey(Obj.TOPMAR)) {
                                 if (hasAttribute(Obj.TOPMAR, Att.STATUS) && (testAttribute(Obj.TOPMAR, Att.STATUS, StsSTS.STS_ILLD))) {
@@ -1025 +1017 @@
                                 AttMap topmap = feature.objs.get(Obj.TOPMAR).get(0);
                                 if (topmap.containsKey(Att.TOPSHP)) {
-                                        if (topmap.containsKey(Att.ORIENT)) {
-                                                tr.rotate(Math.toRadians((Double)topmap.get(Att.ORIENT).val));
-                                        }
-                                        tr.concatenate(Topmarks.LightDelta.t);
-                                        Renderer.symbol(Topmarks.Shapes.get(((ArrayList<TopSHP>) (topmap.get(Att.TOPSHP).val)).get(0)), getScheme(Obj.TOPMAR), new Delta(Handle.BC, tr));
+                                        Renderer.symbol(Topmarks.Shapes.get(((ArrayList<TopSHP>) (topmap.get(Att.TOPSHP).val)).get(0)), getScheme(Obj.TOPMAR), Topmarks.LightDelta);
                                 }
                         } else if (feature.objs.containsKey(Obj.DAYMAR)) {
-                                if (hasAttribute(Obj.DAYMAR, Att.STATUS) && (testAttribute(Obj.DAYMAR, Att.STATUS, StsSTS.STS_ILLD))) {
-                                        Renderer.symbol(Beacons.Floodlight);
-                                }
                                 AttMap topmap = feature.objs.get(Obj.DAYMAR).get(0);
                                 if (topmap.containsKey(Att.TOPSHP)) {
-                                        if (topmap.containsKey(Att.ORIENT)) {
-                                                tr.rotate(Math.toRadians((Double)topmap.get(Att.ORIENT).val));
-                                        }
-                                        tr.concatenate(Topmarks.LightDelta.t);
-                                        Renderer.symbol(Topmarks.Shapes.get(((ArrayList<TopSHP>) (topmap.get(Att.TOPSHP).val)).get(0)), getScheme(Obj.DAYMAR), new Delta(Handle.BC, tr));
+                                        Renderer.symbol(Topmarks.Shapes.get(((ArrayList<TopSHP>) (topmap.get(Att.TOPSHP).val)).get(0)), getScheme(Obj.DAYMAR), Topmarks.LightDelta);
                                 }
                         }

applications/editors/josm/plugins/seachart/src/symbols/Beacons.java

@@ -65 +65 @@
     public static final Symbol Floodlight = new Symbol();
     static {
-        Floodlight.add(new Instr(Form.BBOX, new Rectangle2D.Double(-20, -100, 100, 100)));
+        Floodlight.add(new Instr(Form.BBOX, new Rectangle2D.Double(-50, -50, 100, 100)));
         Floodlight.add(new Instr(Form.STRK, new BasicStroke(4, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND)));
         Floodlight.add(new Instr(Form.FILL, new Color(0xffa000)));

applications/editors/josm/plugins/seachart/src/symbols/Topmarks.java

@@ -45 +45 @@
         TopArrow.add(new Instr(Form.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
         TopArrow.add(new Instr(Form.FILL, Color.black));
-      Path2D.Double p = new Path2D.Double(); p.moveTo(0, 0); p.lineTo(0, -25); p.lineTo(-10, -25); p.lineTo(-10, -43);
-      p.lineTo(0, -50); p.lineTo(10, -43); p.lineTo(10, -25); p.lineTo(0, -25);
+      Path2D.Double p = new Path2D.Double(); p.moveTo(0, 0); p.lineTo(0, -30); p.lineTo(-25, -30); p.lineTo(-30, -20); p.lineTo(-25, -10); p.lineTo(0, -10);
         TopArrow.add(new Instr(Form.PLIN, p));
     }