Changeset 28722 in osm for applications/editors/josm/plugins/smed2/src/S57

Timestamp:

2012-09-21T19:52:00+02:00 (13 years ago)

Author:

malcolmh

Message:

save

Location:

applications/editors/josm/plugins/smed2/src/S57

Files:

• S57dat.java (added)
• S57obj.java (modified) (1 diff)
• S57val.java (modified) (1 diff)

applications/editors/josm/plugins/smed2/src/S57/S57obj.java

@@ -79 +79 @@
         private static final EnumMap<Obj, String> ObjSTR = new EnumMap<Obj, String>(Obj.class);
         static {
-                ObjSTR.put(Obj.UNKOBJ, "");     ObjSTR.put(Obj.ADMARE, "administration");       ObjSTR.put(Obj.AIRARE, "airfield");     ObjSTR.put(Obj.ACHBRT, "anchor_berth");
+                ObjSTR.put(Obj.UNKOBJ, "");     ObjSTR.put(Obj.ADMARE, "administrative_area");  ObjSTR.put(Obj.AIRARE, "airfield");     ObjSTR.put(Obj.ACHBRT, "anchor_berth");
                 ObjSTR.put(Obj.ACHARE, "anchorage"); ObjSTR.put(Obj.BCNCAR, "beacon_cardinal"); ObjSTR.put(Obj.BCNISD, "beacon_isolated_danger");
                 ObjSTR.put(Obj.BCNLAT, "beacon_lateral");       ObjSTR.put(Obj.BCNSAW, "beacon_safe_water"); ObjSTR.put(Obj.BCNSPP, "beacon_special_purpose");

applications/editors/josm/plugins/smed2/src/S57/S57val.java

@@ -62 +62 @@
         private static final EnumMap<CatACH, S57enum> Catach = new EnumMap<CatACH, S57enum>(CatACH.class); static {Catach.put(CatACH.ACH_UNKN, new S57enum(0, ""));
                 Catach.put(CatACH.ACH_UNRD, new S57enum(1, "unrestricted")); Catach.put(CatACH.ACH_DEEP, new S57enum(2, "deep_water")); Catach.put(CatACH.ACH_TANK, new S57enum(3, "tanker"));
-                Catach.put(CatACH.ACH_EXPL, new S57enum(4, "explosives")); Catach.put(CatACH.ACH_QUAR, new S57enum(5, "quarantine")); Catach.put(CatACH.ACH_SEAP, new S57enum(6, "sea-plane"));
+                Catach.put(CatACH.ACH_EXPL, new S57enum(4, "explosives")); Catach.put(CatACH.ACH_QUAR, new S57enum(5, "quarantine")); Catach.put(CatACH.ACH_SEAP, new S57enum(6, "seaplane"));
                 Catach.put(CatACH.ACH_SMCF, new S57enum(7, "small_craft")); Catach.put(CatACH.ACH_SMCM, new S57enum(8, "small_craft_mooring")); Catach.put(CatACH.ACH_H24P, new S57enum(9, "24_hour"));
                 Catach.put(CatACH.ACH_LTPD, new S57enum(10, "limited_period")); Catach.put(CatACH.ACH_NPSH, new S57enum(11, "non_pushing")); Catach.put(CatACH.ACH_DRYC, new S57enum(12, "dry_cargo"));