Changeset 31532 in osm for applications/editors/josm/plugins/seachart/jrender/src

Timestamp:

2015-08-29T16:55:46+02:00 (9 years ago)

Author:

malcolmh

Message:

update

File:

• applications/editors/josm/plugins/seachart/jrender/src/jrender/Jrender.java (modified) (8 diffs)

applications/editors/josm/plugins/seachart/jrender/src/jrender/Jrender.java

@@ -10 +10 @@
 package jrender;
 
+import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
@@ -36 +37 @@
 import symbols.*;
 import render.*;
-import render.Rules.RuleSet;
+import render.ChartContext.RuleSet;
 
 public class Jrender {
@@ -66 +67 @@
           }
           
-                @Override
                 public Point2D getPoint(Snode coord) {
                         double x = (Math.toDegrees(coord.lon) - minlon) * 256.0 * 2048.0 / 180.0;
@@ -73 +73 @@
                 }
 
-                @Override
                 public double mile(Feature feature) {
                         return mile;
+                }
+
+                public boolean clip() {
+                        return false;
+                }
+
+                public Color background() {
+                        return new Color(0, true);
+                }
+
+                public RuleSet ruleset() {
+                        return RuleSet.ALL;
                 }
         }
@@ -197 +208 @@
                         } else if (ln.contains("<osm")) {
                                 inOsm = true;
-                                map = new S57map();
+                                map = new S57map(context.ruleset() == RuleSet.SEAMARK);
                                 map.addNode(1, maxlat, minlon);
                                 map.addNode(2, minlat, minlon);
@@ -213 +224 @@
                 Rectangle rect = new Rectangle(size, size);
                 img = new BufferedImage(rect.width, rect.height, BufferedImage.TYPE_INT_ARGB);
-                Renderer.reRender(img.createGraphics(), RuleSet.BASE, rect, zoom, 0.05, map, context);
+                Renderer.reRender(img.createGraphics(), rect, zoom, 0.05, map, context);
                 ByteArrayOutputStream bos = new ByteArrayOutputStream();
                 ImageIO.write(img, "png", bos);
@@ -231 +242 @@
                         svgGenerator.setClip(rect.x, rect.y, rect.width, rect.height);
 //                      svgGenerator.translate(-256, -256);
-                        Renderer.reRender(svgGenerator, RuleSet.BASE, rect, zoom, 0.05, map, context);
+                        Renderer.reRender(svgGenerator, rect, zoom, 0.05, map, context);
                         svgGenerator.stream(dstdir + "tst_" + zoom + "-" + xtile + "-" + ytile + ".svg");
 //              }
@@ -244 +255 @@
                 g2.scale(s, s);
                 g2.translate(-(256 + (xn * 256 / s)), -(256 + (yn * 256 / s)));
-                Renderer.reRender(g2, RuleSet.BASE, new Rectangle(256, 256), zoom, 1, map, context);
+                Renderer.reRender(g2, new Rectangle(256, 256), zoom, 1, map, context);
                 ByteArrayOutputStream bos = new ByteArrayOutputStream();
                 ImageIO.write(img, "png", bos);