Changeset 22732 in osm for applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySpec.java

Timestamp:

2010-08-22T16:56:26+02:00 (14 years ago)

Author:

malcolmh

Message:

bug fixes

File:

• applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySpec.java (modified) (4 diffs)

applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySpec.java

@@ -16 +16 @@
 
 public class BuoySpec extends Buoy {
-        public BuoySpec(SmpDialogAction dia,  Node node) {
+        public BuoySpec(SmpDialogAction dia, Node node) {
                 super(dia);
 
@@ -56 +56 @@
                 setBuoyIndex(SPECIAL_PURPOSE);
 
+                if (keys.containsKey("name"))
+                        setName(keys.get("name"));
+
+                if (keys.containsKey("seamark:name"))
+                        setName(keys.get("seamark:name"));
+
+                if (keys.containsKey("seamark:buoy_special_purpose:name"))
+                        setName(keys.get("seamark:buoy_special_purpose:name"));
+                else if (keys.containsKey("seamark:beacon_special_purpose:name"))
+                        setName(keys.get("seamark:beacon_special_purpose:name"));
+                else if (keys.containsKey("seamark:light_float:name"))
+                        setName(keys.get("seamark:light_float:name"));
+
                 if (keys.containsKey("seamark:buoy_special_purpose:shape")) {
                         str = keys.get("seamark:buoy_special_purpose:shape");
@@ -69 +82 @@
                 }
 
-                if (keys.containsKey("seamark:beacon_special_purpose"))
+                if ((keys.containsKey("seamark:type") && keys.get("seamark:type").equals(
+                                "beacon_special_purpose"))
+                                || keys.containsKey("seamark:special_purpose_beacon:colour")
+                                || keys.containsKey("seamark:special_purpose_beacon:shape"))
                         setStyleIndex(SPEC_BEACON);
-                else if (keys.containsKey("seamark:light_float")
-                                && keys.containsKey("seamark:light_float:colour")
+                else if (keys.containsKey("seamark:light_float:colour")
                                 && keys.get("seamark:light_float:colour").equals("yellow"))
                         setStyleIndex(SPEC_FLOAT);
@@ -104 +119 @@
                         }
                 }
-
-                paintSign();
         }