Index: /applications/editors/josm/plugins/seachart/jicons/src/jicons/Jicons.java
===================================================================
--- /applications/editors/josm/plugins/seachart/jicons/src/jicons/Jicons.java	(revision 31156)
+++ /applications/editors/josm/plugins/seachart/jicons/src/jicons/Jicons.java	(revision 31157)
@@ -130,5 +130,5 @@
 					s = 0;
 					file = format = "";
-					map = new S57map();
+					map = new S57map(true);
 					map.addNode(0, 0, 0);
 					for (String token : ln.split("[ ]+")) {
Index: /applications/editors/josm/plugins/seachart/js57toosm/src/js57toosm/Js57toosm.java
===================================================================
--- /applications/editors/josm/plugins/seachart/js57toosm/src/js57toosm/Js57toosm.java	(revision 31156)
+++ /applications/editors/josm/plugins/seachart/js57toosm/src/js57toosm/Js57toosm.java	(revision 31157)
@@ -48,5 +48,5 @@
 			tin.close();
 		
-		map = new S57map();
+		map = new S57map(true);
 		MapBounds bounds = S57dec.decodeFile(in, map);
 
Index: /applications/editors/josm/plugins/seachart/src/render/Renderer.java
===================================================================
--- /applications/editors/josm/plugins/seachart/src/render/Renderer.java	(revision 31156)
+++ /applications/editors/josm/plugins/seachart/src/render/Renderer.java	(revision 31157)
@@ -43,4 +43,7 @@
 		sScale = symbolScale[zoom] * factor;
 		if (map != null) {
+			Point2D tl = context.getPoint(map.new Snode(map.bounds.maxlat, map.bounds.minlon));
+			Point2D br = context.getPoint(map.new Snode(map.bounds.minlat, map.bounds.maxlon));
+			g2.clip(new Rectangle2D.Double(tl.getX(), tl.getY(), (br.getX() - tl.getX()), (br.getY() - tl.getY())));
 			g2.setBackground(Symbols.Bwater);
 			g2.clearRect(rect.x, rect.y, rect.width, rect.height);
Index: /applications/editors/josm/plugins/seachart/src/s57/S57map.java
===================================================================
--- /applications/editors/josm/plugins/seachart/src/s57/S57map.java	(revision 31156)
+++ /applications/editors/josm/plugins/seachart/src/s57/S57map.java	(revision 31157)
@@ -224,13 +224,4 @@
 	}
 	
-	class OSMtag {
-		String key;
-		String val;
-		OSMtag(String k, String v) {
-			key = k;
-			val = v;
-		}
-	}
-	
 	public NodeTab nodes;
 	public EdgeTab edges;
@@ -246,6 +237,8 @@
 	private Edge edge;
 	private KeyVal<?> osm = S57osm.OSMtag("", "");
-
-	public S57map() {
+	boolean sea;
+
+	public S57map(boolean s) {
+		sea = s;
 		nodes = new NodeTab();		// All nodes in map
 		edges = new EdgeTab();		// All edges in map
@@ -477,5 +470,5 @@
 				}
 			}
-		} else {
+		} else if (!sea) {
 			KeyVal<?> kv = S57osm.OSMtag(key, val);
 			if (kv.obj != Obj.UNKOBJ) {
Index: /applications/editors/josm/plugins/seachart/src/seachart/SeachartAction.java
===================================================================
--- /applications/editors/josm/plugins/seachart/src/seachart/SeachartAction.java	(revision 31156)
+++ /applications/editors/josm/plugins/seachart/src/seachart/SeachartAction.java	(revision 31157)
@@ -111,5 +111,4 @@
 
 	protected void createChartLayer() {
-		// System.out.println("hello");
 		rendering = new ChartImage(new ImageryInfo("SeaChart"));
 		rendering.setBackgroundLayer(true);
@@ -145,5 +144,5 @@
 
 	void makeChart() {
-		map = new S57map();
+		map = new S57map(false);
 		if (data != null) {
 			double minlat = 90;