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

Timestamp:

2020-03-29T23:03:21+02:00 (5 years ago)

Author:

malcolmh

Message:

more map features

Location:

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

Files:

• S57att.java (modified) (1 diff)
• S57osm.java (modified) (4 diffs)

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

@@ -115 +115 @@
         AttStr.put(Att.HORCLR, "clearance_width"); AttStr.put(Att.HORLEN, "length"); AttStr.put(Att.HORWID, "width"); AttStr.put(Att.ICEFAC, "factor");
         AttStr.put(Att.INFORM, "information"); AttStr.put(Att.JRSDTN, "jurisdiction"); AttStr.put(Att.LIFCAP, "maximum_load"); AttStr.put(Att.LITCHR, "character");
-        AttStr.put(Att.LITVIS, "visibility"); AttStr.put(Att.MARSYS, "system"); AttStr.put(Att.MLTYLT, "multiple"); AttStr.put(Att.NATION, "nationality");
+        AttStr.put(Att.LITVIS, "visibility"); AttStr.put(Att.MARSYS, "system"); AttStr.put(Att.MLTYLT, "multiple"); AttStr.put(Att.NATION, "nation");
         AttStr.put(Att.NATCON, "construction"); AttStr.put(Att.NATSUR, "surface"); AttStr.put(Att.NATQUA, "surface_qualification"); AttStr.put(Att.NMDATE, "nm_date");
         AttStr.put(Att.OBJNAM, "name"); AttStr.put(Att.ORIENT, "orientation"); AttStr.put(Att.PEREND, "period_end"); AttStr.put(Att.PERSTA, "period_start");

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

@@ -59 +59 @@
         OSMtags.put("landuse=industrial", new KeyVal<>(Obj.BUAARE, Att.UNKATT, null, null)); OSMtags.put("landuse=commercial", new KeyVal<>(Obj.BUAARE, Att.UNKATT, null, null));
         OSMtags.put("landuse=retail", new KeyVal<>(Obj.BUAARE, Att.UNKATT, null, null)); OSMtags.put("landuse=residential", new KeyVal<>(Obj.BUAARE, Att.UNKATT, null, null));
+        OSMtags.put("boundary_type=territorial_waters", new KeyVal<>(Obj.TESARE, Att.UNKATT, null, null));
     }
 
@@ -98 +99 @@
 
     public static void OSMmap(File in, S57map map, boolean bb) throws Exception {
-        String k = "";
-        String v = "";
-
         double lat = 0;
         double lon = 0;
         long id = 0;
         long ref = 0;
+        String k = "";
+        String v = "";
         String type = "";
         String role = "";
@@ -121 +121 @@
             System.exit(-1);
         }
-        NodeList nList = doc.getElementsByTagName("bounds");
-        NamedNodeMap nnmap = nList.item(0).getAttributes();
-        map.bounds.minlat = Math.toRadians(Double.parseDouble(nnmap.getNamedItem("minlat").getNodeValue()));
-        map.nodes.get(2L).lat = map.bounds.minlat;
-        map.nodes.get(3L).lat = map.bounds.minlat;
-        map.bounds.minlon = Math.toRadians(Double.parseDouble(nnmap.getNamedItem("minlon").getNodeValue()));
-        map.nodes.get(1L).lon = map.bounds.minlon;
-        map.nodes.get(2L).lon = map.bounds.minlon;
-        map.bounds.maxlat = Math.toRadians(Double.parseDouble(nnmap.getNamedItem("maxlat").getNodeValue()));
-        map.nodes.get(1L).lat = map.bounds.maxlat;
-        map.nodes.get(4L).lat = map.bounds.maxlat;
-        map.bounds.maxlon = Math.toRadians(Double.parseDouble(nnmap.getNamedItem("maxlon").getNodeValue()));
-        map.nodes.get(3L).lon = map.bounds.maxlon;
-        map.nodes.get(4L).lon = map.bounds.maxlon;
+                NodeList nList = doc.getElementsByTagName("bounds");
+                NamedNodeMap nnmap;
+                if (nList.getLength() != 0) {
+                        nnmap = nList.item(0).getAttributes();
+                        map.bounds.minlat = Math.toRadians(Double.parseDouble(nnmap.getNamedItem("minlat").getNodeValue()));
+                        map.nodes.get(2L).lat = map.bounds.minlat;
+                        map.nodes.get(3L).lat = map.bounds.minlat;
+                        map.bounds.minlon = Math.toRadians(Double.parseDouble(nnmap.getNamedItem("minlon").getNodeValue()));
+                        map.nodes.get(1L).lon = map.bounds.minlon;
+                        map.nodes.get(2L).lon = map.bounds.minlon;
+                        map.bounds.maxlat = Math.toRadians(Double.parseDouble(nnmap.getNamedItem("maxlat").getNodeValue()));
+                        map.nodes.get(1L).lat = map.bounds.maxlat;
+                        map.nodes.get(4L).lat = map.bounds.maxlat;
+                        map.bounds.maxlon = Math.toRadians(Double.parseDouble(nnmap.getNamedItem("maxlon").getNodeValue()));
+                        map.nodes.get(3L).lon = map.bounds.maxlon;
+                        map.nodes.get(4L).lon = map.bounds.maxlon;
+                }
 
         nList = doc.getElementsByTagName("node");
@@ -141 +144 @@
             Node nNode = nList.item(i);
             if (nNode.getNodeType() == Node.ELEMENT_NODE) {
-                nnmap = nNode.getAttributes();
+                nnmap = nNode.getAttributes();
                 id = Long.parseLong(nnmap.getNamedItem("id").getNodeValue());
                 lat = Double.parseDouble(nnmap.getNamedItem("lat").getNodeValue());