Changeset 31157 in osm for applications/editors/josm/plugins/seachart

Timestamp:

2015-05-28T21:10:44+02:00 (9 years ago)

Author:

malcolmh

Message:

clip to map bounds

Location:

applications/editors/josm/plugins/seachart

Files:

• jicons/src/jicons/Jicons.java (modified) (1 diff)
• js57toosm/src/js57toosm/Js57toosm.java (modified) (1 diff)
• src/render/Renderer.java (modified) (1 diff)
• src/s57/S57map.java (modified) (3 diffs)
• src/seachart/SeachartAction.java (modified) (2 diffs)

applications/editors/josm/plugins/seachart/jicons/src/jicons/Jicons.java

@@ -130 +130 @@
                                         s = 0;
                                         file = format = "";
-                                        map = new S57map();
+                                        map = new S57map(true);
                                         map.addNode(0, 0, 0);
                                         for (String token : ln.split("[ ]+")) {

applications/editors/josm/plugins/seachart/js57toosm/src/js57toosm/Js57toosm.java

@@ -48 +48 @@
                         tin.close();
                 
-                map = new S57map();
+                map = new S57map(true);
                 MapBounds bounds = S57dec.decodeFile(in, map);
 

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

@@ -43 +43 @@
                 sScale = symbolScale[zoom] * factor;
                 if (map != null) {
+                        Point2D tl = context.getPoint(map.new Snode(map.bounds.maxlat, map.bounds.minlon));
+                        Point2D br = context.getPoint(map.new Snode(map.bounds.minlat, map.bounds.maxlon));
+                        g2.clip(new Rectangle2D.Double(tl.getX(), tl.getY(), (br.getX() - tl.getX()), (br.getY() - tl.getY())));
                         g2.setBackground(Symbols.Bwater);
                         g2.clearRect(rect.x, rect.y, rect.width, rect.height);

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

@@ -224 +224 @@
         }
         
-        class OSMtag {
-                String key;
-                String val;
-                OSMtag(String k, String v) {
-                        key = k;
-                        val = v;
-                }
-        }
-        
         public NodeTab nodes;
         public EdgeTab edges;
@@ -246 +237 @@
         private Edge edge;
         private KeyVal<?> osm = S57osm.OSMtag("", "");
-
-        public S57map() {
+        boolean sea;
+
+        public S57map(boolean s) {
+                sea = s;
                 nodes = new NodeTab();          // All nodes in map
                 edges = new EdgeTab();          // All edges in map
@@ -477 +470 @@
                                 }
                         }
-                } else {
+                } else if (!sea) {
                         KeyVal<?> kv = S57osm.OSMtag(key, val);
                         if (kv.obj != Obj.UNKOBJ) {

applications/editors/josm/plugins/seachart/src/seachart/SeachartAction.java

@@ -111 +111 @@
 
         protected void createChartLayer() {
-                // System.out.println("hello");
                 rendering = new ChartImage(new ImageryInfo("SeaChart"));
                 rendering.setBackgroundLayer(true);
@@ -145 +144 @@
 
         void makeChart() {
-                map = new S57map();
+                map = new S57map(false);
                 if (data != null) {
                         double minlat = 90;