Changeset 30899 in osm for applications/editors/josm

Timestamp:

2015-01-07T18:35:53+01:00 (10 years ago)

Author:

malcolmh

Message:

Add RDOCAL rendering

Location:

applications/editors/josm/plugins/seachart/src

Files:

• render/Rules.java (modified) (2 diffs)
• symbols/Harbours.java (modified) (1 diff)

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

@@ -194 +194 @@
                 if ((objects = Renderer.map.features.get(Obj.BRIDGE)) != null) for (Feature feature : objects) if (feature.reln == Rflag.MASTER) bridges(feature);
                 if ((objects = Renderer.map.features.get(Obj.PILPNT)) != null) for (Feature feature : objects) if (feature.reln == Rflag.MASTER) lights(feature);
+                if ((objects = Renderer.map.features.get(Obj.RDOCAL)) != null) for (Feature feature : objects) if (feature.reln == Rflag.MASTER) callpoint(feature);
                 if ((objects = Renderer.map.features.get(Obj.LITMIN)) != null) for (Feature feature : objects) if (feature.reln == Rflag.MASTER) lights(feature);
                 if ((objects = Renderer.map.features.get(Obj.LITMAJ)) != null) for (Feature feature : objects) if (feature.reln == Rflag.MASTER) lights(feature);
@@ -470 +471 @@
         }
         
+        private static void callpoint(Feature feature) {
+                if (Renderer.zoom >= 14) {
+                        Symbol symb = Harbours.CallPoint2;
+                        TrfTRF trf;
+                        if ((trf = (TrfTRF) getAttVal(feature, feature.type, 0, Att.TRAFIC)) != null) {
+                                if (trf != TrfTRF.TRF_TWOW) {
+                                        symb = Harbours.CallPoint1;
+                                }
+                        }
+                        Double orient = 0.0;
+                        if ((orient = (Double) getAttVal(feature, feature.type, 0, Att.ORIENT)) == null) {
+                                orient = 0.0;
+                        }
+                        Renderer.symbol(feature, symb, new Delta(Handle.CC, AffineTransform.getRotateInstance(Math.toRadians(orient))));
+                }
+        }
+        
         private static void distances(Feature feature) {
                 if (Renderer.zoom >= 14) {

applications/editors/josm/plugins/seachart/src/symbols/Harbours.java

@@ -49 +49 @@
                 Bollard.add(new Instr(Form.FILL, Color.black));
                 Bollard.add(new Instr(Form.ELPS, s));
+        }
+        public static final Symbol CallPoint1 = new Symbol();
+        static {
+                CallPoint1.add(new Instr(Form.BBOX, new Rectangle2D.Double(-50,-50,100,100)));
+                CallPoint1.add(new Instr(Form.STRK, new BasicStroke(5, BasicStroke.CAP_ROUND, BasicStroke.JOIN_MITER)));
+                CallPoint1.add(new Instr(Form.FILL, Rules.Msymb));
+                CallPoint1.add(new Instr(Form.ELPS, new Ellipse2D.Double(-25,-25,50,50)));
+                Path2D.Double p = new Path2D.Double(); p.moveTo(-16.0,-20.0); p.lineTo(0.0,-50.0); p.lineTo(16.0,-20.0);
+                CallPoint1.add(new Instr(Form.PLIN, p));
+        }
+        public static final Symbol CallPoint2 = new Symbol();
+        static {
+                CallPoint2.add(new Instr(Form.BBOX, new Rectangle2D.Double(-50,-50,100,100)));
+                CallPoint2.add(new Instr(Form.SYMB, new Symbols.SubSymbol(CallPoint1, 1.0, 0, 0, null, null)));
+                Path2D.Double p = new Path2D.Double(); p.moveTo(-16.0,20.0); p.lineTo(0.0,50.0); p.lineTo(16.0,20.0);
+                CallPoint2.add(new Instr(Form.PLIN, p));
         }
         public static final Symbol ContainerCrane = new Symbol();