Changeset 31028 in osm for applications/editors/josm/plugins/seachart/src/s57

Timestamp:

2015-02-20T01:43:42+01:00 (10 years ago)

Author:

malcolmh

Message:

add base map rendering

Location:

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

Files:

• S57map.java (modified) (6 diffs)
• S57osm.java (modified) (1 diff)

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

@@ -233 +233 @@
         }
         
-        ArrayList<OSMtag> osmtags;
-
         public NodeTab nodes;
         public EdgeTab edges;
@@ -389 +387 @@
                 feature.geom.prim = Pflag.POINT;
                 feature.geom.elems.add(new Prim(id));
-                osmtags = new ArrayList<OSMtag>();
                 edge = null;
         }
@@ -398 +395 @@
                 feature.geom.prim = Pflag.LINE;
                 feature.geom.elems.add(new Prim(id));
-                osmtags = new ArrayList<OSMtag>();
                 edge = new Edge();
         }
@@ -418 +414 @@
                 feature.reln = Rflag.UNKN;
                 feature.geom.prim = Pflag.AREA;
-                osmtags = new ArrayList<OSMtag>();
                 edge = null;
         }
@@ -479 +474 @@
                         }
                 } else {
-                        osmtags.add(new OSMtag(key, val));
-                }
-        }
-
-        public void tagsDone(long id) {
-                for (OSMtag tag : osmtags) {
-                        KeyVal kv = S57osm.OSMtag(tag.key, tag.val);
+                        KeyVal kv = S57osm.OSMtag(key, val);
                         if (kv.obj != Obj.UNKOBJ) {
                                 if (feature.type == Obj.UNKOBJ) {
@@ -503 +492 @@
                                         atts.put(kv.att, new AttVal(kv.att, kv.conv, kv.val));
                                 }
-                                break;
-                        }
-                }
+                        }
+                }
+        }
+
+        public void tagsDone(long id) {
                 switch (feature.geom.prim) {
                 case POINT:

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

@@ -38 +38 @@
                 OSMtags.put("waterway=canal", new KeyVal<>(Obj.CANALS, 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("wetland=tidalflat", new KeyVal<Double>(Obj.DEPARE, Att.DRVAL2, Conv.F, (double)0)); OSMtags.put("tidal=yes", new KeyVal<Double>(Obj.DEPARE, Att.DRVAL2, Conv.F, (double)0));
+                OSMtags.put("wetland=tidalflat", new KeyVal<Double>(Obj.DEPARE, Att.DRVAL2, Conv.F, (double)0)); OSMtags.put("tidal=yes", new KeyVal<Double>(Obj.DEPARE, Att.DRVAL2, Conv.F, (Double)0.0));
                 OSMtags.put("natural=mud", new KeyVal<>(Obj.DEPARE, Att.UNKATT, null, null)); OSMtags.put("natural=sand", new KeyVal<>(Obj.DEPARE, Att.UNKATT, null, null));
                 OSMtags.put("highway=motorway", new KeyVal<>(Obj.ROADWY, Att.CATROD, Conv.E, CatROD.ROD_MWAY)); OSMtags.put("highway=trunk", new KeyVal<>(Obj.ROADWY, Att.CATROD, Conv.E, CatROD.ROD_MAJR));