Niord josm seachart

niord-core/src/main/java/org/niord/core/aton/vo/AtonNodeVo.java

@@ -27,6 +27,8 @@
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.Optional;
+import java.util.stream.Stream;
 
 /**
  * An AtoN OSM seamark node.
@@ -151,6 +153,20 @@ public int hashCode() {
         return result;
     }
 
+    /**
+     * Checks whether the current node is for a virtual AtoN.
+     * @return
+     */
+    public boolean isVAtoN() {
+        if(tags == null) {
+            return false;
+        }
+        return Stream.of(Optional.of(tags).orElse(new AtonTagVo[0]))
+                .filter(tag -> tag.k.equals("seamark:type") && tag.v.equals("virtual_aton"))
+                .findAny()
+                .isPresent();
+    }
+
     /*************************/
     /** Matcher functions   **/
     /*************************/

niord-josm-seachart/src/main/java/render/ChartContext.java

@@ -13,14 +13,24 @@
 import java.awt.geom.Point2D;
 
 import s57.S57map;
-import s57.S57map.*;
+import s57.S57map.Feature;
+import s57.S57map.Snode;
 
+/**
+ * @author Malcolm Herring
+ */
 public interface ChartContext {
-	public enum RuleSet { ALL, BASE, SEAMARK }
+	enum RuleSet { ALL, BASE, SEAMARK }
 
 	Point2D getPoint(Snode coord);
+
 	double mile(Feature feature);
+
 	boolean clip();
+
+	int grid();
+
 	Color background(S57map map);
+
 	RuleSet ruleset();
 }