Changeset 30325 in osm for applications/editors/josm/plugins/smed2/src/render/Rules.java

Timestamp:

2014-03-16T14:21:57+01:00 (11 years ago)

Author:

malcolmh

Message:

save

File:

• applications/editors/josm/plugins/smed2/src/render/Rules.java (modified) (3 diffs)

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

@@ -351 +351 @@
                                 }
                         } else {
-                                Renderer.symbol(feature, Beacons.Shapes.get(shape),
-                                                getScheme(feature, feature.type));
-                                if (feature.objs.get(Obj.TOPMAR) != null)
-                                        Renderer.symbol(
-                                                        feature,
-                                                        Topmarks.Shapes.get(feature.objs.get(Obj.TOPMAR)
-                                                                        .get(0).get(Att.TOPSHP).val),
-                                                        getScheme(feature, Obj.TOPMAR),
-                                                        Topmarks.BeaconDelta);
+                                Renderer.symbol(feature, Beacons.Shapes.get(shape), getScheme(feature, feature.type));
+                                if (hasObject(feature, Obj.TOPMAR)) {
+                                        Symbol topmark = Topmarks.Shapes.get(feature.objs.get(Obj.TOPMAR).get(0).get(Att.TOPSHP).val);
+                                        if (topmark != null)
+                                                Renderer.symbol(feature, Topmarks.Shapes.get(feature.objs.get(Obj.TOPMAR).get(0).get(Att.TOPSHP).val), getScheme(feature, Obj.TOPMAR), Topmarks.BeaconDelta);
+                                } else  if (hasObject(feature, Obj.DAYMAR)) {
+                                        Symbol topmark = Topmarks.Shapes.get(feature.objs.get(Obj.DAYMAR).get(0).get(Att.TOPSHP).val);
+                                        if (topmark != null)
+                                                Renderer.symbol(feature, Topmarks.Shapes.get(feature.objs.get(Obj.DAYMAR).get(0).get(Att.TOPSHP).val), getScheme(feature, Obj.DAYMAR), Topmarks.BeaconDelta);
+                                }
                         }
                         Signals.addSignals(feature);
@@ -370 +371 @@
                         Renderer.symbol(feature, Buoys.Shapes.get(shape), getScheme(feature, feature.type));
                         if (hasObject(feature, Obj.TOPMAR)) {
-                                Renderer.symbol(feature, Topmarks.Shapes.get(feature.objs.get(Obj.TOPMAR).get(0).get(Att.TOPSHP).val),
-                                                getScheme(feature, Obj.TOPMAR), Topmarks.BuoyDeltas.get(shape));
+                                Symbol topmark = Topmarks.Shapes.get(feature.objs.get(Obj.TOPMAR).get(0).get(Att.TOPSHP).val);
+                                if (topmark != null)
+                                        Renderer.symbol(feature, topmark, getScheme(feature, Obj.TOPMAR), Topmarks.BuoyDeltas.get(shape));
+                        } else if (hasObject(feature, Obj.DAYMAR)) {
+                                Symbol topmark = Topmarks.Shapes.get(feature.objs.get(Obj.DAYMAR).get(0).get(Att.TOPSHP).val);
+                                if (topmark != null)
+                                        Renderer.symbol(feature, topmark, getScheme(feature, Obj.DAYMAR), Topmarks.BuoyDeltas.get(shape));
                         }
                         Signals.addSignals(feature);
@@ -511 +517 @@
                         if (Renderer.zoom >= 14) {
                                 Renderer.symbol(feature, Harbours.Anchorage, new Scheme(Mline));
-                        Renderer.labelText(feature, name == null ? "" : name, new Font("Arial", Font.PLAIN, 30), Msymb, LabelStyle.RRCT, Mline, Color.white, new Delta(Handle.BC));
+                                if (Renderer.zoom >= 15) {
+                                        Renderer.labelText(feature, name == null ? "" : name, new Font("Arial", Font.PLAIN, 30), Msymb, LabelStyle.RRCT, Mline, Color.white, new Delta(Handle.BC));
+                                }
                         }
                         double radius = (Double)getAttVal(feature, Obj.ACHBRT, 0, Att.RADIUS);