Changeset 31031 in osm for applications/editors/josm/plugins

Timestamp:

2015-02-20T12:34:09+01:00 (9 years ago)

Author:

malcolmh

Message:

cope with missing nodes

Location:

applications/editors/josm/plugins/seachart

Files:

• jrender/src/jrender/Jrender.java (modified) (3 diffs)
• src/render/Renderer.java (modified) (4 diffs)
• src/s57/S57map.java (modified) (3 diffs)

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

@@ -210 +210 @@
                 }
                 
-//              img = new BufferedImage(256, 256, BufferedImage.TYPE_INT_ARGB);
-                Rectangle rect = new Rectangle(2048, 2048);
+                int size = 256;
+                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);
@@ -218 +219 @@
 //              empty = bos.size();
 //              tile(zoom, 1, 0, 0);
-                FileOutputStream fos = new FileOutputStream(dstdir + "tst_" + zoom + ".png");
+                FileOutputStream fos = new FileOutputStream(dstdir + "tst_" + zoom + "-" + xtile + "-" + ytile + ".png");
                 bos.writeTo(fos);
                 fos.close();
@@ -232 +233 @@
 //                      svgGenerator.translate(-256, -256);
                         Renderer.reRender(svgGenerator, rect, zoom, 0.05, map, context);
-                        svgGenerator.stream(dstdir + "tst_" + zoom + ".svg");
+                        svgGenerator.stream(dstdir + "tst_" + zoom + "-" + xtile + "-" + ytile + ".svg");
 //              }
         }

applications/editors/josm/plugins/seachart/src/render/Renderer.java

@@ -195 +195 @@
                                         git.nextEdge();
                                         while (git.hasNode()) {
+                                                Snode node = git.next();
+                                                if (node == null) continue;
                                                 prev = next;
-                                                next = context.getPoint(git.next());
+                                                next = context.getPoint(node);
                                                 angle = Math.atan2(next.getY() - prev.getY(), next.getX() - prev.getX());
                                                 piv = true;
@@ -265 +267 @@
                                 }
                                 while (git.hasNode()) {
-                                        point = context.getPoint(git.next());
+                                        Snode node = git.next();
+                                        if (node == null) continue;
+                                        point = context.getPoint(node);
                                         p.lineTo(point.getX(), point.getY());
                                 }
@@ -343 +347 @@
                                         p.moveTo(point.getX(), point.getY());
                                         while (git.hasNode()) {
-                                                point = context.getPoint(git.next());
+                                                Snode node = git.next();
+                                                if (node == null) continue;
+                                                point = context.getPoint(node);
                                                 p.lineTo(point.getX(), point.getY());
                                         }
@@ -492 +498 @@
                                         git.nextEdge();
                                         while (git.hasNode()) {
+                                                Snode node = git.next();
+                                                if (node == null) continue;
                                                 prev = next;
-                                                next = context.getPoint(git.next());
+                                                next = context.getPoint(node);
                                                 angle = Math.atan2(next.getY() - prev.getY(), next.getX() - prev.getX());
                                                 piv = true;

applications/editors/josm/plugins/seachart/src/s57/S57map.java

@@ -942 +942 @@
                                 while (git.hasNode()) {
                                         node = git.next();
-                                        if (node != null) {
-                                                llon = lon;
-                                                llat = lat;
-                                                lat = node.lat;
-                                                lon = node.lon;
-                                                sigma += (lon * Math.sin(llat)) - (llon * Math.sin(lat));
-                                        }
+                                        if (node == null) continue;
+                                        llon = lon;
+                                        llat = lat;
+                                        lat = node.lat;
+                                        lon = node.lon;
+                                        sigma += (lon * Math.sin(llat)) - (llon * Math.sin(lat));
                                 }
                         }
@@ -1009 +1008 @@
                                         while (git.hasNode()) {
                                                 Snode node = git.next();
+                                                if (node == null) continue;
                                                 lat = node.lat;
                                                 lon = node.lon;
@@ -1031 +1031 @@
                                         while (git.hasNode()) {
                                                 Snode node = git.next();
+                                                if (node == null) continue;
                                                 lat = node.lat;
                                                 lon = node.lon;