Changeset 30020 in osm for applications/editors/josm/plugins/smed2/src/seamap/Rules.java

Timestamp:

2013-10-12T12:50:40+02:00 (13 years ago)

Author:

malcolmh

Message:

save

File:

• applications/editors/josm/plugins/smed2/src/seamap/Rules.java (modified) (5 diffs)

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

@@ -105 +105 @@
                 AttItem name = feature.atts.get(Att.OBJNAM);
                 switch (feature.type) {
-                case SPLARE:
-                        if (zoom >= 12) {
-                                Renderer.symbol(feature, Areas.Plane, Obj.SPLARE, null, null);
-                                Renderer.lineSymbols(feature, Areas.Restricted, 0.5, Areas.LinePlane, 10);
-                        }
-                        if ((zoom >= 15) && (name != null))
-                                Renderer.labelText(feature, (String) name.val, new Font("Arial", Font.BOLD, 80), Color.black, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -90)));
-                        break;
-                case MARCUL:
-                        if (zoom >= 14)
-                                Renderer.symbol(feature, Areas.MarineFarm, Obj.MARCUL, null, null);
-                        if (zoom >= 16)
-                                Renderer.lineVector(feature, new LineStyle( Color.black, 4, new float[] { 10, 10 }, null));
+                case DRGARE:
+                        if (zoom < 16)
+                                Renderer.lineVector(feature, new LineStyle(Color.black, 8, new float[] { 25, 25 }, new Color(0x40ffffff, true)));
+                        else
+                                Renderer.lineVector(feature, new LineStyle(Color.black, 8, new float[] { 25, 25 }, null));
+                        if ((zoom >= 12) && (name != null))
+                                Renderer.labelText(feature, (String) name.val, new Font("Arial", Font.PLAIN, 100), Color.black, null);
                         break;
                 case FAIRWY:
@@ -130 +124 @@
                         }
                         break;
-                case DRGARE:
-                        if (zoom < 16)
-                                Renderer.lineVector(feature, new LineStyle(Color.black, 8, new float[] { 25, 25 }, new Color(0x40ffffff, true)));
-                        else
-                                Renderer.lineVector(feature, new LineStyle(Color.black, 8, new float[] { 25, 25 }, null));
-                        if ((zoom >= 12) && (name != null))
-                                Renderer.labelText(feature, (String) name.val, new Font("Arial", Font.PLAIN, 100), Color.black, null);
-                        break;
-                case RESARE:
-                        if (zoom >= 12) {
-                                Renderer.lineSymbols(feature, Areas.Restricted, 1.0, null, 0);
-//                              if ((CatREA)Renderer.getAttVal(feature, feature.type, 0, Att.CATREA) == CatREA.REA_NWAK)
-//                                      Renderer.symbol(feature, Areas.NoWake, Obj.RESARE, null);
-                        }
+                case MARCUL:
+                        if (zoom >= 14)
+                                Renderer.symbol(feature, Areas.MarineFarm, Obj.MARCUL, null, null);
+                        if (zoom >= 16)
+                                Renderer.lineVector(feature, new LineStyle( Color.black, 4, new float[] { 10, 10 }, null));
                         break;
                 case OSPARE:
@@ -153 +138 @@
                         }
                         break;
+                case RESARE:
+                        if (zoom >= 12) {
+                                Renderer.lineSymbols(feature, Areas.Restricted, 1.0, null, 0);
+//                              if ((CatREA)Renderer.getAttVal(feature, feature.type, 0, Att.CATREA) == CatREA.REA_NWAK)
+//                                      Renderer.symbol(feature, Areas.NoWake, Obj.RESARE, null);
+                        }
+                        break;
                 case SEAARE:
                         switch ((CatSEA) Renderer.getAttVal(feature, feature.type, 0, Att.CATSEA)) {
@@ -166 +158 @@
                         }
                         break;
-                case SNDWAV:
-//        if (zoom>=12)) area("fill:url(#sandwaves)");
-                        break;
-                }
 /*
   if (is_type("sea_area")) {
@@ -205 +193 @@
   }
  */
-        }
+                case SNDWAV:
+                        if (zoom >= 12) Renderer.fillPattern(feature, Areas.Sandwaves);
+                        break;
+                case SPLARE:
+                        if (zoom >= 12) {
+                                Renderer.symbol(feature, Areas.Plane, Obj.SPLARE, null, null);
+                                Renderer.lineSymbols(feature, Areas.Restricted, 0.5, Areas.LinePlane, 10);
+                        }
+                        if ((zoom >= 15) && (name != null))
+                                Renderer.labelText(feature, (String) name.val, new Font("Arial", Font.BOLD, 80), Color.black, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -90)));
+                        break;
+                }
+        }
+        
         private static void beacons(Feature feature) {
                 BcnSHP shape = (BcnSHP) Renderer.getAttVal(feature, feature.type, 0, Att.BCNSHP);