Changeset 35404 in osm for applications/editors/josm/plugins/seachart/jchart/src

Timestamp:

2020-03-29T23:03:21+02:00 (5 years ago)

Author:

malcolmh

Message:

more map features

File:

• applications/editors/josm/plugins/seachart/jchart/src/jchart/Jchart.java (modified) (4 diffs)

applications/editors/josm/plugins/seachart/jchart/src/jchart/Jchart.java

@@ -103 +103 @@
                             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.Gdries;
                             }
                         }
@@ -114 +114 @@
                     return Symbols.Yland;
                 } else {
-                    return Symbols.Bwater;
+                    return Symbols.Gdries;
                 }
             }
@@ -127 +127 @@
     public static void main(String[] args) throws Exception {
         if (args.length < 4) {
-            System.err.println("Usage: java -jar jrender.jar <osm data file> <zoom> <scale> <output image file>");
+            System.err.println("Usage: java -jar jrender.jar <osm data file> <zoom> <scale> <output image file> [<bounds (S W N E)>]");
             System.exit(-1);
         }
@@ -134 +134 @@
         map = new S57map(false);
         S57osm.OSMmap(in, map, false);
-//        in.close();
+        if (args.length >= 8) {
+            map.bounds.minlat = Math.toRadians(Double.parseDouble(args[4]));
+            map.bounds.minlon = Math.toRadians(Double.parseDouble(args[5]));
+            map.bounds.maxlat = Math.toRadians(Double.parseDouble(args[6]));
+            map.bounds.maxlon = Math.toRadians(Double.parseDouble(args[7]));
+        }
+        if ((map.bounds.minlat == Math.toRadians(90)) || (map.bounds.minlon == Math.toRadians(180)) ||
+            (map.bounds.maxlat == Math.toRadians(-90)) || (map.bounds.maxlon == Math.toRadians(-180))) {
+            System.err.println("Invalid map bounds");
+            System.exit(-1);
+        }
         context = new Context();
         Point2D size = context.getPoint(new Snode(map.bounds.minlat, map.bounds.maxlon));