Changeset 31028 in osm for applications/editors/josm/plugins/seachart/src/render

Timestamp:

2015-02-20T01:43:42+01:00 (10 years ago)

Author:

malcolmh

Message:

add base map rendering

Location:

applications/editors/josm/plugins/seachart/src/render

Files:

• Renderer.java (modified) (3 diffs)
• Rules.java (modified) (2 diffs)

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

@@ -19 +19 @@
 import s57.S57val.*;
 import s57.S57map;
-import s57.S57obj.Obj;
 import s57.S57map.*;
 import symbols.Areas;
@@ -37 +36 @@
         static int zoom;
 
-        public static void reRender(Graphics2D g, int z, double factor, S57map m, ChartContext c) {
+        public static void reRender(Graphics2D g, Rectangle rect, int z, double factor, S57map m, ChartContext c) {
                 g2 = g;
                 zoom = z;
@@ -44 +43 @@
                 sScale = symbolScale[zoom] * factor;
                 if (map != null) {
+                        g2.setBackground(Rules.Bwater);
+                        g2.clearRect(rect.x, rect.y, rect.width, rect.height);
                         g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
                         g2.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_GASP);

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

@@ -282 +282 @@
                 switch (feature.type) {
                 case BUAARE:
-                        Renderer.lineVector(feature, new LineStyle(new Color(0x40000000, true)));
+                        Renderer.lineVector(feature, new LineStyle(new Color(0x20000000, true)));
                         break;
                 case COALNE:
@@ -289 +289 @@
                 case DEPARE:
                         Double depmax = 0.0;
-                        if (((depmax = (Double) getAttVal(feature, feature.type, 0, Att.DRVAL2)) != null) && (depmax <= 0.0)) {
+                        if (((depmax = (Double) getAttVal(feature, Obj.DEPARE, 0, Att.DRVAL2)) != null) && (depmax <= 0.0)) {
                                 Renderer.lineVector(feature, new LineStyle(Gdries));
                         }