Changeset 31735 in osm for applications/editors/josm/plugins/seachart/src/s57/S57map.java

Timestamp:

2015-11-08T09:49:14+01:00 (10 years ago)

Author:

malcolmh

Message:

[seachart] update

File:

• applications/editors/josm/plugins/seachart/src/s57/S57map.java (modified) (5 diffs)

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

@@ -219 +219 @@
         }
         
+        public MapBounds bounds;
         public NodeTab nodes;
         public EdgeTab edges;
-
         public FtrMap features;
         public FtrTab index;
-        
-        public MapBounds bounds;
-
-        public long cref;
         public long xref;
+
+        private long cref;
         private Feature feature;
         private Edge edge;
         private KeyVal<?> osm = S57osm.OSMtag("", "");
-        boolean sea;
+        private boolean sea;
 
         public S57map(boolean s) {
@@ -367 +365 @@
 
         // OSM map building methods
-        
+
         public void addNode(long id, double lat, double lon) {
-                Snode node = new Snode(Math.toRadians(lat), Math.toRadians(lon));
-                nodes.put(id, node);
+                nodes.put(id, new Snode(Math.toRadians(lat), Math.toRadians(lon)));
                 feature = new Feature();
                 feature.id = id;
@@ -555 +552 @@
         
         enum Ext {I, N, W, S, E }
+        
         public void mapDone() {
                 class Land {
@@ -579 +577 @@
                         for (Feature feature : features.get(Obj.COALNE)) {
                                 Feature land = new Feature();
+                                land.id = ++xref;
                                 land.type = Obj.LNDARE;
                                 land.reln = Rflag.MASTER;
                                 land.objs.put(Obj.LNDARE, new ObjTab());
+                                land.objs.get(Obj.LNDARE).put(0, new AttMap());
                                 if (feature.geom.prim == Pflag.AREA) {
                                         land.geom = feature.geom;
@@ -587 +587 @@
                                 } else if (feature.geom.prim == Pflag.LINE) {
                                         land.geom.prim = Pflag.LINE;
-                                        for (int i = 0; i < feature.geom.elems.size(); i++) {
-                                                land.geom.elems.add(feature.geom.elems.get(i));
-                                        }
+                                        land.geom.elems.addAll(feature.geom.elems);
                                         coasts.add(land);
                                 }