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

Timestamp:

2014-01-19T14:52:39+01:00 (12 years ago)

Author:

malcolmh

Message:

new model structure

File:

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

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

@@ -32 +32 @@
         
         static String getName(Feature feature) {
-                AttItem name = feature.atts.get(Att.OBJNAM);
+                AttVal<?> name = feature.atts.get(Att.OBJNAM);
                 if (name == null) {
                         AttMap atts = feature.objs.get(feature.type).get(0);
@@ -58 +58 @@
                         return S57val.nullVal(att);
                 else {
-                        AttItem item = atts.get(att);
+                        AttVal<?> item = atts.get(att);
                         if (item == null)
                                 return S57val.nullVal(att);
@@ -89 +89 @@
                 AttMap atts = getAtts(feature, obj, 0);
                 if (atts != null) {
-                        AttItem item = atts.get(att);
+                        AttVal item = atts.get(att);
                         if (item != null) {
                                 switch (item.conv) {
@@ -233 +233 @@
                         case SEA_RECH:
                                 if ((Renderer.zoom >= 10) && (name != null))
-                                        if (feature.flag == Fflag.LINE) {
+                                        if (feature.geom.prim == Pflag.LINE) {
                                                 Renderer.lineText(feature, name, new Font("Arial", Font.PLAIN, 150), Color.black, 0.5, -40);
                                         } else {
@@ -241 +241 @@
                         case SEA_BAY:
                                 if ((Renderer.zoom >= 12) && (name != null))
-                                        if (feature.flag == Fflag.LINE) {
+                                        if (feature.geom.prim == Pflag.LINE) {
                                                 Renderer.lineText(feature, name, new Font("Arial", Font.PLAIN, 150), Color.black, 0.5, -40);
                                         } else {
@@ -249 +249 @@
                         case SEA_SHOL:
                                 if (Renderer.zoom >= 14) {
-                                        if (feature.flag == Fflag.AREA) {
+                                        if (feature.geom.prim == Pflag.AREA) {
                                                 Renderer.lineVector(feature, new LineStyle(new Color(0xc480ff), 4, new float[] { 25, 25 }));
                                                 if (name != null) {
@@ -255 +255 @@
                                                         Renderer.labelText(feature, "(Shoal)", new Font("Arial", Font.PLAIN, 60), Color.black, new Delta(Handle.BC));
                                                 }
-                                        } else if (feature.flag == Fflag.LINE) {
+                                        } else if (feature.geom.prim == Pflag.LINE) {
                                                 if (name != null) {
                                                         Renderer.lineText(feature, name, new Font("Arial", Font.ITALIC, 75), Color.black, 0.5, -40);
@@ -489 +489 @@
                 case ACHARE:
                         if (Renderer.zoom >= 12) {
-                                if (feature.flag != Fflag.AREA) {
+                                if (feature.geom.prim != Pflag.AREA) {
                                         Renderer.symbol(feature, Harbours.Anchorage, new Scheme(Color.black));
                                 } else {
@@ -683 +683 @@
                         MarSYS sys = MarSYS.SYS_CEVN;
                         BnkWTW bnk = BnkWTW.BWW_UNKN;
-                        AttItem att = feature.atts.get(Att.MARSYS);
+                        AttVal att = feature.atts.get(Att.MARSYS);
                         if (att != null) sys = (MarSYS)att.val;
                         ObjTab objs = feature.objs.get(Obj.NOTMRK);