Changeset 32082 in osm for applications/editors/josm/plugins/seachart/jbasemap/src

Timestamp:

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

Author:

malcolmh

Message:

[seachart] update

File:

• applications/editors/josm/plugins/seachart/jbasemap/src/jbasemap/Jbasemap.java (modified) (6 diffs)

applications/editors/josm/plugins/seachart/jbasemap/src/jbasemap/Jbasemap.java

@@ -35 +35 @@
         static Context context;
         static S57map map;
+        static int zoom;
+        static double z2;
 
         static class Context implements ChartContext {
@@ -42 +44 @@
           
           public Context () {
-                        top = (1.0 - Math.log(Math.tan(map.bounds.maxlat) + 1.0 / Math.cos(map.bounds.maxlat)) / Math.PI) / 2.0 * 256.0 * 512.0;
+                        top = (1.0 - Math.log(Math.tan(map.bounds.maxlat) + 1.0 / Math.cos(map.bounds.maxlat)) / Math.PI) / 2.0 * 256.0 * z2;
                         mile = 256 / ((Math.toDegrees(map.bounds.maxlat) - Math.toDegrees(map.bounds.minlat)) * 60);
           }
           
                 public Point2D getPoint(Snode coord) {
-                        double x = (Math.toDegrees(coord.lon) - Math.toDegrees(map.bounds.minlon)) * 256.0 * 256.0 / 180.0;
-                        double y = ((1.0 - Math.log(Math.tan(coord.lat) + 1.0 / Math.cos(coord.lat)) / Math.PI) / 2.0 * 256.0 * 512.0) - top;
+                        double x = (Math.toDegrees(coord.lon) - Math.toDegrees(map.bounds.minlon)) * 256.0 * (z2 / 2) / 180.0;
+                        double y = ((1.0 - Math.log(Math.tan(coord.lat) + 1.0 / Math.cos(coord.lat)) / Math.PI) / 2.0 * 256.0 * z2) - top;
                         return new Point2D.Double(x, y);
                 }
@@ -60 +62 @@
                 }
 
-                public Color background() {
+                public Color background(S57map map) {
                         if (map.features.containsKey(Obj.COALNE)) {
-                                return Symbols.Bwater;
+                                for (Feature feature : map.features.get(Obj.COALNE)) {
+                                        if (feature.geom.prim == Pflag.POINT) {
+                                                break;
+                                        }
+                                        GeomIterator git = map.new GeomIterator(feature.geom);
+                                        git.nextComp();
+                                        while (git.hasEdge()) {
+                                                git.nextEdge();
+                                                while (git.hasNode()) {
+                                                        Snode node = git.next();
+                                                        if (node == null)
+                                                                continue;
+                                                        if ((node.lat >= map.bounds.minlat) && (node.lat <= map.bounds.maxlat) && (node.lon >= map.bounds.minlon) && (node.lon <= map.bounds.maxlon)) {
+                                                                return Symbols.Bwater;
+                                                        }
+                                                }
+                                        }
+                                }
+                                return Symbols.Yland;
                         } else {
-                                return Symbols.Yland;
+                                if (map.features.containsKey(Obj.ROADWY) || map.features.containsKey(Obj.RAILWY) || map.features.containsKey(Obj.LAKARE) || map.features.containsKey(Obj.RIVERS) || map.features.containsKey(Obj.CANALS)) {
+                                        return Symbols.Yland;
+                                } else {
+                                        return Symbols.Bwater;
+                                }
                         }
                 }
@@ -74 +98 @@
         
         public static void main(String[] args) throws IOException {
+                if (args.length < 5) {
+                        System.err.println("Usage: java -jar jbasemap.jar OSM_file SVG_file zoom xtile ytile");
+                        System.exit(-1);
+                }
                 src = args[0];
                 dst = args[1];
+                zoom = Integer.parseInt(args[2]);
+                z2 = Math.pow(2, zoom);
+                double scale = 0.1;
                 try {
                         BufferedReader in = new BufferedReader(new FileReader(src));
                         map = new S57map(false);
-                        if (args.length == 4) {
-                                map.bounds.maxlat = Math.atan(Math.sinh(Math.PI * (1 - 2 * Double.parseDouble(args[3]) / 512))) * 180.0 / Math.PI;
-                                map.bounds.minlat = Math.atan(Math.sinh(Math.PI * (1 - 2 * (Double.parseDouble(args[3]) + 1) / 512))) * 180.0 / Math.PI;
-                                map.bounds.minlon = Double.parseDouble(args[2]) / 512 * 360.0 - 180.0;
-                                map.bounds.maxlon = (Double.parseDouble(args[2]) + 1) / 512 * 360.0 - 180.0;
-                        }
                         try {
-                                S57osm.OSMmap(in, map);
+                                S57osm.OSMmap(in, map, true);
                         } catch (Exception e) {
                                 System.err.println("Input data error");
@@ -96 +121 @@
                         System.exit(-1);
                 }
+                map.bounds.maxlat = Math.atan(Math.sinh(Math.PI * (1 - 2 * Double.parseDouble(args[4]) / z2)));
+                map.bounds.minlat = Math.atan(Math.sinh(Math.PI * (1 - 2 * (Double.parseDouble(args[4]) + 1) / z2)));
+                map.bounds.minlon = Math.toRadians(Double.parseDouble(args[3]) / z2 * 360.0 - 180.0);
+                map.bounds.maxlon = Math.toRadians((Double.parseDouble(args[3]) + 1) / z2 * 360.0 - 180.0);
                 context = new Context();
                 Rectangle rect = new Rectangle(256, 256);
@@ -104 +133 @@
                 svgGenerator.setSVGCanvasSize(rect.getSize());
                 svgGenerator.setClip(rect.x, rect.y, rect.width, rect.height);
-                Renderer.reRender(svgGenerator, rect, 9, 0.002, map, context);
+                Renderer.reRender(svgGenerator, rect, zoom, scale, map, context);
                 svgGenerator.stream(dst);
                 System.exit(0);