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

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

Files:

• render/Renderer.java (modified) (3 diffs)
• render/Rules.java (modified) (2 diffs)
• s57/S57map.java (modified) (6 diffs)
• s57/S57osm.java (modified) (1 diff)
• seachart/ChartImage.java (modified) (1 diff)

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));
                         }

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

@@ -233 +233 @@
         }
         
-        ArrayList<OSMtag> osmtags;
-
         public NodeTab nodes;
         public EdgeTab edges;
@@ -389 +387 @@
                 feature.geom.prim = Pflag.POINT;
                 feature.geom.elems.add(new Prim(id));
-                osmtags = new ArrayList<OSMtag>();
                 edge = null;
         }
@@ -398 +395 @@
                 feature.geom.prim = Pflag.LINE;
                 feature.geom.elems.add(new Prim(id));
-                osmtags = new ArrayList<OSMtag>();
                 edge = new Edge();
         }
@@ -418 +414 @@
                 feature.reln = Rflag.UNKN;
                 feature.geom.prim = Pflag.AREA;
-                osmtags = new ArrayList<OSMtag>();
                 edge = null;
         }
@@ -479 +474 @@
                         }
                 } else {
-                        osmtags.add(new OSMtag(key, val));
-                }
-        }
-
-        public void tagsDone(long id) {
-                for (OSMtag tag : osmtags) {
-                        KeyVal kv = S57osm.OSMtag(tag.key, tag.val);
+                        KeyVal kv = S57osm.OSMtag(key, val);
                         if (kv.obj != Obj.UNKOBJ) {
                                 if (feature.type == Obj.UNKOBJ) {
@@ -503 +492 @@
                                         atts.put(kv.att, new AttVal(kv.att, kv.conv, kv.val));
                                 }
-                                break;
-                        }
-                }
+                        }
+                }
+        }
+
+        public void tagsDone(long id) {
                 switch (feature.geom.prim) {
                 case POINT:

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

@@ -38 +38 @@
                 OSMtags.put("waterway=canal", new KeyVal<>(Obj.CANALS, Att.UNKATT, null, null)); OSMtags.put("waterway=dock", new KeyVal<>(Obj.HRBBSN, Att.UNKATT, null, null));
                 OSMtags.put("waterway=lock", new KeyVal<>(Obj.HRBBSN, Att.UNKATT, null, null)); 
-                OSMtags.put("wetland=tidalflat", new KeyVal<Double>(Obj.DEPARE, Att.DRVAL2, Conv.F, (double)0)); OSMtags.put("tidal=yes", new KeyVal<Double>(Obj.DEPARE, Att.DRVAL2, Conv.F, (double)0));
+                OSMtags.put("wetland=tidalflat", new KeyVal<Double>(Obj.DEPARE, Att.DRVAL2, Conv.F, (double)0)); OSMtags.put("tidal=yes", new KeyVal<Double>(Obj.DEPARE, Att.DRVAL2, Conv.F, (Double)0.0));
                 OSMtags.put("natural=mud", new KeyVal<>(Obj.DEPARE, Att.UNKATT, null, null)); OSMtags.put("natural=sand", new KeyVal<>(Obj.DEPARE, Att.UNKATT, null, null));
                 OSMtags.put("highway=motorway", new KeyVal<>(Obj.ROADWY, Att.CATROD, Conv.E, CatROD.ROD_MWAY)); OSMtags.put("highway=trunk", new KeyVal<>(Obj.ROADWY, Att.CATROD, Conv.E, CatROD.ROD_MAJR));

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

@@ -66 +66 @@
         public void paint(Graphics2D g2, MapView mv, Bounds bb) {
                 Rectangle rect = Main.map.mapView.getBounds();
-                g2.setBackground(Rules.Bwater);
-                g2.clearRect(rect.x, rect.y, rect.width, rect.height);
-                Renderer.reRender(g2, zoom, Math.pow(2, (zoom-12)), SeachartAction.map, this);
+                Renderer.reRender(g2, rect, zoom, Math.pow(2, (zoom-12)), SeachartAction.map, this);
                 g2.setPaint(Color.black);
                 g2.setFont(new Font("Arial", Font.BOLD, 20));