Changeset 31737 in osm for applications/editors

Timestamp:

2015-11-09T15:16:40+01:00 (9 years ago)

Author:

malcolmh

Message:

[seachart] bug fix

Location:

applications/editors/josm/plugins/seachart/src/s57

Files:

• S57enc.java (modified) (2 diffs)
• S57map.java (modified) (1 diff)
• S57osm.java (modified) (1 diff)

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

@@ -255 +255 @@
                                 ArrayList<ArrayList<Fparams>> objects = new ArrayList<ArrayList<Fparams>>();
                                 ArrayList<Long> slaves = new ArrayList<Long>();
-                                long slaveid = feature.id & 0x01ffffffffffffffl;
+                                long slaveid = feature.id + 0x0100000000000000l;
                                 for (Entry<Obj, ObjTab> objs : feature.objs.entrySet()) {
                                         Obj objobj = objs.getKey();
@@ -267 +267 @@
                                                 Object[] attf = new Object[0];
                                                 Object[] natf = new Object[0];
-                                                for (Entry<Att, AttVal<?>> att : object.getValue().entrySet()) {
+                                                AttMap atts = map.new AttMap();
+                                                atts.putAll(object.getValue());
+                                                if (master) {
+                                                        atts.putAll(feature.atts);
+                                                }
+                                                for (Entry<Att, AttVal<?>> att : atts.entrySet()) {
                                                         if (!((obj == Obj.SOUNDG) && (att.getKey() == Att.VALSOU))) {
                                                                 long attl = S57att.encodeAttribute(att.getKey());

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

@@ -40 +40 @@
                 ISOL,   // Node not part of Edge
                 CONN,   // Edge first and last nodes
+                TRNK, // Edge truncated polygon nodes
                 DPTH    // Sounding nodes
         }

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

@@ -18 +18 @@
 import s57.S57val.*;
 
-public class S57osm { // OSM to S57 Object/Attribute conversions
+public class S57osm { // OSM to S57 Object/Attribute and Object/Primitive conversions
+        
+        enum Prims { P, L, A, PA, PL, LA, PLA }
+        private static final EnumMap<Obj, Prims> S57prims = new EnumMap<Obj, Prims>(Obj.class);
+        static {
+                S57prims.put(Obj.UNKOBJ, Prims.PLA);
+        }
 
         static class KeyVal<V> {