Changeset 23176 in osm

Timestamp:

2010-09-15T15:17:48+02:00 (15 years ago)

Author:

malcolmh

Message:

new symbols

Location:

applications/editors/josm/plugins/toms/src

Files:

• images/Barrel.png (added)
• images/Beacon.png (added)
• images/Can.png (added)
• images/Can_Yellow.png (added)
• images/Cone.png (added)
• images/Cone_Yellow.png (added)
• images/Float_Major.png (added)
• images/Float_Minor.png (added)
• images/Pillar.png (added)
• images/Spar.png (added)
• images/Sphere.png (added)
• images/Tower.png (added)
• toms/dialogs/SmpDialogAction.java (modified) (1 diff)
• toms/seamarks/SeaMark.java (modified) (1 diff)
• toms/seamarks/buoys/Buoy.java (modified) (1 diff)
• toms/seamarks/buoys/BuoySpec.java (modified) (3 diffs)

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

@@ -450 +450 @@
                                         return;
                                 } else if (str.equals("yellow")) { //$NON-NLS-1$
-                                        buoy = new BuoySaw(this, node);
+                                        buoy = new BuoySpec(this, node);
                                         return;
                                 }

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

@@ -100 +100 @@
         public final static int ISOL_FLOAT = 5;
         public final static int SPEC_PILLAR = 1;
-        public final static int SPEC_SPAR = 2;
-        public final static int SPEC_SPHERE = 3;
-        public final static int SPEC_BARREL = 4;
-        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 SPEC_CAN = 2;
+        public final static int SPEC_CONE = 3;
+        public final static int SPEC_SPAR = 4;
+        public final static int SPEC_BEACON = 5;
+        public final static int SPEC_TOWER = 6;
+        public final static int SPEC_FLOAT = 7;
+        public final static int SPEC_SPHERE = 8;
+        public final static int SPEC_BARREL = 9;
         
         /**

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

@@ -413 +413 @@
                 }
                 setSectorIndex(0);
+                dlg.cbM01Sector.setSelectedIndex(0);
                 dlg.cM01Fired.setSelected(isFired());
                 dlg.rbM01Fired1.setSelected(!isSectored());

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

@@ -32 +32 @@
                 dlg.cbM01StyleOfMark.addItem(Messages.getString("SmpDialogAction.212")); //$NON-NLS-1$
                 dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.01")); //$NON-NLS-1$
+                dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.02")); //$NON-NLS-1$
+                dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.03")); //$NON-NLS-1$
                 dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.04")); //$NON-NLS-1$
+                dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.05")); //$NON-NLS-1$
+                dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.06")); //$NON-NLS-1$
+                dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.07")); //$NON-NLS-1$
                 dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.08")); //$NON-NLS-1$
                 dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.09")); //$NON-NLS-1$
-                dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.07")); //$NON-NLS-1$
-                dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.05")); //$NON-NLS-1$
-                dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.06")); //$NON-NLS-1$
                 dlg.cbM01StyleOfMark.setVisible(true);
                 dlg.lM01StyleOfMark.setVisible(true);
@@ -71 +73 @@
                         if (str.equals("pillar")) //$NON-NLS-1$
                                 setStyleIndex(SPEC_PILLAR);
+                        else if (str.equals("can")) //$NON-NLS-1$
+                                setStyleIndex(SPEC_CAN);
+                        else if (str.equals("conical")) //$NON-NLS-1$
+                                setStyleIndex(SPEC_CONE);
                         else if (str.equals("spar")) //$NON-NLS-1$
                                 setStyleIndex(SPEC_SPAR);
@@ -79 +85 @@
                 }
 
+                if (keys.containsKey("seamark:beacon_special_purpose:shape")) { //$NON-NLS-1$
+                        str = keys.get("seamark:beacon_special_purpose:shape"); //$NON-NLS-1$
+                if (str.equals("tower")) //$NON-NLS-1$
+                        setStyleIndex(SPEC_TOWER);
+                else 
+                        setStyleIndex(SPEC_BEACON);
+                }
+
+                if (keys.containsKey("seamark:light_float:colour")) {
+                        setStyleIndex(SPEC_FLOAT);
+                }
+                
                 if ((keys.containsKey("seamark:type") && keys.get("seamark:type").equals( //$NON-NLS-1$ //$NON-NLS-2$
                                 "beacon_special_purpose")) //$NON-NLS-1$