Changeset 33947 in osm for applications/editors/josm

Timestamp:

2017-12-09T16:13:19+01:00 (7 years ago)

Author:

malcolmh

Message:

illuminated topmarks

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) (2 diffs)

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

@@ -17 +17 @@
     <tag k="seamark:type" v="beacon_special_purpose" />
     <tag k="seamark:beacon_special_purpose:shape" v="stake" />
-    <tag k="seamark:topmark:shape" v="arrow" />
+    <tag k="seamark:topmark:shape" v="triangle, point up" />
     <tag k="seamark:topmark:status" v="illuminated" />
-    <tag k="seamark:topmark:orientation" v="45" />
   </icon>
   <icon width="100" height="100" scale="0.5" file="floodlight" format="PNG" >

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

@@ -558 +558 @@
                                 if (feature.objs.containsKey(Obj.TOPMAR)) {
                                         AttMap topmap = feature.objs.get(Obj.TOPMAR).get(0);
+                                        if (topmap.containsKey(Att.STATUS) && (testAttribute(Obj.TOPMAR, Att.STATUS, StsSTS.STS_ILLD))) {
+                                                Renderer.symbol(Beacons.Floodlight);
+                                        }
                                         if (topmap.containsKey(Att.TOPSHP)) {
                                                 if (topmap.containsKey(Att.ORIENT)) {
@@ -566 +569 @@
                                 } 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)) {