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

Timestamp:

2013-10-13T23:49:37+02:00 (12 years ago)

Author:

malcolmh

Message:

save

Location:

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

Files:

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

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

@@ -304 +304 @@
                 label.add(new Instr(Prim.TEXT, new Caption(str, font, colour, (delta == null) ? new Delta(Handle.CC, null) : delta)));
                 Point2D point = helper.getPoint(feature.centre);
-                Symbols.drawSymbol(g2, label, tScale, point.getX(), point.getY(), null, null);
+                Symbols.drawSymbol(g2, label, sScale, point.getX(), point.getY(), null, null);
         }
 

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

@@ -318 +318 @@
                                 }
                                 if ((zoom >= 15) && ((name) != null)) {
-                                        Renderer.labelText(feature, (String) name.val, new Font("Arial", Font.BOLD, 80), new Color(0xc480ff), new Delta(Handle.BC, AffineTransform.getTranslateInstance(160, 0)));
+                                        Renderer.labelText(feature, (String) name.val, new Font("Arial", Font.BOLD, 60), new Color(0xc480ff), new Delta(Handle.LC, AffineTransform.getTranslateInstance(70, 0)));
                                 }
+                                ArrayList<StsSTS> sts = (ArrayList<StsSTS>)Renderer.getAttVal(feature, Obj.ACHARE, 0, Att.STATUS);
+                                if ((zoom >= 15) && (sts != null) && (sts.contains(StsSTS.STS_RESV))) {
+                                        Renderer.labelText(feature, "Reserved", new Font("Arial", Font.BOLD, 50), new Color(0xc480ff), new Delta(Handle.TC, AffineTransform.getTranslateInstance(0, 60)));
+                                }
+                        }
+                        ArrayList<CatACH> cats = (ArrayList<CatACH>)Renderer.getAttVal(feature, Obj.ACHARE, 0, Att.CATACH);
+                        int dy = (cats.size() - 1) * -30;
+                        for (CatACH cat : cats) {
+                                switch (cat) {
+                                case ACH_DEEP:
+                                        Renderer.labelText(feature, "DW", new Font("Arial", Font.BOLD, 50), new Color(0xc480ff), new Delta(Handle.RC, AffineTransform.getTranslateInstance(-60, dy)));
+                                        dy += 60;
+                                        break;
+                                case ACH_TANK:
+                                        Renderer.labelText(feature, "Tanker", new Font("Arial", Font.BOLD, 50), new Color(0xc480ff), new Delta(Handle.RC, AffineTransform.getTranslateInstance(-60, dy)));
+                                        dy += 60;
+                                        break;
+                                case ACH_H24P:
+                                        Renderer.labelText(feature, "24h", new Font("Arial", Font.BOLD, 50), new Color(0xc480ff), new Delta(Handle.RC, AffineTransform.getTranslateInstance(-60, dy)));
+                                        dy += 60;
+                                        break;
+                                case ACH_EXPL:
+                                        Renderer.symbol(feature, Harbours.Explosives, null, new Delta(Handle.RC, AffineTransform.getTranslateInstance(-60, dy)), new Scheme(new Color(0xc480ff)));
+                                        dy += 60;
+                                        break;
+                                case ACH_QUAR:
+                                        Renderer.symbol(feature, Harbours.Hospital, null, new Delta(Handle.RC, AffineTransform.getTranslateInstance(-60, dy)), new Scheme(new Color(0xc480ff)));
+                                        dy += 60;
+                                        break;
+                                case ACH_SEAP:
+                                        Renderer.symbol(feature, Areas.Seaplane, null, new Delta(Handle.RC, AffineTransform.getTranslateInstance(-60, dy)), new Scheme(new Color(0xc480ff)));
+                                        dy += 60;
+                                        break;
+                                }
                         }
                         break;
@@ -325 +359 @@
         }
 /*
-         *   if ((zoom >= 12) && is_type("anchorage")) {
-    symbol("anchorage");
-    if ((zoom >= 15) && (has_item_attribute("name")))
-      text(item_attribute("name"), "font-family:Arial; font-weight:bold; font-size:80; text-anchor:middle", 0, -90);
-    if ((zoom >= 12) && (is_area)) line_symbols("restricted_line", 0.5, "line_anchor", 10);
-  }
   if ((zoom >= 16) && is_type("anchor_berth")) symbol("anchor_berth");
   if ((zoom >= 12) && is_type("harbour")) {