Index: applications/editors/josm/plugins/seachart/jrender/src/jrender/Jrender.java
===================================================================
--- applications/editors/josm/plugins/seachart/jrender/src/jrender/Jrender.java	(revision 31031)
+++ applications/editors/josm/plugins/seachart/jrender/src/jrender/Jrender.java	(revision 31044)
@@ -10,5 +10,4 @@
 package jrender;
 
-import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
@@ -32,10 +31,10 @@
 import org.w3c.dom.Document;
 
-import render.ChartContext;
-import render.Renderer;
-import render.Rules;
 import s57.S57map;
 import s57.S57map.Feature;
 import s57.S57map.Snode;
+import symbols.*;
+import render.*;
+import render.Rules.RuleSet;
 
 public class Jrender {
@@ -214,5 +213,5 @@
 		Rectangle rect = new Rectangle(size, size);
 		img = new BufferedImage(rect.width, rect.height, BufferedImage.TYPE_INT_ARGB);
-		Renderer.reRender(img.createGraphics(), rect, zoom, 0.05, map, context);
+		Renderer.reRender(img.createGraphics(), RuleSet.BASE, rect, zoom, 0.05, map, context);
 		ByteArrayOutputStream bos = new ByteArrayOutputStream();
 		ImageIO.write(img, "png", bos);
@@ -227,10 +226,10 @@
 			Document document = domImpl.createDocument("http://www.w3.org/2000/svg", "svg", null);
 			SVGGraphics2D svgGenerator = new SVGGraphics2D(document);
-			svgGenerator.setBackground(Rules.Bwater);
+			svgGenerator.setBackground(Symbols.Bwater);
 			svgGenerator.clearRect(rect.x, rect.y, rect.width, rect.height);
 			svgGenerator.setSVGCanvasSize(rect.getSize());
 			svgGenerator.setClip(rect.x, rect.y, rect.width, rect.height);
 //			svgGenerator.translate(-256, -256);
-			Renderer.reRender(svgGenerator, rect, zoom, 0.05, map, context);
+			Renderer.reRender(svgGenerator, RuleSet.BASE, rect, zoom, 0.05, map, context);
 			svgGenerator.stream(dstdir + "tst_" + zoom + "-" + xtile + "-" + ytile + ".svg");
 //		}
@@ -245,5 +244,5 @@
 		g2.scale(s, s);
 		g2.translate(-(256 + (xn * 256 / s)), -(256 + (yn * 256 / s)));
-		Renderer.reRender(g2, new Rectangle(256, 256), zoom, 1, map, context);
+		Renderer.reRender(g2, RuleSet.BASE, new Rectangle(256, 256), zoom, 1, map, context);
 		ByteArrayOutputStream bos = new ByteArrayOutputStream();
 		ImageIO.write(img, "png", bos);