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

Timestamp:

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

Author:

malcolmh

Message:

more map features

Location:

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

Files:

• Renderer.java (modified) (8 diffs)
• Rules.java (modified) (6 diffs)

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

@@ -25 +25 @@
 
 import s57.S57map;
-import s57.S57map.Feature;
 import s57.S57map.GeomIterator;
 import s57.S57map.Pflag;
@@ -330 +329 @@
     
     public static void grid() {
-        if (context.grid() > 0) {
+        if ((context.grid() > 0) && (map != null)) {
             LineStyle style = new LineStyle(Color.black, (float)2.0);
-            double nspan = 60 * Math.toDegrees(map.bounds.maxlon - map.bounds.minlon) / context.grid();
+            Point2D point = context.getPoint(new Snode(map.bounds.minlat, map.bounds.maxlon));
+            double ratio = point.getX() / point.getY();
+            double nspan = 60 * Math.toDegrees(map.bounds.maxlon - map.bounds.minlon) / (context.grid() * (ratio > 1.0 ? ratio : 1.0));
             double mult = 1.0;
             if (nspan < 1.0) {
@@ -355 +356 @@
             Path2D.Double p = new Path2D.Double();
             for (double lon = left; lon < map.bounds.maxlon; lon += Math.toRadians(nspan)) {
-                Point2D point = context.getPoint(new Snode(map.bounds.maxlat, lon));
+                point = context.getPoint(new Snode(map.bounds.maxlat, lon));
                 p.moveTo(point.getX(), point.getY());
                 point = context.getPoint(new Snode(map.bounds.minlat, lon));
                 p.lineTo(point.getX(), point.getY());
                 double deg = Math.toDegrees(lon);
-                String ew = (deg < 0) ? "W" : "E";
+                String ew = (deg < -0.001) ? "W" : (deg > 0.001) ? "E" : "";
                 deg = Math.abs(deg);
                 String dstr = String.format("%03d°", (int)Math.floor(deg));
@@ -366 +367 @@
                 String mstr = String.format("%05.2f'%s", min, ew);
                 Symbol label = new Symbol();
-                if (point.getX() > 500.0) {
+                if (point.getX() > 600.0) {
                     label.add(new Instr(Form.TEXT, new Caption(dstr, new Font("Arial", Font.PLAIN, 40), Color.black, new Delta(Handle.BR, AffineTransform.getTranslateInstance(-10, -20)))));
                     label.add(new Instr(Form.TEXT, new Caption(mstr, new Font("Arial", Font.PLAIN, 40), Color.black, new Delta(Handle.BL, AffineTransform.getTranslateInstance(20, 0)))));
@@ -374 +375 @@
             g2.setPaint(style.line);
             g2.draw(p);
-            double tspan = 60 * Math.toDegrees(map.bounds.maxlat - map.bounds.minlat) / context.grid();
+            double tspan = 60 * Math.toDegrees(map.bounds.maxlat - map.bounds.minlat) / (context.grid() / (ratio < 1.0 ? ratio : 1.0));
             mult = 1.0;
             if (tspan < 1.0) {
@@ -397 +398 @@
             p = new Path2D.Double();
             for (double lat = bottom; lat < map.bounds.maxlat; lat += Math.toRadians(tspan)) {
-                Point2D point = context.getPoint(new Snode(lat, map.bounds.maxlon));
+                point = context.getPoint(new Snode(lat, map.bounds.maxlon));
                 p.moveTo(point.getX(), point.getY());
                 point = context.getPoint(new Snode(lat, map.bounds.minlon));
                 p.lineTo(point.getX(), point.getY());
                 double deg = Math.toDegrees(lat);
-                String ns = (deg < 0) ? "S" : "N";
+                String ns = (deg < -0.001) ? "S" : (deg > 0.001) ? "N" : "";
                 deg = Math.abs(deg);
                 String dstr = String.format("%02d°%s", (int)Math.floor(deg), ns);
@@ -408 +409 @@
                 String mstr = String.format("%05.2f'", min);
                 Symbol label = new Symbol();
-                label.add(new Instr(Form.TEXT, new Caption(dstr, new Font("Arial", Font.PLAIN, 40), Color.black, new Delta(Handle.BL, AffineTransform.getTranslateInstance(10, -10)))));
-                label.add(new Instr(Form.TEXT, new Caption(mstr, new Font("Arial", Font.PLAIN, 40), Color.black, new Delta(Handle.BL, AffineTransform.getTranslateInstance(0, 50)))));
-                Symbols.drawSymbol(g2, label, sScale, point.getX(), point.getY(), null, null);
+                if (point.getY() < (context.getPoint(new Snode(map.bounds.minlat, map.bounds.minlon)).getY() - 200.0)) {
+                        label.add(new Instr(Form.TEXT, new Caption(dstr, new Font("Arial", Font.PLAIN, 40), Color.black, new Delta(Handle.BL, AffineTransform.getTranslateInstance(10, -10)))));
+                        label.add(new Instr(Form.TEXT, new Caption(mstr, new Font("Arial", Font.PLAIN, 40), Color.black, new Delta(Handle.BL, AffineTransform.getTranslateInstance(0, 50)))));
+                        Symbols.drawSymbol(g2, label, sScale, point.getX(), point.getY(), null, null);
+                }
             }
             g2.setPaint(style.line);
             g2.draw(p);
-/*            Symbol legend = new Symbol();
-            legend.add(new Instr(Form.BBOX, new Rectangle2D.Double(0, 0, 900, 300)));
-            Path2D.Double path = new Path2D.Double(); path.moveTo(0, 0); path.lineTo(900, 0); path.lineTo(900, 300); path.lineTo(0, 300); path.closePath();
+            Symbol legend = new Symbol();
+            legend.add(new Instr(Form.BBOX, new Rectangle2D.Double(0, 0, 500, 100)));
+            Path2D.Double path = new Path2D.Double(); path.moveTo(0, 0); path.lineTo(500, 0); path.lineTo(500, 100); path.lineTo(0, 100); path.closePath();
             legend.add(new Instr(Form.FILL, Color.white));
             legend.add(new Instr(Form.PGON, path));
-            legend.add(new Instr(Form.TEXT, new Caption("© OpenStreetMap contributors", new Font("Arial", Font.PLAIN, 25), Color.black, new Delta(Handle.BC, AffineTransform.getTranslateInstance(450, 300)))));
-            legend.add(new Instr(Form.TEXT, new Caption("Mercator projection", new Font("Arial", Font.PLAIN, 30), Color.black, new Delta(Handle.BC, AffineTransform.getTranslateInstance(450, 250)))));
-            Point2D point = context.getPoint(new Snode(map.bounds.minlat, map.bounds.minlon));
+            legend.add(new Instr(Form.TEXT, new Caption("Mercator Projection", new Font("Arial", Font.PLAIN, 50), Color.black, new Delta(Handle.BC, AffineTransform.getTranslateInstance(250, 60)))));
+            point = context.getPoint(new Snode(map.bounds.minlat, map.bounds.minlon));
             Symbols.drawSymbol(g2, legend, sScale, point.getX(), point.getY(), null, new Delta(Handle.BL, AffineTransform.getTranslateInstance(0, 0)));
             legend = new Symbol();
-            legend.add(new Instr(Form.BBOX, new Rectangle2D.Double(0, 0, 900, 300)));
-            legend.add(new Instr(Form.TEXT, new Caption("Mercator projection", new Font("Arial", Font.PLAIN, 30), Color.black, new Delta(Handle.BC, AffineTransform.getTranslateInstance(450, 250)))));
+            legend.add(new Instr(Form.BBOX, new Rectangle2D.Double(0, 0, 500, 100)));
+            legend.add(new Instr(Form.TEXT, new Caption("© OpenStreetMap contributors", new Font("Arial", Font.PLAIN, 30), Color.black, new Delta(Handle.BC, AffineTransform.getTranslateInstance(250, 100)))));
             point = context.getPoint(new Snode(map.bounds.minlat, map.bounds.minlon));
             Symbols.drawSymbol(g2, legend, sScale, point.getX(), point.getY(), null, new Delta(Handle.BL, AffineTransform.getTranslateInstance(0, 0)));
-*/        }
+        }
     }
 
@@ -761 +763 @@
         }
     }
+    
+    public static void rasterPixel(double size, Color col) {
+        double s = Rules.feature.geom.centre.lat - (size / 2.0);
+        double w = Rules.feature.geom.centre.lon - (size / 2.0);
+        double n = Rules.feature.geom.centre.lat + (size / 2.0);
+        double e = Rules.feature.geom.centre.lon + (size / 2.0);
+        Point2D sw = context.getPoint(new Snode(s, w)); 
+        Point2D nw = context.getPoint(new Snode(n, w)); 
+        Point2D ne = context.getPoint(new Snode(n, e)); 
+        Point2D se = context.getPoint(new Snode(s, e)); 
+        Symbol pixel = new Symbol();
+        Path2D.Double path = new Path2D.Double(); path.moveTo(sw.getX(), sw.getY()); path.lineTo(nw.getX(), nw.getY());
+        path.lineTo(ne.getX(), ne.getY()); path.lineTo(se.getX(), se.getY()); path.closePath();
+        pixel.add(new Instr(Form.FILL, col));
+        pixel.add(new Instr(Form.PGON, path));
+        Symbols.drawSymbol(g2, pixel, 1.0, 0, 0, null, null);
+    }
 }

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

@@ -56 +56 @@
 import s57.S57val.MarSYS;
 import s57.S57val.StsSTS;
+import s57.S57val.TecSOU;
 import s57.S57val.TopSHP;
 import s57.S57val.TrfTRF;
@@ -259 +260 @@
                         if ((Renderer.context.ruleset() == RuleSet.ALL) || (Renderer.context.ruleset() == RuleSet.BASE)) {
                                 if (testObject(Obj.LNDARE)) for (Feature f : objects) if (testFeature(f)) areas();
+                                if (testObject(Obj.SOUNDG)) for (Feature f : objects) if (testFeature(f)) depths();
+                                if (testObject(Obj.DEPCNT)) for (Feature f : objects) if (testFeature(f)) depths();
+                                if (testObject(Obj.TESARE)) for (Feature f : objects) if (testFeature(f)) areas();
                                 if (testObject(Obj.BUAARE)) for (Feature f : objects) if (testFeature(f)) areas();
                                 if (testObject(Obj.HRBFAC)) for (Feature f : objects) if (testFeature(f)) areas();
@@ -271 +275 @@
                                 if (testObject(Obj.ROADWY)) for (Feature f : objects) if (testFeature(f)) highways();
                                 if (testObject(Obj.RAILWY)) for (Feature f : objects) if (testFeature(f)) highways();
-                        }
-                        if (Renderer.context.ruleset() == RuleSet.ALL) {
-                                if (testObject(Obj.SOUNDG)) for (Feature f : objects) if (testFeature(f)) depths();
-                                if (testObject(Obj.DEPCNT)) for (Feature f : objects) if (testFeature(f)) depths();
                         }
                         if (testObject(Obj.SLCONS)) for (Feature f : objects) if (testFeature(f)) shoreline();
@@ -365 +365 @@
                 String name = getName();
                 switch (feature.type) {
+                case TESARE:
+                        Renderer.lineSymbols(Areas.LimitDash, 0.0, Areas.LimitCC, null, 30, Symbols.Mline);
+                        break;
                 case BUAARE:
                         Renderer.lineVector(new LineStyle(new Color(0x20000000, true)));
@@ -696 +699 @@
                 switch (feature.type) {
                 case SOUNDG:
-                        if ((Renderer.zoom >= 14) && hasAttribute(Obj.SOUNDG, Att.VALSOU)) {
+                        if (testAttribute(Obj.SOUNDG, Att.TECSOU, TecSOU.SOU_COMP) && hasAttribute(Obj.SOUNDG, Att.VALSOU)) {
+                                double depth = (double) getAttVal(Obj.SOUNDG, Att.VALSOU);
+                                Color col = new Color(0x00ffffff, true);
+                                if (depth > 0.0) col = Symbols.Bwater;
+                                if (depth > 5.0) col = new Color(0xcde2f1);
+                                if (depth > 20.0) col = new Color(0xe6eff8);
+                                if (depth > 50.0) col = new Color(0xf3f8fc);
+                                Renderer.rasterPixel(Math.toRadians(1.0/60.0/16.0), col);
+                        } else if ((Renderer.zoom >= 14) && hasAttribute(Obj.SOUNDG, Att.VALSOU)) {
                                 double depth = (double) getAttVal(Obj.SOUNDG, Att.VALSOU);
                                 String dstr = df.format(depth);
@@ -718 +729 @@
                         break;
                 case DEPCNT:
+                        Renderer.lineVector(new LineStyle(Color.blue, 2));
                         break;
                 default: