Changeset 32082 in osm for applications/editors/josm/plugins/seachart/src/s57/S57osm.java

Timestamp:

2016-02-27T09:09:45+01:00 (10 years ago)

Author:

malcolmh

Message:

[seachart] update

File:

• applications/editors/josm/plugins/seachart/src/s57/S57osm.java (modified) (4 diffs)

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

@@ -35 +35 @@
         static {
                 OSMtags.put("natural=coastline", new KeyVal<>(Obj.COALNE, Att.UNKATT, null, null)); OSMtags.put("natural=water", new KeyVal<>(Obj.LAKARE, Att.UNKATT, null, null));
+                OSMtags.put("water=river", new KeyVal<>(Obj.RIVERS, Att.UNKATT, null, null)); OSMtags.put("water=canal", new KeyVal<>(Obj.CANALS, Att.UNKATT, null, null));
                 OSMtags.put("waterway=riverbank", new KeyVal<>(Obj.RIVERS, Att.UNKATT, null, null)); OSMtags.put("waterway=dock", new KeyVal<>(Obj.HRBBSN, Att.UNKATT, null, null));
                 OSMtags.put("waterway=lock", new KeyVal<>(Obj.HRBBSN, Att.UNKATT, null, null)); OSMtags.put("landuse=basin", new KeyVal<>(Obj.LAKARE, Att.UNKATT, null, null));
@@ -51 +52 @@
                 }
         
-        public static KeyVal<?> OSMtag(String key, String val) {
+        public static void OSMtag(ArrayList<KeyVal<?>> osm, String key, String val) {
                 KeyVal<?> kv = OSMtags.get(key + "=" + val);
                 if (kv != null) {
@@ -57 +58 @@
                                 ArrayList<Enum<?>> list = new ArrayList<Enum<?>>();
                                 list.add((Enum<?>)kv.val);
-                                return new KeyVal<>(kv.obj, kv.att, kv.conv, list);
-                        }
-                        return kv;
-                }
-                return new KeyVal<>(Obj.UNKOBJ, Att.UNKATT, null, null);
-        }
-        
-        public static void OSMmap(BufferedReader in, S57map map) throws Exception {
+                                osm.add(new KeyVal<>(kv.obj, kv.att, kv.conv, list));
+                        } else {
+                                osm.add(kv);
+                        }
+                }
+                KeyVal<?> kvl = null;
+                KeyVal<?> kvd = null;
+                boolean rc = false;
+                boolean rcl = false;
+                for (KeyVal<?> kvx : osm) {
+                        if (kvx.obj == Obj.LAKARE) {
+                                kvl = kvx;
+                        } else if ((kvx.obj == Obj.RIVERS) || (kvx.obj == Obj.CANALS)) {
+                                rc = true;
+                        }
+                        if (kvx.obj == Obj.DEPARE) {
+                                kvd = kvx;
+                        } else if ((kvx.obj == Obj.RIVERS) || (kvx.obj == Obj.CANALS) || (kvx.obj == Obj.LAKARE)) {
+                                rcl = true;
+                        }
+                }
+                if (rc && (kvl != null)) {
+                        osm.remove(kvl);
+                }
+                if (rcl && (kvd != null)) {
+                        osm.remove(kvd);
+                }
+                return;
+        }
+        
+        public static void OSMmap(BufferedReader in, S57map map, boolean bb) throws Exception {
                 String k = "";
                 String v = "";
@@ -84 +108 @@
                 while ((ln = in.readLine()) != null) {
                         if (inOsm) {
-                                if (ln.contains("<bounds")) {
+                                if (ln.contains("<bounds") && !bb) {
                                         for (String token : ln.split("[ ]+")) {
                                                 if (token.matches("^minlat=.+")) {