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

Timestamp:

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

Author:

malcolmh

Message:

arrow topmark

File:

• applications/editors/josm/plugins/seachart/src/render/Rules.java (modified) (5 diffs)

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);
                                 }
                         }