Changeset 31027 in osm for applications/editors/josm/plugins/seachart/src/render/Renderer.java

Timestamp:

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

Author:

malcolmh

Message:

add base map rendering

File:

• applications/editors/josm/plugins/seachart/src/render/Renderer.java (modified) (4 diffs)

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

@@ -16 +16 @@
 import java.util.*;
 
+import render.Rules.*;
 import s57.S57val.*;
 import s57.S57map;
+import s57.S57obj.Obj;
 import s57.S57map.*;
 import symbols.Areas;
@@ -45 +47 @@
                         g2.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_GASP);
                         g2.setStroke(new BasicStroke(0, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER));
-                        Rules.rules();
+                        Rules.rules(RuleSet.BASE);
                 }
         }
@@ -267 +269 @@
                         }
                 }
+                if ((style.fill != null) && (feature.geom.prim == Pflag.AREA)) {
+                        g2.setPaint(style.fill);
+                        g2.fill(p);
+                }
                 if (style.line != null) {
                         if (style.dash != null) {
@@ -276 +282 @@
                                 g2.setStroke(new BasicStroke((float) (style.width * sScale), BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND, 1, dash, 0));
                         } else {
-                                g2.setStroke(new BasicStroke((float) (style.width * sScale), BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND));
+                                g2.setStroke(new BasicStroke((float) (style.width * sScale), BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
                         }
                         g2.setPaint(style.line);
                         g2.draw(p);
-                }
-                if (style.fill != null) {
-                        g2.setPaint(style.fill);
-                        g2.fill(p);
                 }
         }