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

Timestamp:

2015-02-19T21:52:40+01:00 (10 years ago)

Author:

malcolmh

Message:

add base map rendering

File:

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

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

@@ -33 +33 @@
 import render.ChartContext;
 import render.Renderer;
+import render.Rules;
 import s57.S57map;
 import s57.S57map.Feature;
@@ -154 +155 @@
                                         }
                                 } else if (ln.contains("</osm")) {
+                                        map.mapDone();
                                         inOsm = false;
                                         break;
@@ -167 +169 @@
                                                                 type = (token.split("[\"\']")[1]);
                                                         } else if (token.matches("^role=.+")) {
-                                                                role = (token.split("[\"\']")[1]);
+                                                                String str[] = token.split("[\"\']");
+                                                                if (str.length > 1) {
+                                                                        role = (token.split("[\"\']")[1]);
+                                                                }
                                                         }
                                                 }
@@ -193 +198 @@
                                 inOsm = true;
                                 map = new S57map();
+                                map.addNode(1, maxlat, minlon);
+                                map.addNode(2, minlat, minlon);
+                                map.addNode(3, minlat, maxlon);
+                                map.addNode(4, maxlat, maxlon);
+                                map.bounds.minlat = Math.toRadians(minlat);
+                                map.bounds.maxlat = Math.toRadians(maxlat);
+                                map.bounds.minlon = Math.toRadians(minlon);
+                                map.bounds.maxlon = Math.toRadians(maxlon);
                         }
                 }
                 
-                img = new BufferedImage(256, 256, BufferedImage.TYPE_INT_ARGB);
+/*              img = new BufferedImage(256, 256, BufferedImage.TYPE_INT_ARGB);
                 Renderer.reRender(img.createGraphics(), 12, 1, map, context);
                 ByteArrayOutputStream bos = new ByteArrayOutputStream();
@@ -202 +215 @@
                 empty = bos.size();
                 tile(zoom, 1, 0, 0);
-
-                for (int z = 12; z <= 18; z++) {
+*/
+//              for (int z = 12; z <= 18; z++) {
+int z = 9;
                         DOMImplementation domImpl = GenericDOMImplementation.getDOMImplementation();
                         Document document = domImpl.createDocument("http://www.w3.org/2000/svg", "svg", null);
                         SVGGraphics2D svgGenerator = new SVGGraphics2D(document);
-                        svgGenerator.setSVGCanvasSize(new Dimension(256, 256));
-                        svgGenerator.setClip(0, 0, 256, 256);
-                        svgGenerator.translate(-256, -256);
-                        Renderer.reRender(svgGenerator, z, 1, map, context);
+                        svgGenerator.setBackground(Rules.Bwater);
+                        svgGenerator.clearRect(0, 0, 2048, 2048);
+                        svgGenerator.setSVGCanvasSize(new Dimension(2048, 2048));
+                        svgGenerator.setClip(0, 0, 2048, 2048);
+//                      svgGenerator.translate(-2048, -2048);
+                        Renderer.reRender(svgGenerator, z, 0.05, map, context);
                         svgGenerator.stream(dstdir + "tst_" + z + ".svg");
-                }
+//              }
         }
         
@@ -281 +297 @@
                 send = new ArrayList<String>();
                 deletes = new HashMap<String, Boolean>();
-                BufferedReader in = new BufferedReader(new FileReader(srcdir + xtile + "-" + ytile + "-" + zoom + ".osm"));
+                BufferedReader in = new BufferedReader(new FileReader(srcdir + zoom + "-" + xtile + "-" + ytile + ".osm"));
                 String ln;
                 while ((ln = in.readLine()) != null) {