Changeset 31731 in osm for applications/editors/josm/plugins/seachart/src/s57/S57att.java

Timestamp:

2015-11-05T13:43:10+01:00 (11 years ago)

Author:

malcolmh

Message:

[seachart] updates

File:

• applications/editors/josm/plugins/seachart/src/s57/S57att.java (modified) (2 diffs)

applications/editors/josm/plugins/seachart/src/s57/S57att.java

@@ -86 +86 @@
   AttIENC.put(Att.LC_DR1, 18022); AttIENC.put(Att.LC_DR2, 18023); AttIENC.put(Att.LC_SP1, 18024); AttIENC.put(Att.LC_SP2, 18025); AttIENC.put(Att.LC_WD1, 18026);
   AttIENC.put(Att.LC_WD2, 18027); AttIENC.put(Att.SHPTYP, 33066); AttIENC.put(Att.UPDMSG, 40000); AttIENC.put(Att.BNKWTW, 17999);
- }
- 
- private static final HashMap<Integer, Att> S57Att = new HashMap<Integer, Att>();
- static {
-  for (Map.Entry<Att, Integer> entry : AttS57.entrySet()) {
-   S57Att.put(entry.getValue(), entry.getKey());
-  }
-  for (Map.Entry<Att, Integer> entry : AttIENC.entrySet()) {
-   S57Att.put(entry.getValue(), entry.getKey());
-  }
  }
  
@@ -354 +344 @@
  }
 
- public static Att decodeAttribute(long attribute) { // Convert S57 attribute code to SCM attribute enumeration
-  Att att = S57Att.get((int)attribute);
-  return (att != null) ? att : Att.UNKATT;
+ public static Att decodeAttribute(long attl) { // Convert S57 attribute code to SCM attribute enumeration
+                for (Att att : AttS57.keySet()) {
+                        if (AttS57.get(att) == attl) return att;
+                }
+                for (Att att : AttIENC.keySet()) {
+                        if (AttIENC.get(att) == attl) return att;
+                }
+  return Att.UNKATT;
  }