Changeset 30285 in osm for applications/editors/josm/plugins/smed2/src/s57/S57map.java

Timestamp:

2014-02-17T14:27:01+01:00 (11 years ago)

Author:

malcolmh

Message:

save

File:

• applications/editors/josm/plugins/smed2/src/s57/S57map.java (modified) (15 diffs)

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

@@ -1 @@
-/* Copyright 2013 Malcolm Herring
+/* Copyright 2014 Malcolm Herring
  *
  * This is free software: you can redistribute it and/or modify
@@ -93 +93 @@
         
         public enum Rflag {
-                UNKN, AGGR, MASTER, SLAVE
+                UNKN, MASTER, SLAVE
         }
         
@@ -120 +120 @@
                 public ObjMap() {
                         super(Obj.class);
-                }
-        }
-
-        public class Aggr {
-                public RelTab rels;
-                public long par;
-                public Aggr() {
-                        rels = new RelTab();
-                        par = 0;
                 }
         }
@@ -218 +209 @@
                 public Obj type;                        // Feature type
                 public AttMap atts;             // Feature attributes
-                public Aggr aggr;                       // Related objects
+                public RelTab rels;             // Related objects
                 public ObjMap objs;             // Slave object attributes
 
@@ -224 +215 @@
                         reln = Rflag.UNKN;
                         geom = new Geom(Pflag.NOSP);
-                        type = Obj.C_AGGR;
+                        type = Obj.UNKOBJ;
                         atts = new AttMap();
-                        aggr = new Aggr();
+                        rels = new RelTab();
                         objs = new ObjMap();
                 }
@@ -271 +262 @@
                         obj = Obj.BOYLAT;
                 if (obj == Obj.C_AGGR)
-                        feature.reln = Rflag.AGGR;
+                        feature.reln = Rflag.UNKN;
                 feature.geom = new Geom(p);
                 feature.type = obj;
@@ -280 +271 @@
         
         public void newObj(long id, int rind) {
-                Rflag r = Rflag.AGGR;
+                Rflag r = Rflag.UNKN;
                 switch (rind) {
                 case 1:
@@ -292 +283 @@
                         break;
                 }
-                feature.aggr.rels.add(new Reln(id, r));
+                feature.rels.add(new Reln(id, r));
         }
         
@@ -354 +345 @@
                 for (long id : index.keySet()) {
                         Feature feature = index.get(id);
-                        for (Reln reln : feature.aggr.rels) {
+                        for (Reln reln : feature.rels) {
                                 Feature rel = index.get(reln.id);
                                 if (cmpGeoms(feature.geom, rel.geom)) {
                                         switch (reln.reln) {
-                                        case MASTER:
-                                                feature.reln = Rflag.AGGR;
-                                                break;
                                         case SLAVE:
                                                 feature.reln = Rflag.MASTER;
@@ -388 +376 @@
                 for (long id : index.keySet()) {
                         Feature feature = index.get(id);
-                        for (Reln reln : feature.aggr.rels) {
+                        for (Reln reln : feature.rels) {
                                 Feature rel = index.get(reln.id);
                                 if (rel.reln == Rflag.SLAVE) {
@@ -408 +396 @@
                 nodes.put(id, node);
                 feature = new Feature();
-                feature.reln = Rflag.AGGR;
+                feature.reln = Rflag.UNKN;
                 feature.geom.prim = Pflag.POINT;
                 feature.geom.elems.add(new Prim(id));
@@ -416 +404 @@
         public void addEdge(long id) {
                 feature = new Feature();
-                feature.reln = Rflag.AGGR;
+                feature.reln = Rflag.UNKN;
                 feature.geom.prim = Pflag.LINE;
                 feature.geom.elems.add(new Prim(id));
@@ -436 +424 @@
         public void addArea(long id) {
                 feature = new Feature();
-                feature.reln = Rflag.AGGR;
+                feature.reln = Rflag.UNKN;
                 feature.geom.prim = Pflag.AREA;
                 feature.geom.elems.add(new Prim(id));
@@ -447 +435 @@
 
         public void addTag(String key, String val) {
+                feature.reln = Rflag.MASTER;
                 String subkeys[] = key.split(":");
                 if ((subkeys.length > 1) && subkeys[0].equals("seamark")) {
@@ -461 +450 @@
                                         att = S57att.enumAttribute(subkeys[2], obj);
                                 }
-                                ObjTab items = feature.objs.get(obj);
-                                if (items == null) {
-                                        items = new ObjTab();
-                                        feature.objs.put(obj, items);
-                                        Feature type = new Feature();
-                                        type.reln = Rflag.SLAVE;
-                                        type.type = obj;
-                                        type.geom = feature.geom;
-                                }
-//                              AttMap atts = items.get(idx);
-//                              if (atts == null) {
-//                                      atts = new AttMap();
-//                                      items.put(idx, atts);
-//                              }
-//                              AttVal<?> attval = S57val.convertValue(val, att);
-//                              if (attval.val != null)
-//                                      atts.put(att, attval);
+                                ObjTab objs = feature.objs.get(obj);
+                                if (objs == null) {
+                                        objs = new ObjTab();
+                                        feature.objs.put(obj, objs);
+                                }
+                                AttMap atts = objs.get(idx);
+                                if (atts == null) {
+                                        atts = new AttMap();
+                                        objs.put(idx, atts);
+                                }
+                                AttVal<?> attval = S57val.convertValue(val, att);
+                                if (attval.val != null)
+                                        atts.put(att, attval);
                         } else {
                                 if (subkeys[1].equals("type")) {
                                         obj = S57obj.enumType(val);
-                                        if (feature.objs.get(feature.type) == null) {
-                                                feature.objs.put(feature.type, new ObjTab());
-                                                Feature type = new Feature();
-                                                type.reln = Rflag.MASTER;
-                                                type.type = obj;
-                                                type.geom = feature.geom;
+                                        feature.type = obj;
+                                        ObjTab objs = feature.objs.get(obj);
+                                        if (objs == null) {
+                                                objs = new ObjTab();
+                                                feature.objs.put(obj, objs);
+                                        }
+                                        AttMap atts = objs.get(0);
+                                        if (atts == null) {
+                                                atts = new AttMap();
+                                                objs.put(0, atts);
                                         }
                                 } else {