Changeset 32082 in osm for applications/editors/josm/plugins/seachart/jrender

Timestamp:

2016-02-27T09:09:45+01:00 (9 years ago)

Author:

malcolmh

Message:

[seachart] update

File:

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

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

@@ -35 +35 @@
 import s57.S57osm;
 import s57.S57map.*;
-import symbols.*;
 import render.*;
 
@@ -53 +52 @@
         static class Context implements ChartContext {
                 
-          static double top = 0;
-          static double mile = 0;
+          static double top;
+          static double mile;
           
           public Context () {
@@ -75 +74 @@
                 }
 
-                public Color background() {
+                public Color background(S57map map) {
                         return new Color(0, true);
                 }
@@ -88 +87 @@
                 context = new Context();
 
-                int size = 256;
-                for (int i = 0; i < (12 - zoom); i++) size *= 2;
+                int size = 768;
+//              for (int i = 0; i < (12 - zoom); i++) size *= 2;
                 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);
-                ByteArrayOutputStream bos = new ByteArrayOutputStream();
-                ImageIO.write(img, "png", bos);
+//              img = new BufferedImage(rect.width, rect.height, BufferedImage.TYPE_INT_ARGB);
+//              Renderer.reRender(img.createGraphics(), rect, zoom, 0.05, map, context);
+//              ByteArrayOutputStream bos = new ByteArrayOutputStream();
+//              ImageIO.write(img, "png", bos);
 //              empty = bos.size();
 //              tile(zoom, 1, 0, 0);
-                FileOutputStream fos = new FileOutputStream(dstdir + "tst_" + zoom + "-" + xtile + "-" + ytile + ".png");
-                bos.writeTo(fos);
-                fos.close();
+//              FileOutputStream fos = new FileOutputStream(dstdir + "tst_" + zoom + "-" + xtile + "-" + ytile + ".png");
+//              bos.writeTo(fos);
+//              fos.close();
 
 //              for (int z = 12; z <= 18; z++) {
@@ -110 +109 @@
                         svgGenerator.setClip(rect.x, rect.y, rect.width, rect.height);
 //                      svgGenerator.translate(-256, -256);
-                        Renderer.reRender(svgGenerator, rect, zoom, 0.05, map, context);
-                        svgGenerator.stream(dstdir + "tst_" + zoom + "-" + xtile + "-" + ytile + ".svg");
+                        Renderer.reRender(svgGenerator, rect, zoom, 1.0, map, context);
+//                      svgGenerator.stream(dstdir + "tst_" + zoom + "-" + xtile + "-" + ytile + ".svg");
+svgGenerator.stream(dstdir);
 //              }
         }
@@ -180 +180 @@
                 send = new ArrayList<String>();
                 deletes = new HashMap<String, Boolean>();
-                BufferedReader in = new BufferedReader(new FileReader(srcdir + zoom + "-" + xtile + "-" + ytile + ".osm"));
+//              BufferedReader in = new BufferedReader(new FileReader(srcdir + zoom + "-" + xtile + "-" + ytile + ".osm"));
+BufferedReader in = new BufferedReader(new FileReader(srcdir));
                 map = new S57map(true);
-                S57osm.OSMmap(in, map);
+                S57osm.OSMmap(in, map, false);
                 in.close();
-                if (zoom == 12) {
-                        clean(12, 0, 0);
-                }
+//              if (zoom == 12) {
+//                      clean(12, 0, 0);
+//              }
                 tileMap(dstdir, zoom);
-                if ((send.size() + deletes.size()) > 0) {
-                        PrintWriter writer = new PrintWriter(srcdir + zoom + "-" + xtile + "-" + ytile + ".send", "UTF-8");
-                        for (String str : send) {
-                                writer.println(str);
-                        }
-                        for (String del : deletes.keySet()) {
-                                writer.println("rm " + del);
-                        }
-                        writer.close();
-                }
+//              if ((send.size() + deletes.size()) > 0) {
+//                      PrintWriter writer = new PrintWriter(srcdir + zoom + "-" + xtile + "-" + ytile + ".send", "UTF-8");
+//                      for (String str : send) {
+//                              writer.println(str);
+//                      }
+//                      for (String del : deletes.keySet()) {
+//                              writer.println("rm " + del);
+//                      }
+//                      writer.close();
+//              }
                 System.exit(0);
         }