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

Timestamp:

2015-02-17T14:05:54+01:00 (10 years ago)

Author:

malcolmh

Message:

coast/land processing

Location:

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

Files:

• Renderer.java (modified) (1 diff)
• Rules.java (modified) (7 diffs)

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

@@ -251 +251 @@
                 while (git.hasComp()) {
                         git.nextComp();
+                        boolean first = true;
                         while (git.hasEdge()) {
                                 git.nextEdge();
                                 point = context.getPoint(git.next());
-                                p.moveTo(point.getX(), point.getY());
+                                if (first) {
+                                        p.moveTo(point.getX(), point.getY());
+                                        first = false;
+                                } else {
+                                        p.lineTo(point.getX(), point.getY());
+                                }
                                 while (git.hasNode()) {
                                         point = context.getPoint(git.next());

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

@@ -28 +28 @@
 public class Rules {
 
-        public static final Color Yland = new Color(0xeca818);
-        public static final Color Bwater = new Color(0x2ea8d8);
+        public static final Color Yland = new Color(0xdcb820);
+        public static final Color Bwater = new Color(0x3ea8c8);
+        public static final Color Gdries = new Color(0x50b050);
         public static final Color Mline = new Color(0xc480ff);
         public static final Color Msymb = new Color(0xa30075);
@@ -176 +177 @@
         public static void rules () {
                 ArrayList<Feature> objects;
+                if ((objects = Renderer.map.features.get(Obj.LNDARE)) != null) for (Feature feature : objects) if (feature.reln == Rflag.MASTER) areas(feature);
+                if ((objects = Renderer.map.features.get(Obj.LAKARE)) != null) for (Feature feature : objects) if (feature.reln == Rflag.MASTER) areas(feature);
+                if ((objects = Renderer.map.features.get(Obj.RIVBNK)) != null) for (Feature feature : objects) if (feature.reln == Rflag.MASTER) areas(feature);
+                if ((objects = Renderer.map.features.get(Obj.RIVERS)) != null) for (Feature feature : objects) if (feature.reln == Rflag.MASTER) waterways(feature);
+                if ((objects = Renderer.map.features.get(Obj.CANALS)) != null) for (Feature feature : objects) if (feature.reln == Rflag.MASTER) waterways(feature);
+                if ((objects = Renderer.map.features.get(Obj.DOCARE)) != null) for (Feature feature : objects) if (feature.reln == Rflag.MASTER) areas(feature);
+                if ((objects = Renderer.map.features.get(Obj.DEPARE)) != null) for (Feature feature : objects) if (feature.reln == Rflag.MASTER) areas(feature);
                 if ((objects = Renderer.map.features.get(Obj.COALNE)) != null) for (Feature feature : objects) if (feature.reln == Rflag.MASTER) areas(feature);
                 if ((objects = Renderer.map.features.get(Obj.SLCONS)) != null) for (Feature feature : objects) if (feature.reln == Rflag.MASTER) shoreline(feature);
@@ -199 +207 @@
                 if ((objects = Renderer.map.features.get(Obj.UWTROC)) != null) for (Feature feature : objects) if (feature.reln == Rflag.MASTER) obstructions(feature);
                 if ((objects = Renderer.map.features.get(Obj.MARCUL)) != null) for (Feature feature : objects) if (feature.reln == Rflag.MASTER) areas(feature);
-                if ((objects = Renderer.map.features.get(Obj.WTWAXS)) != null) for (Feature feature : objects) if (feature.reln == Rflag.MASTER) waterways(feature);
                 if ((objects = Renderer.map.features.get(Obj.RECTRC)) != null) for (Feature feature : objects) if (feature.reln == Rflag.MASTER) transits(feature);
                 if ((objects = Renderer.map.features.get(Obj.NAVLNE)) != null) for (Feature feature : objects) if (feature.reln == Rflag.MASTER) transits(feature);
@@ -255 +262 @@
                 switch (feature.type) {
                 case COALNE:
-                        Renderer.lineVector(feature, new LineStyle(Color.black, 8, Yland));
+                        Renderer.lineVector(feature, new LineStyle(Color.black, 10));
+                        break;
+                case DEPARE:
+                        Double depmax = 0.0;
+                        if (((depmax = (Double) getAttVal(feature, feature.type, 0, Att.DRVAL2)) != null) && (depmax <= 0.0)) {
+                                Renderer.lineVector(feature, new LineStyle(Gdries));
+                        }
+                        break;
+                case DOCARE:
+                case LAKARE:
+                case RIVBNK:
+                        Renderer.lineVector(feature, new LineStyle(Bwater));
                         break;
                 case DRGARE:
@@ -272 +290 @@
                         } else {
                                 if (Renderer.zoom >= 14)
-                                        Renderer.lineVector(feature, new LineStyle(null, 0, new Color(0x40ffffff, true)));
-                        }
+                                        Renderer.lineVector(feature, new LineStyle(new Color(0x40ffffff, true)));
+                        }
+                        break;
+                case LNDARE:
+                        Renderer.lineVector(feature, new LineStyle(Yland));
                         break;
                 case MARCUL:
@@ -930 +951 @@
                 case TSSRON:
                         if (Renderer.zoom <= 15)
-                                Renderer.lineVector(feature, new LineStyle(null, 0, null, new Color(0x80c48080, true)));
+                                Renderer.lineVector(feature, new LineStyle(new Color(0x80c48080, true)));
                         else
                                 Renderer.lineVector(feature, new LineStyle(new Color(0x80c48080, true), 20, null, null));
@@ -1108 +1129 @@
 
         private static void waterways(Feature feature) {
-                
+                Renderer.lineVector(feature, new LineStyle(Bwater, 20));
         }