Changeset 29172 in osm for applications/editors/josm/plugins/smed2/src/seamap/SeaMap.java

Timestamp:

2013-01-05T16:09:17+01:00 (12 years ago)

Author:

malcolmh

Message:

save

File:

• applications/editors/josm/plugins/smed2/src/seamap/SeaMap.java (moved) (moved from applications/editors/josm/plugins/smed2/src/seamap/Map.java ) (5 diffs)

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

@@ -21 +21 @@
 import s57.S57val.*;
 
-public class Map {
+public class SeaMap {
 
         public enum Fflag {
@@ -66 +66 @@
         public HashMap<Long, ArrayList<Long>> ways;
         public HashMap<Long, ArrayList<Long>> mpolys;
-        public HashMap<Long, Feature> features;
+        public EnumMap<Obj, ArrayList<Feature>> features;
+        public double minlat;
+        public double minlon;
+        public double maxlat;
+        public double maxlon;
 
         private Feature feature;
         private ArrayList<Long> list;
 
-        public Map() {
+        public SeaMap() {
                 nodes = new HashMap<Long, Coord>();
                 ways = new HashMap<Long, ArrayList<Long>>();
                 mpolys = new HashMap<Long, ArrayList<Long>>();
                 feature = new Feature();
-                features = new HashMap<Long, Feature>();
+                features = new EnumMap<Obj, ArrayList<Feature>>(Obj.class);
         }
 
@@ -115 +119 @@
                                 feature.flag = Fflag.AREA;
                         }
-                        features.put(feature.refs, feature);
+                        if (features.get(feature.type) == null) {
+                                features.put(feature.type, new ArrayList<Feature>());
+                        }
+                        features.get(feature.type).add(feature);
                 }
         }
@@ -144 +151 @@
                                 }
                                 AttVal attval = S57val.convertValue(val, att);
-                                atts.put(att, new AttItem(attval.conv, attval.val));
+                                if (attval.val != null) atts.put(att, new AttItem(attval.conv, attval.val));
                         } else {
                                 if (subkeys[1].equals("type")) {
@@ -152 +159 @@
                                         if (att != Att.UNKATT) {
                                                 AttVal attval = S57val.convertValue(val, att);
-                                                feature.atts.put(att, new AttItem(attval.conv, attval.val));
+                                                if (attval.val != null) feature.atts.put(att, new AttItem(attval.conv, attval.val));
                                         }
                                 }