Changeset 22816 in osm for applications/editors/josm

Timestamp:

2010-08-27T20:38:03+02:00 (14 years ago)

Author:

malcolmh

Message:

'New release'

Location:

applications/editors/josm/plugins/toms/src/toms

Files:

• dialogs/SmpDialogAction.java (modified) (1 diff)
• seamarks/SeaMark.java (modified) (1 diff)
• seamarks/buoys/BuoySpec.java (modified) (4 diffs)

applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java

@@ -169 +169 @@
 
                 dia = this;
-
+                String str = Main.pref.get("mappaint.style.sources");
+                if (!str.contains("dev.openseamap.org")) {
+                        if (!str.equals("")) str += new String(new char[] {0x1e});
+                        Main.pref.put("mappaint.style.sources", str + "http://dev.openseamap.org/josm/seamark_styles.xml");
+                }
         }
 

applications/editors/josm/plugins/toms/src/toms/seamarks/SeaMark.java

@@ -92 +92 @@
         public final static int SPEC_FLOAT = 5;
         public final static int SPEC_BEACON = 6;
+        public final static int SPEC_TOWER = 7;
         public final static int LIGHT_HOUSE = 1;
         public final static int LIGHT_MAJOR = 2;

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

@@ -32 +32 @@
                 dlg.cbM01StyleOfMark.addItem("Float");
                 dlg.cbM01StyleOfMark.addItem("Beacon");
+                dlg.cbM01StyleOfMark.addItem("Tower");
 
                 dlg.cbM01Kennung.removeAllItems();
@@ -85 +86 @@
                                 "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:colour")
+                                || keys.containsKey("seamark:special_purpose_beacon:shape")) {
+                        if (keys.containsKey("seamark:special_purpose_beacon:shape")
+                                        && keys.get("seamark:soecial_purpose_beacon:shape").equals("tower"))
+                                setStyleIndex(SPEC_TOWER);
+                        else
+                                setStyleIndex(SPEC_BEACON);
+                } else if (keys.containsKey("seamark:light_float:colour")
                                 && keys.get("seamark:light_float:colour").equals("yellow"))
                         setStyleIndex(SPEC_FLOAT);
@@ -163 +168 @@
                         image += "_Beacon";
                         break;
+                case SPEC_TOWER:
+                        image += "_Tower";
+                        break;
                 default:
                 }
@@ -236 +244 @@
                                         "seamark:beacon_special_purpose:colour", "yellow"));
                         break;
+                case SPEC_TOWER:
+                        super.saveSign("beacon_special_purpose");
+                        Main.main.undoRedo.add(new ChangePropertyCommand(node,
+                                        "seamark:beacon_special_purpose:shape", "tower"));
+                        Main.main.undoRedo.add(new ChangePropertyCommand(node,
+                                        "seamark:beacon_special_purpose:colour", "yellow"));
+                        break;
                 default:
                 }