Changeset 30022 in osm for applications/editors/josm/plugins/smed2/src/seamap

Timestamp:

2013-10-13T19:17:33+02:00 (12 years ago)

Author:

malcolmh

Message:

save

Location:

applications/editors/josm/plugins/smed2/src/seamap

Files:

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

applications/editors/josm/plugins/smed2/src/seamap/Renderer.java

@@ -143 +143 @@
         }
         
-        public static void lineSymbols(Feature feature, Symbol prisymb, double space, Symbol secsymb, int ratio) {
+        public static void lineSymbols(Feature feature, Symbol prisymb, double space, Symbol secsymb, int ratio, Color col) {
                 Area area;
                 switch (feature.flag) {
@@ -207 +207 @@
                                                         }
                                                         if (!gap) {
-                                                                Symbols.drawSymbol(g2, symbol, sScale, curr.getX(), curr.getY(), new Delta(Handle.BC, AffineTransform.getRotateInstance(Math.atan2((succ.getY() - curr.getY()), (succ.getX() - curr.getX())) + Math.toRadians(90))), null);
+                                                                Symbols.drawSymbol(g2, symbol, sScale, curr.getX(), curr.getY(),
+                                                                                new Delta(Handle.BC, AffineTransform.getRotateInstance(Math.atan2((succ.getY() - curr.getY()), (succ.getX() - curr.getX())) + Math.toRadians(90))),
+                                                                                new Scheme(col));
                                                         }
                                                         if (space > 0)

applications/editors/josm/plugins/smed2/src/seamap/Rules.java

@@ -140 +140 @@
                 case RESARE:
                         if (zoom >= 12) {
-                                Renderer.lineSymbols(feature, Areas.Restricted, 1.0, null, 0);
+                                Renderer.lineSymbols(feature, Areas.Restricted, 1.0, null, 0, new Color(0x80c480));
 //                              if ((CatREA)Renderer.getAttVal(feature, feature.type, 0, Att.CATREA) == CatREA.REA_NWAK)
 //                                      Renderer.symbol(feature, Areas.NoWake, Obj.RESARE, null);
@@ -199 +199 @@
                         if (zoom >= 12) {
                                 Renderer.symbol(feature, Areas.Plane, Obj.SPLARE, null, null);
-                                Renderer.lineSymbols(feature, Areas.Restricted, 0.5, Areas.LinePlane, 10);
+                                Renderer.lineSymbols(feature, Areas.Restricted, 0.5, Areas.LinePlane, 10, new Color(0x80c480));
                         }
                         if ((zoom >= 15) && (name != null))
@@ -268 +268 @@
                 if (zoom >= 14) {
                         if (feature.type == Obj.CBLSUB) {
-                                Renderer.lineSymbols(feature, Areas.Cable, 0.0, null, 0);
+                                Renderer.lineSymbols(feature, Areas.Cable, 0.0, null, 0, new Color(0x80c480));
                         } else if (feature.type == Obj.CBLOHD) {
 
@@ -311 +311 @@
                 case ACHARE:
                         if (zoom >= 12) {
-                                if (feature.flag != Fflag.LINE)
-                                        Renderer.symbol(feature, Harbours.Anchorage, null, null, null);
-                                Renderer.lineSymbols(feature, Areas.Restricted, 1.0, Areas.LineAnchor, 10);
+                                if (feature.flag != Fflag.AREA) {
+                                        Renderer.symbol(feature, Harbours.Anchorage, null, null, new Scheme(Color.black));
+                                } else {
+                                        Renderer.symbol(feature, Harbours.Anchorage, null, null, new Scheme(new Color(0xc480ff)));
+                                        Renderer.lineSymbols(feature, Areas.Restricted, 1.0, Areas.LineAnchor, 10, new Color(0xc480ff));
+                                }
                                 if ((zoom >= 15) && ((name) != null)) {
-                                        Renderer.labelText(feature, (String) name.val, new Font("Arial", Font.BOLD, 80), new Color(0x80c480ff), null);
+                                        Renderer.labelText(feature, (String) name.val, new Font("Arial", Font.BOLD, 80), new Color(0xc480ff), new Delta(Handle.BC, AffineTransform.getTranslateInstance(160, 0)));
                                 }
                         }
@@ -705 +708 @@
                 if (zoom >= 14) {
                         if (feature.type == Obj.PIPSOL) {
-                                Renderer.lineSymbols(feature, Areas.Pipeline, 1.0, null, 0);
+                                Renderer.lineSymbols(feature, Areas.Pipeline, 1.0, null, 0, new Color(0x80c480));
                         } else if (feature.type == Obj.PIPOHD) {
 
@@ -748 +751 @@
                 case TSSRON:
                         if (zoom <= 15)
-                                Renderer.lineVector(feature, new LineStyle(null, 0, null, new Color(0x80c480ff, true)));
+                                Renderer.lineVector(feature, new LineStyle(null, 0, null, new Color(0x80c48080, true)));
                         else
-                                Renderer.lineVector(feature, new LineStyle(new Color(0x80c480ff, true), 20, null, null));
+                                Renderer.lineVector(feature, new LineStyle(new Color(0x80c48080, true), 20, null, null));
                         AttItem name = feature.atts.get(Att.OBJNAM);
                         if ((zoom >= 10) && (name != null))
-                                Renderer.labelText(feature, (String) name.val, new Font("Arial", Font.BOLD, 150), new Color(0x80c480ff), null);
+                                Renderer.labelText(feature, (String) name.val, new Font("Arial", Font.BOLD, 150), new Color(0x80c48080), null);
                         break;
                 case TSELNE:
-                        Renderer.lineVector(feature, new LineStyle(new Color(0x80c480ff, true), 20, null, null));
+                        Renderer.lineVector(feature, new LineStyle(new Color(0x80c48080, true), 20, null, null));
                         break;
                 case TSSLPT:
-                        Renderer.lineSymbols(feature, Areas.LaneArrow, 0.5, null, 0);
+                        Renderer.lineSymbols(feature, Areas.LaneArrow, 0.5, null, 0, new Color(0x80c48080, true));
                         break;
                 case TSSBND:
-                        Renderer.lineVector(feature, new LineStyle(new Color(0x80c480ff, true), 20, new float[] { 40, 40 }, null));
+                        Renderer.lineVector(feature, new LineStyle(new Color(0x80c48080, true), 20, new float[] { 40, 40 }, null));
                         break;
                 case ISTZNE:
-                        Renderer.lineSymbols(feature, Areas.Restricted, 1.0, null, 0);
+                        Renderer.lineSymbols(feature, Areas.Restricted, 1.0, null, 0, new Color(0x80c48080, true));
                         break;
                 }