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

Timestamp:

2017-12-07T19:16:59+01:00 (7 years ago)

Author:

malcolmh

Message:

[Seachart] Publish new release

File:

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

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

@@ -32 +32 @@
 import s57.S57val.CatHAF;
 import s57.S57val.CatLAM;
+import s57.S57val.CatLIT;
 import s57.S57val.CatLMK;
 import s57.S57val.CatMOR;
@@ -1058 +1059 @@
         case PILPNT:
             if (Renderer.zoom >= 14) {
-                Renderer.symbol(Beacons.LightMinor);
-                ok = true;
+              if (hasAttribute(Obj.LIGHTS, Att.CATLIT) && (testAttribute(Obj.LIGHTS, Att.CATLIT, CatLIT.LIT_FLDL))) {
+                Renderer.symbol(Beacons.Floodlight);
+                Renderer.symbol(Harbours.SignalStation);
+              } else {
+                Renderer.symbol(Beacons.LightMinor);
+              }
+              ok = true;
             }
             break;
@@ -1066 +1072 @@
         }
         if (ok) {
+                AffineTransform tr = new AffineTransform();
             if (feature.objs.containsKey(Obj.TOPMAR)) {
                 AttMap topmap = feature.objs.get(Obj.TOPMAR).get(0);
                 if (topmap.containsKey(Att.TOPSHP)) {
-                    Renderer.symbol(Topmarks.Shapes.get(((ArrayList<TopSHP>) (topmap.get(Att.TOPSHP).val)).get(0)),
-                            getScheme(Obj.TOPMAR), Topmarks.LightDelta);
+                        if (hasAttribute(Obj.TOPMAR, Att.ORIENT)) {
+                                tr.rotate(Math.toRadians((Double)getAttVal(Obj.TOPMAR, Att.ORIENT)));
+                        }
+                        tr.translate(0, -20);
+                  Renderer.symbol(Topmarks.Shapes.get(((ArrayList<TopSHP>) (topmap.get(Att.TOPSHP).val)).get(0)),
+                                getScheme(Obj.TOPMAR), new Delta(Handle.BC, tr));
                 }
             } else if (feature.objs.containsKey(Obj.DAYMAR)) {
                 AttMap topmap = feature.objs.get(Obj.DAYMAR).get(0);
                 if (topmap.containsKey(Att.TOPSHP)) {
-                    Renderer.symbol(Topmarks.Shapes.get(((ArrayList<TopSHP>) (topmap.get(Att.TOPSHP).val)).get(0)),
-                            getScheme(Obj.DAYMAR), Topmarks.LightDelta);
+                        if (hasAttribute(Obj.DAYMAR, Att.ORIENT)) {
+                                tr.rotate(Math.toRadians((Double)getAttVal(Obj.DAYMAR, Att.ORIENT)));
+                        }
+                        tr.translate(0, -20);
+                  Renderer.symbol(Topmarks.Shapes.get(((ArrayList<TopSHP>) (topmap.get(Att.TOPSHP).val)).get(0)),
+                                getScheme(Obj.DAYMAR), new Delta(Handle.BC, tr));
                 }
             }