Changeset 30298 in osm for applications/editors/josm/plugins/smed2/src/panels/PanelS57.java

Timestamp:

2014-02-19T10:26:43+01:00 (12 years ago)

Author:

malcolmh

Message:

save

File:

• applications/editors/josm/plugins/smed2/src/panels/PanelS57.java (modified) (6 diffs)

applications/editors/josm/plugins/smed2/src/panels/PanelS57.java

@@ -10 +10 @@
 package panels;
 
+import java.awt.Color;
 import java.awt.Dimension;
 import java.io.*;
@@ -51 +52 @@
                 JFileChooser ifc = new JFileChooser(Main.pref.get("smed2plugin.file"));
                 FileInputStream in = new FileInputStream(inf);
-                PanelMain.messageBar.setText("Select OSM types file");
+                PanelMain.setStatus("Select OSM types file", Color.yellow);
                 ifc.setCurrentDirectory(inf);
                 int returnVal = ifc.showOpenDialog(Main.parent);
@@ -65 +66 @@
                 MapBounds bounds = S57dec.decodeFile(in, types, map);
 
-                PanelMain.messageBar.setText("Import done");
                 in.close();
                 
@@ -85 +85 @@
                                                                         node.setOsmId(ref, 1);
                                                                         data.addPrimitive(node);
-//                                                                      out.format("  <node id='%d' lat='%.8f' lon='%.8f' version='1'>%n", -ref, Math.toDegrees(node.lat), Math.toDegrees(node.lon));
-//                                                                      out.format("    <tag k='seamark:type' v=\"%s\"/>%n", type);
-//                                                                      if ((feature.type == Obj.SOUNDG) && (node.flg == S57map.Nflag.DPTH))
-//                                                                              out.format("    <tag k='seamark:sounding:depth' v='%.1f'/>%n", ((Dnode) node).val);
                                                                         addKeys(node, feature, type);
                                                                         done.add(ref);
@@ -195 +191 @@
                 Main.map.mapView.addLayer(layer);
                 Main.map.mapView.zoomTo(new Bounds(bounds.minlat, bounds.minlon, bounds.maxlat, bounds.maxlon));
+                PanelMain.setStatus("Import done", Color.green);
         }
 
@@ -203 +200 @@
                 }
                 keys.put("seamark:type", type);
+                if (feature.type == Obj.SOUNDG) {
+                        Snode snode = map.nodes.get(feature.geom.elems.get(0).id);
+                        if (snode.flg == S57map.Nflag.DPTH) {
+                                keys.put("seamark:sounding:depth", ((Double)((Dnode)snode).val).toString());
+                        }
+                }
                 for (Map.Entry<Att, AttVal<?>> item : feature.atts.entrySet()) {
                         String attstr = S57att.stringAttribute(item.getKey());