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

Timestamp:

2015-11-13T11:13:11+01:00 (9 years ago)

Author:

malcolmh

Message:

[seachart] bug fixes

File:

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

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

@@ -261 +261 @@
                 feature = new Feature();
                 Obj obj = S57obj.decodeType(objl);
-                if (obj == Obj.BCNWTW)
-                        obj = Obj.BCNLAT;
-                if (obj == Obj.BOYWTW)
-                        obj = Obj.BOYLAT;
                 feature.geom = new Geom(p);
                 feature.type = obj;
@@ -489 +485 @@
                 case POINT:
                         Snode node = nodes.get(id);
-                        if ((node.flg != Nflag.CONN) && (node.flg != Nflag.DPTH) && (!feature.objs.isEmpty())) {
+                        if ((node.flg != Nflag.CONN) && (node.flg != Nflag.DPTH) && (!feature.objs.isEmpty() || (osm.obj != Obj.UNKOBJ))) {
                                 node.flg = Nflag.ISOL;
                         }
@@ -771 +767 @@
                 feature.geom.length = 0;
                 feature.geom.area = 0;
+                if (feature.geom.elems.isEmpty()) {
+                        return false;
+                }
                 if (feature.geom.prim == Pflag.POINT) { 
                         feature.geom.centre = nodes.get(feature.geom.elems.get(0).id);