Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/LightsButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/LightsButton.svg (revision 27055)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/LightsButton.svg (revision 27056)
@@ -15,5 +15,5 @@
id="svg2"
version="1.1"
- inkscape:version="0.47 r22583"
+ inkscape:version="0.48.1 r9760"
sodipodi:docname="LightsButton.svg"
inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/Lights.png"
@@ -22,1656 +22,1667 @@
style="display:inline">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ id="defs4">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ inkscape:window-maximized="1">
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties (revision 27055)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties (revision 27056)
@@ -16,4 +16,5 @@
Isol=Isolated danger marks
Lighthouse=Lighthouse
+Landmark=Landmark
MajorLight=Major light
MinorLight=Minor light
@@ -36,8 +37,8 @@
Super=Super-buoy
Beacon=Beacon
-Tower=Beacon tower
+TowerB=Tower Beacon
Stake=Stake beacon
Perch=Perch beacon
-Cairn=Cairn beacon
+CairnB=Cairn beacon
RegionA=IALA Region A
@@ -91,5 +92,4 @@
Range=Range
Category=Category
-SSCategory=Signal Station
UKCategory=Unknown Category
NoneSpecified=None specified
@@ -254,2 +254,12 @@
Whistle=Whistle
Explosion=Explosion
+
+Chimney=Chimney
+Tower=Tower
+Flagstaff=Flagstaff
+FlareStack=Flare Stack
+Monument=Monument
+WaterTower=Water Tower
+Cairn=Cairn
+DishAerial=Dish Aerial
+RadioMast=Radio Mast
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_de.properties
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_de.properties (revision 27055)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_de.properties (revision 27056)
@@ -16,4 +16,5 @@
Isol=Isolated danger marks
Lighthouse=Leuchtturm
+Landmark=Landmark
MajorLight=primäres Feuer
MinorLight=sekundäres Feuer
@@ -36,8 +37,8 @@
Super=Super-buoy
Beacon=Spiere
-Tower=Beacon tower
+TowerB=Tower Beacon
Stake=Stake beacon
Perch=Pricke
-Cairn=Cairn beacon
+CairnB=Cairn beacon
RegionA=IALA Region A
@@ -91,5 +92,4 @@
Range=Bereich
Category=Kategorie
-SSCategory=Signal Station
UKCategory=Unknown Category
NoneSpecified=None specified
@@ -254,2 +254,12 @@
Whistle=Whistle
Explosion=Explosion
+
+Chimney=Chimney
+Tower=Tower
+Flagstaff=Flagstaff
+FlareStack=Flare Stack
+Monument=Monument
+WaterTower=Water Tower
+Cairn=Cairn
+DishAerial=Dish Aerial
+RadioMast=Radio Mast
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_en.properties
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_en.properties (revision 27055)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_en.properties (revision 27056)
@@ -16,4 +16,5 @@
Isol=Isolated danger marks
Lighthouse=Lighthouse
+Landmark=Landmark
MajorLight=Major light
MinorLight=Minor light
@@ -36,8 +37,8 @@
Super=Super-buoy
Beacon=Beacon
-Tower=Beacon tower
+TowerB=Tower Beacon
Stake=Stake beacon
Perch=Perch beacon
-Cairn=Cairn beacon
+CairnB=Cairn beacon
RegionA=IALA Region A
@@ -91,5 +92,4 @@
Range=Range
Category=Category
-SSCategory=Signal Station
UKCategory=Unknown Category
NoneSpecified=None specified
@@ -255,2 +255,11 @@
Explosion=Explosion
+Chimney=Chimney
+Tower=Tower
+Flagstaff=Flagstaff
+FlareStack=Flare Stack
+Monument=Monument
+WaterTower=Water Tower
+Cairn=Cairn
+DishAerial=Dish Aerial
+RadioMast=Radio Mast
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java (revision 27055)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java (revision 27056)
@@ -103,7 +103,5 @@
safeWaterButton.setBorderPainted(false);
}
- if (dlg.mark.testValid()) {
- topmarkButton.setVisible(true);
- }
+ topmarkButton.setVisible(dlg.mark.testValid());
alTop.actionPerformed(null);
dlg.mark.paintSign();
@@ -236,12 +234,9 @@
topmarkButton.setBorderPainted(dlg.mark.getTopmark() != Top.NONE);
topmarkButton.setSelected(dlg.mark.getTopmark() != Top.NONE);
- if (dlg.mark.testValid()) {
- topmarkButton.setVisible(true);
- } else {
- topmarkButton.setVisible(false);
- }
+ topmarkButton.setVisible(dlg.mark.testValid());
panelPort.syncPanel();
panelStbd.syncPanel();
panelSaw.syncPanel();
+ dlg.mark.testValid();
}
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java (revision 27055)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java (revision 27056)
@@ -10,4 +10,5 @@
import oseam.Messages;
import oseam.dialogs.OSeaMAction;
+import oseam.seamarks.SeaMark;
import oseam.seamarks.SeaMark.*;
@@ -98,9 +99,5 @@
button.setBorderPainted(false);
}
- if (dlg.mark.testValid()) {
- topmarkButton.setVisible(true);
- } else {
- topmarkButton.setVisible(false);
- }
+ topmarkButton.setVisible(dlg.mark.testValid());
dlg.mark.paintSign();
}
@@ -157,5 +154,5 @@
this.add(getShapeButton(floatButton, 90, 0, 34, 32, "Float", Shp.FLOAT, Obj.LITFLT, Obj.LITFLT), null);
this.add(getShapeButton(beaconButton, 90, 32, 34, 32, "Beacon", Shp.BEACON, Obj.BCNCAR, Obj.BCNISD), null);
- this.add(getShapeButton(towerButton, 90, 64, 34, 32, "Tower", Shp.TOWER, Obj.BCNCAR, Obj.BCNISD), null);
+ this.add(getShapeButton(towerButton, 90, 64, 34, 32, "TowerB", Shp.TOWER, Obj.BCNCAR, Obj.BCNISD), null);
topmarkButton.setBounds(new Rectangle(130, 0, 34, 32));
@@ -170,5 +167,5 @@
eastButton.setBorderPainted(dlg.mark.getCategory() == Cat.CAM_EAST);
westButton.setBorderPainted(dlg.mark.getCategory() == Cat.CAM_WEST);
- isolButton.setBorderPainted(dlg.mark.getCategory() == Cat.NONE);
+ isolButton.setBorderPainted(SeaMark.GrpMAP.get(dlg.mark.getObject()) == Grp.ISD);
for (Shp shp : shapes.keySet()) {
JRadioButton button = shapes.get(shp);
@@ -176,4 +173,5 @@
}
topmarkButton.setBorderPainted(dlg.mark.getTopmark() != Top.NONE);
+ topmarkButton.setSelected(dlg.mark.getTopmark() != Top.NONE);
topmarkButton.setVisible(dlg.mark.testValid());
}
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java (revision 27055)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java (revision 27056)
@@ -19,4 +19,18 @@
public JLabel categoryLabel;
+ public JComboBox landCatBox;
+ public EnumMap landCats = new EnumMap(Cat.class);
+ private ActionListener alLandCatBox = new ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent e) {
+ for (Cat cat : landCats.keySet()) {
+ int idx = landCats.get(cat);
+ if (dlg.mark != null && (idx == landCatBox.getSelectedIndex())) {
+ dlg.mark.setCategory(cat);
+ dlg.mark.testValid();
+ dlg.mark.paintSign();
+ }
+ }
+ }
+ };
public JComboBox trafficCatBox;
public EnumMap trafficCats = new EnumMap(Cat.class);
@@ -47,4 +61,5 @@
public JRadioButton vesselButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/LightVesselButton.png")));
public JRadioButton floatButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/LightFloatButton.png")));
+ public JRadioButton landButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/LandmarkButton.png")));
public JRadioButton trafficButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/TrafficButton.png")));
public JRadioButton warningButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/WarningButton.png")));
@@ -60,14 +75,28 @@
button.setBorderPainted(false);
}
- if (trafficButton.isSelected()) {
+ if (dlg.mark.getObject() == Obj.LITVES)
+ dlg.mark.setShape(Shp.SUPER);
+ else if (dlg.mark.getObject() == Obj.LITFLT)
+ dlg.mark.setShape(Shp.FLOAT);
+ else dlg.mark.setShape(Shp.UNKNOWN);
+ if (landButton.isSelected()) {
+ categoryLabel.setVisible(true);
+ landCatBox.setVisible(true);
+ trafficCatBox.setVisible(false);
+ warningCatBox.setVisible(false);
+ } else if (trafficButton.isSelected()) {
categoryLabel.setVisible(true);
trafficCatBox.setVisible(true);
+ landCatBox.setVisible(false);
warningCatBox.setVisible(false);
} else if (warningButton.isSelected()) {
categoryLabel.setVisible(true);
warningCatBox.setVisible(true);
+ landCatBox.setVisible(false);
trafficCatBox.setVisible(false);
} else {
+ dlg.mark.setCategory(Cat.NONE);
categoryLabel.setVisible(false);
+ landCatBox.setVisible(false);
trafficCatBox.setVisible(false);
warningCatBox.setVisible(false);
@@ -81,16 +110,33 @@
dlg = dia;
this.setLayout(null);
- this.add(getObjButton(houseButton, 0, 0, 34, 32, "Lighthouse", Obj.LNDMRK), null);
+ this.add(getObjButton(houseButton, 0, 0, 34, 32, "Lighthouse", Obj.LITHSE), null);
this.add(getObjButton(majorButton, 35, 0, 34, 32, "MajorLight", Obj.LITMAJ), null);
this.add(getObjButton(minorButton, 70, 0, 34, 32, "MinorLight", Obj.LITMIN), null);
- this.add(getObjButton(vesselButton, 105, 0, 34, 32, "LightVessel", Obj.LITVES), null);
- this.add(getObjButton(floatButton, 140, 0, 34, 32, "LightFloat", Obj.LITFLT), null);
- this.add(getObjButton(trafficButton, 50, 35, 34, 32, "SSTraffic", Obj.SISTAT), null);
- this.add(getObjButton(warningButton, 90, 35, 34, 32, "SSWarning", Obj.SISTAW), null);
-
- categoryLabel = new JLabel(Messages.getString("SSCategory"), SwingConstants.CENTER);
+ this.add(getObjButton(landButton, 105, 0, 34, 32, "Landmark", Obj.LNDMRK), null);
+ this.add(getObjButton(vesselButton, 0, 35, 34, 32, "LightVessel", Obj.LITVES), null);
+ this.add(getObjButton(floatButton, 35, 35, 34, 32, "LightFloat", Obj.LITFLT), null);
+ this.add(getObjButton(trafficButton, 70, 35, 34, 32, "SSTraffic", Obj.SISTAT), null);
+ this.add(getObjButton(warningButton, 105, 35, 34, 32, "SSWarning", Obj.SISTAW), null);
+
+ categoryLabel = new JLabel(Messages.getString("Category"), SwingConstants.CENTER);
categoryLabel.setBounds(new Rectangle(10, 80, 160, 20));
this.add(categoryLabel, null);
categoryLabel.setVisible(false);
+
+ landCatBox = new JComboBox();
+ landCatBox.setBounds(new Rectangle(10, 100, 160, 20));
+ this.add(landCatBox, null);
+ landCatBox.addActionListener(alLandCatBox);
+ addLCItem("", Cat.NONE);
+ addLCItem(Messages.getString("Chimney"), Cat.LMK_CHMY);
+ addLCItem(Messages.getString("Cairn"), Cat.LMK_CARN);
+ addLCItem(Messages.getString("DishAerial"), Cat.LMK_DSHA);
+ addLCItem(Messages.getString("Flagstaff"), Cat.LMK_FLGS);
+ addLCItem(Messages.getString("FlareStack"), Cat.LMK_FLRS);
+ addLCItem(Messages.getString("Monument"), Cat.LMK_MNMT);
+ addLCItem(Messages.getString("RadioMast"), Cat.LMK_RADM);
+ addLCItem(Messages.getString("Tower"), Cat.LMK_TOWR);
+ addLCItem(Messages.getString("WaterTower"), Cat.LMK_WTRT);
+ landCatBox.setVisible(false);
trafficCatBox = new JComboBox();
@@ -136,4 +182,31 @@
public void syncPanel() {
+ if ((dlg.mark.getObject() == Obj.LNDMRK) && (dlg.mark.getCategory() != Cat.NONE)) {
+ categoryLabel.setVisible(true);
+ landCatBox.setVisible(true);
+ trafficCatBox.setVisible(false);
+ warningCatBox.setVisible(false);
+ } else if (dlg.mark.getObject() == Obj.SISTAT) {
+ categoryLabel.setVisible(true);
+ trafficCatBox.setVisible(true);
+ landCatBox.setVisible(false);
+ warningCatBox.setVisible(false);
+ } else if (dlg.mark.getObject() == Obj.SISTAW) {
+ categoryLabel.setVisible(true);
+ warningCatBox.setVisible(true);
+ landCatBox.setVisible(false);
+ trafficCatBox.setVisible(false);
+ } else {
+ categoryLabel.setVisible(false);
+ landCatBox.setVisible(false);
+ trafficCatBox.setVisible(false);
+ warningCatBox.setVisible(false);
+ }
+ landCatBox.setSelectedIndex(0);
+ for (Cat cat : landCats.keySet()) {
+ int item = landCats.get(cat);
+ if (dlg.mark.getCategory() == cat)
+ landCatBox.setSelectedIndex(item);
+ }
trafficCatBox.setSelectedIndex(0);
for (Cat cat : trafficCats.keySet()) {
@@ -155,4 +228,9 @@
}
+ private void addLCItem(String str, Cat cat) {
+ landCats.put(cat, landCatBox.getItemCount());
+ landCatBox.addItem(str);
+ }
+
private void addTCItem(String str, Cat cat) {
trafficCats.put(cat, trafficCatBox.getItemCount());
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLit.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLit.java (revision 27055)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLit.java (revision 27056)
@@ -167,5 +167,4 @@
groupBox = new JTextField();
groupBox.setBounds(new Rectangle(135, 20, 40, 20));
- groupBox.setHorizontalAlignment(SwingConstants.CENTER);
this.add(groupBox, null);
groupBox.addActionListener(alGroup);
@@ -176,5 +175,4 @@
periodBox = new JTextField();
periodBox.setBounds(new Rectangle(135, 60, 40, 20));
- periodBox.setHorizontalAlignment(SwingConstants.CENTER);
this.add(periodBox, null);
periodBox.addActionListener(alPeriod);
@@ -185,5 +183,4 @@
heightBox = new JTextField();
heightBox.setBounds(new Rectangle(135, 100, 40, 20));
- heightBox.setHorizontalAlignment(SwingConstants.CENTER);
this.add(heightBox, null);
heightBox.addActionListener(alHeight);
@@ -194,5 +191,4 @@
rangeBox = new JTextField();
rangeBox.setBounds(new Rectangle(135, 140, 40, 20));
- rangeBox.setHorizontalAlignment(SwingConstants.CENTER);
this.add(rangeBox, null);
rangeBox.addActionListener(alRange);
@@ -203,5 +199,4 @@
sequenceBox = new JTextField();
sequenceBox.setBounds(new Rectangle(183, 140, 90, 20));
- sequenceBox.setHorizontalAlignment(SwingConstants.CENTER);
this.add(sequenceBox, null);
sequenceBox.addActionListener(alSequence);
@@ -264,5 +259,4 @@
orientationBox = new JTextField();
orientationBox.setBounds(new Rectangle(208, 100, 40, 20));
- orientationBox.setHorizontalAlignment(SwingConstants.CENTER);
orientationBox.setVisible(false);
this.add(orientationBox, null);
@@ -275,5 +269,4 @@
multipleBox = new JTextField();
multipleBox.setBounds(new Rectangle(208, 100, 40, 20));
- multipleBox.setHorizontalAlignment(SwingConstants.CENTER);
multipleBox.setVisible(false);
this.add(multipleBox, null);
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java (revision 27055)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java (revision 27056)
@@ -309,4 +309,5 @@
saveButton.setEnabled(false);
moreButton.setVisible(false);
+ moreButton.setText("v v v");
moreButton.setSelected(false);
panelChan.setVisible(false);
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPort.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPort.java (revision 27055)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPort.java (revision 27056)
@@ -95,5 +95,5 @@
this.add(getShapeButton(floatButton, 0, 128, 34, 32, "Float", Shp.FLOAT, Obj.FLTLAT), null);
this.add(getShapeButton(beaconButton, 35, 0, 34, 32, "Beacon", Shp.BEACON, Obj.BCNLAT), null);
- this.add(getShapeButton(towerButton, 35, 32, 34, 32, "Tower", Shp.TOWER, Obj.BCNLAT), null);
+ this.add(getShapeButton(towerButton, 35, 32, 34, 32, "TowerB", Shp.TOWER, Obj.BCNLAT), null);
this.add(getShapeButton(perchButton, 35, 64, 34, 32, "Perch", Shp.PERCH, Obj.BCNLAT), null);
this.add(getShapeButton(stakeButton, 35, 96, 34, 32, "Stake", Shp.STAKE, Obj.BCNLAT), null);
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java (revision 27055)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java (revision 27056)
@@ -27,5 +27,4 @@
}
};
-
public ButtonGroup shapeButtons = new ButtonGroup();
public JRadioButton pillarButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PillarButton.png")));
@@ -62,6 +61,24 @@
button.setBorderPainted(false);
}
- dlg.mark.testValid();
+ topmarkButton.setVisible(dlg.mark.testValid());
dlg.panelMain.panelMore.syncPanel();
+ dlg.mark.paintSign();
+ }
+ };
+ public JToggleButton topmarkButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/SpecTopButton.png")));
+ private ActionListener alTop = new ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent e) {
+ if (topmarkButton.isSelected()) {
+ dlg.mark.setTopmark(Top.X_SHAPE);
+ dlg.mark.setTopPattern(Pat.NONE);
+ dlg.mark.setTopColour(Col.YELLOW);
+ topmarkButton.setBorderPainted(true);
+ } else {
+ dlg.mark.setTopmark(Top.NONE);
+ dlg.mark.setTopPattern(Pat.NONE);
+ dlg.mark.setTopColour(Col.UNKNOWN);
+ topmarkButton.setBorderPainted(false);
+ }
+ dlg.panelMain.panelTop.syncPanel();
dlg.mark.paintSign();
}
@@ -76,12 +93,12 @@
this.add(getShapeButton(canButton, 70, 0, 34, 32, "Can", Shp.CAN, Obj.BOYSPP), null);
this.add(getShapeButton(coneButton, 105, 0, 34, 32, "Cone", Shp.CONE, Obj.BOYSPP), null);
- this.add(getShapeButton(sphereButton, 140, 0, 34, 32, "Sphere", Shp.SPHERE, Obj.BOYSPP), null);
+ this.add(getShapeButton(sphereButton, 0, 32, 34, 32, "Sphere", Shp.SPHERE, Obj.BOYSPP), null);
this.add(getShapeButton(barrelButton, 35, 32, 34, 32, "Barrel", Shp.BARREL, Obj.BOYSPP), null);
this.add(getShapeButton(superButton, 70, 32, 34, 32, "Super", Shp.SUPER, Obj.BOYSPP), null);
this.add(getShapeButton(floatButton, 105, 32, 34, 32, "Float", Shp.FLOAT, Obj.LITFLT), null);
- this.add(getShapeButton(beaconButton, 17, 64, 34, 32, "Beacon", Shp.BEACON, Obj.BCNSPP), null);
- this.add(getShapeButton(towerButton, 52, 64, 34, 32, "Tower", Shp.TOWER, Obj.BCNSPP), null);
- this.add(getShapeButton(stakeButton, 87, 64, 34, 32, "Stake", Shp.STAKE, Obj.BCNSPP), null);
- this.add(getShapeButton(cairnButton, 122, 64, 34, 32, "Cairn", Shp.CAIRN, Obj.BCNSPP), null);
+ this.add(getShapeButton(beaconButton, 0, 64, 34, 32, "Beacon", Shp.BEACON, Obj.BCNSPP), null);
+ this.add(getShapeButton(towerButton, 35, 64, 34, 32, "TowerB", Shp.TOWER, Obj.BCNSPP), null);
+ this.add(getShapeButton(stakeButton, 70, 64, 34, 32, "Stake", Shp.STAKE, Obj.BCNSPP), null);
+ this.add(getShapeButton(cairnButton, 105, 64, 34, 32, "CairnB", Shp.CAIRN, Obj.BCNSPP), null);
categoryLabel = new JLabel(Messages.getString("Category"), SwingConstants.CENTER);
@@ -110,4 +127,9 @@
addCatItem(Messages.getString("FerryCross"), Cat.SPM_FRRY);
addCatItem(Messages.getString("Anchorage"), Cat.SPM_ANCH);
+
+ topmarkButton.setBounds(new Rectangle(140, 0, 34, 32));
+ topmarkButton.setBorder(BorderFactory.createLoweredBevelBorder());
+ topmarkButton.addActionListener(alTop);
+ this.add(topmarkButton);
}
@@ -126,5 +148,7 @@
categoryBox.setSelectedIndex(item);
}
- dlg.mark.testValid();
+ topmarkButton.setBorderPainted(dlg.mark.getTopmark() != Top.NONE);
+ topmarkButton.setSelected(dlg.mark.getTopmark() != Top.NONE);
+ topmarkButton.setVisible(dlg.mark.testValid());
}
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelStbd.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelStbd.java (revision 27055)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelStbd.java (revision 27056)
@@ -95,5 +95,5 @@
this.add(getShapeButton(floatButton, 0, 128, 34, 32, "Float", Shp.FLOAT, Obj.FLTLAT), null);
this.add(getShapeButton(beaconButton, 35, 0, 34, 32, "Beacon", Shp.BEACON, Obj.BCNLAT), null);
- this.add(getShapeButton(towerButton, 35, 32, 34, 32, "Tower", Shp.TOWER, Obj.BCNLAT), null);
+ this.add(getShapeButton(towerButton, 35, 32, 34, 32, "TowerB", Shp.TOWER, Obj.BCNLAT), null);
this.add(getShapeButton(perchButton, 35, 64, 34, 32, "Perch", Shp.PERCH, Obj.BCNLAT), null);
this.add(getShapeButton(stakeButton, 35, 96, 34, 32, "Stake", Shp.STAKE, Obj.BCNLAT), null);
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java (revision 27055)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java (revision 27056)
@@ -55,5 +55,5 @@
UNKNOWN, BCNCAR, BCNISD, BCNLAT, BCNSAW, BCNSPP, BOYCAR, BOYISD, BOYLAT, BOYSAW, BOYSPP,
FLTCAR, FLTISD, FLTLAT, FLTSAW, FLTSPP, LITMAJ, LITMIN, LITFLT, LITVES,
- LNDMRK, MORFAC, SISTAW, SISTAT
+ LITHSE, LNDMRK, MORFAC, SISTAW, SISTAT
}
@@ -80,4 +80,5 @@
ObjSTR.put(Obj.LITVES, "light_vessel");
ObjSTR.put(Obj.LNDMRK, "landmark");
+ ObjSTR.put(Obj.LITHSE, "landmark");
ObjSTR.put(Obj.MORFAC, "mooring");
ObjSTR.put(Obj.SISTAW, "signal_station_warning");
@@ -120,4 +121,5 @@
EntMAP.put(Obj.FLTSPP, Ent.FLOAT);
EntMAP.put(Obj.LITVES, Ent.FLOAT);
+ EntMAP.put(Obj.LITHSE, Ent.LIGHT);
EntMAP.put(Obj.LNDMRK, Ent.LIGHT);
EntMAP.put(Obj.MORFAC, Ent.MOORING);
@@ -127,5 +129,5 @@
public enum Grp {
- NUL, LAT, CAR, SAW, ISD, SPP, FLT, LIT, SIS
+ NUL, LAT, CAR, SAW, ISD, SPP, LIT, SIS
}
@@ -148,8 +150,9 @@
GrpMAP.put(Obj.FLTISD, Grp.ISD);
GrpMAP.put(Obj.FLTSPP, Grp.SPP);
- GrpMAP.put(Obj.LITFLT, Grp.FLT);
+ GrpMAP.put(Obj.LITFLT, Grp.LIT);
GrpMAP.put(Obj.LITMAJ, Grp.LIT);
GrpMAP.put(Obj.LITMIN, Grp.LIT);
GrpMAP.put(Obj.LITVES, Grp.LIT);
+ GrpMAP.put(Obj.LITHSE, Grp.LIT);
GrpMAP.put(Obj.LNDMRK, Grp.LIT);
GrpMAP.put(Obj.MORFAC, Grp.SPP);
@@ -166,5 +169,6 @@
SIS_PTCL, SIS_PTED, SIS_IPT, SIS_BRTH, SIS_DOCK, SIS_LOCK, SIS_FBAR, SIS_BRDG, SIS_DRDG, SIS_TRFC,
SIS_DNGR, SIS_OBST, SIS_CABL, SIS_MILY, SIS_DSTR, SIS_WTHR, SIS_STRM, SIS_ICE, SIS_TIME, SIS_TIDE,
- SIS_TSTM, SIS_TGAG, SIS_TSCL, SIS_DIVE, SIS_LGAG, LIT_DIRF, LIT_LEDG
+ SIS_TSTM, SIS_TGAG, SIS_TSCL, SIS_DIVE, SIS_LGAG, LIT_DIRF, LIT_LEDG,
+ LMK_CHMY, LMK_CARN, LMK_DSHA, LMK_FLGS, LMK_FLRS, LMK_MNMT, LMK_RADM, LMK_TOWR, LMK_WTRT
}
@@ -228,4 +232,13 @@
CatSTR.put(Cat.SIS_DIVE, "diving");
CatSTR.put(Cat.SIS_LGAG, "level");
+ CatSTR.put(Cat.LMK_CHMY, "chimney");
+ CatSTR.put(Cat.LMK_CARN, "cairn");
+ CatSTR.put(Cat.LMK_DSHA, "dish_aerial");
+ CatSTR.put(Cat.LMK_FLGS, "flagstaff");
+ CatSTR.put(Cat.LMK_FLRS, "flare_stack");
+ CatSTR.put(Cat.LMK_MNMT, "monument");
+ CatSTR.put(Cat.LMK_RADM, "radio_mast");
+ CatSTR.put(Cat.LMK_TOWR, "tower");
+ CatSTR.put(Cat.LMK_WTRT, "water_tower");
}
@@ -981,9 +994,13 @@
case LITFLT:
case LITVES:
- case LNDMRK:
+ case LITHSE:
case MORFAC:
case SISTAW:
case SISTAT:
tmp = true;
+ break;
+ case LNDMRK:
+ if (getCategory() != Cat.NONE)
+ tmp = true;
break;
}
@@ -999,4 +1016,5 @@
} else {
dlg.panelMain.moreButton.setVisible(false);
+ dlg.panelMain.moreButton.setText("v v v");
dlg.panelMain.topButton.setEnabled(false);
dlg.panelMain.fogButton.setEnabled(false);
@@ -1014,4 +1032,5 @@
setColour(Ent.BODY, Col.UNKNOWN);
setPattern(Ent.BODY, Pat.NONE);
+ setTopmark(Top.NONE);
setColour(Ent.TOPMARK, Col.UNKNOWN);
setPattern(Ent.TOPMARK, Pat.NONE);
@@ -1118,5 +1137,8 @@
setShape(Shp.BEACON);
if (EntMAP.get(getObject()) == Ent.FLOAT)
- setShape(Shp.FLOAT);
+ if (getObject() == Obj.LITVES)
+ setShape(Shp.SUPER);
+ else
+ setShape(Shp.FLOAT);
}
@@ -1152,4 +1174,8 @@
setElevation(keys.get("seamark:" + ObjSTR.get(obj) + ":elevation"));
}
+ }
+
+ if ((getObject() == Obj.LNDMRK) && (getCategory() == Cat.NONE)) {
+ setObject(Obj.LITHSE);
}
@@ -1235,5 +1261,4 @@
break;
default:
- setObject(Obj.FLTSPP);
setCategory(Cat.NONE);
}
@@ -1652,4 +1677,35 @@
switch (getObject()) {
case LNDMRK:
+ switch (getCategory()) {
+ case LMK_CHMY:
+ imgStr += "Chimney";
+ break;
+ case LMK_CARN:
+ imgStr += "Cairn";
+ break;
+ case LMK_DSHA:
+ imgStr += "DishAerial";
+ break;
+ case LMK_FLGS:
+ imgStr += "Flagstaff";
+ break;
+ case LMK_FLRS:
+ imgStr += "FlareStack";
+ break;
+ case LMK_MNMT:
+ imgStr += "Monument";
+ break;
+ case LMK_RADM:
+ imgStr += "RadioMast";
+ break;
+ case LMK_TOWR:
+ imgStr += "LandTower";
+ break;
+ case LMK_WTRT:
+ imgStr += "WaterTower";
+ break;
+ }
+ break;
+ case LITHSE:
imgStr += "Light_House";
break;