Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/NoticeButton.svg =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/images/NoticeButton.svg (revision 28147) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/NoticeButton.svg (revision 28147) @@ -0,0 +1,4124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + 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 28144) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java (revision 28147) @@ -106,4 +106,14 @@ } dlg.panelMain.panelTop.syncPanel(); + } + }; + public JToggleButton noticeButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/NoticeButton.png"))); + private ActionListener alNotice = new ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent e) { + if (noticeButton.isSelected()) { + noticeButton.setBorderPainted(true); + } else { + noticeButton.setBorderPainted(false); + } } }; @@ -157,8 +167,8 @@ categoryLabel = new JLabel(Messages.getString("Category"), SwingConstants.CENTER); - categoryLabel.setBounds(new Rectangle(5, 110, 160, 20)); + categoryLabel.setBounds(new Rectangle(5, 125, 160, 18)); add(categoryLabel); categoryBox = new JComboBox(); - categoryBox.setBounds(new Rectangle(5, 130, 160, 20)); + categoryBox.setBounds(new Rectangle(5, 142, 160, 18)); add(categoryBox); categoryBox.setVisible(true); @@ -206,4 +216,11 @@ add(topmarkButton); + noticeButton.setBounds(new Rectangle(136, 32, 34, 32)); + noticeButton.setToolTipText(Messages.getString("Notice")); + noticeButton.setBorder(BorderFactory.createLoweredBevelBorder()); + noticeButton.addActionListener(alNotice); + add(noticeButton); + noticeButton.setVisible(false); + mooringButton.setBounds(new Rectangle(136, 64, 34, 32)); mooringButton.setToolTipText(Messages.getString("Mooring")); @@ -224,4 +241,5 @@ stakeButton.setEnabled(false); cairnButton.setEnabled(false); + noticeButton.setEnabled(false); topmarkButton.setVisible(false); for (Cat cat : moorings.keySet()) { @@ -240,4 +258,5 @@ stakeButton.setEnabled(true); cairnButton.setEnabled(true); + noticeButton.setEnabled(true); topmarkButton.setBorderPainted(dlg.panelMain.mark.getTopmark() != Top.NOTOP); topmarkButton.setSelected(dlg.panelMain.mark.getTopmark() != Top.NOTOP); @@ -256,4 +275,5 @@ button.setBorderPainted(false); } + noticeButton.setBorderPainted(false); dlg.panelMain.mark.testValid(); } 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 28144) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java (revision 28147) @@ -62,5 +62,5 @@ public enum Obj { UNKOBJ, BCNCAR, BCNISD, BCNLAT, BCNSAW, BCNSPP, - BOYCAR, BOYISD, BOYLAT, BOYSAW, BOYSPP, + BOYCAR, BOYISD, BOYLAT, BOYSAW, BOYSPP, NOTMRK, FLTCAR, FLTISD, FLTLAT, FLTSAW, FLTSPP, LITMAJ, LITMIN, LITFLT, LITVES, LITHSE, LNDMRK, @@ -90,4 +90,5 @@ ObjSTR.put(Obj.LITFLT, "light_float"); ObjSTR.put(Obj.LITVES, "light_vessel"); + ObjSTR.put(Obj.NOTMRK, "notice"); ObjSTR.put(Obj.LNDMRK, "landmark"); ObjSTR.put(Obj.LITHSE, "landmark"); @@ -126,5 +127,5 @@ public enum Ent { - BODY, BUOY, BEACON, LFLOAT, TOPMARK, LIGHT, MOORING, STATION, PLATFORM + BODY, BUOY, BEACON, LFLOAT, TOPMARK, LIGHT, MOORING, STATION, PLATFORM, NOTICE } @@ -162,8 +163,9 @@ EntMAP.put(Obj.RDOSTA, Ent.STATION); EntMAP.put(Obj.RADSTA, Ent.STATION); + EntMAP.put(Obj.NOTMRK, Ent.NOTICE); } public enum Grp { - NUL, LAT, CAR, SAW, ISD, SPP, LGT, STN, PLF + NUL, LAT, CAR, SAW, ISD, SPP, LGT, STN, PLF, NTC } @@ -202,4 +204,5 @@ GrpMAP.put(Obj.RDOSTA, Grp.STN); GrpMAP.put(Obj.RADSTA, Grp.STN); + GrpMAP.put(Obj.NOTMRK, Grp.NTC); } @@ -218,5 +221,7 @@ RSC_LFB, RSC_RKT, RSC_RSW, RSC_RIT, RSC_MLB, RSC_RAD, RSC_FAE, RSC_SPL, RSC_AIR, RSC_TUG, ROS_BNO, ROS_BND, ROS_BNR, ROS_BNC, ROS_RDF, ROS_QTG, ROS_AER, ROS_DCA, ROS_LRN, ROS_DGPS, ROS_TRN, ROS_OMA, - ROS_SDS, ROS_CKA, ROS_PUB, ROS_COM, ROS_FAX, ROS_TIM, RAS_SRV, RAS_CST, PIL_VESS, PIL_HELI, PIL_SHORE + ROS_SDS, ROS_CKA, ROS_PUB, ROS_COM, ROS_FAX, ROS_TIM, RAS_SRV, RAS_CST, PIL_VESS, PIL_HELI, PIL_SHORE, + NTC_A1, NTC_A1a, NTC_A2, NTC_A3, NTC_A4, NTC_A4_1, NTC_A5, NTC_A5_1, NTC_A6, NTC_A7, NTC_A8, NTC_A9, + NTC_A10a, NTC_A10b, NTC_A12, NTC_A13, NTC_A14, NTC_A15, NTC_A16, NTC_A17, NTC_A18, NTC_A19, NTC_A20 } @@ -347,4 +352,27 @@ CatSTR.put(Cat.ROS_FAX, "facsimile"); CatSTR.put(Cat.ROS_TIM, "time_signal"); + CatSTR.put(Cat.NTC_A1, "no_entry"); + CatSTR.put(Cat.NTC_A1a, "closed_area"); + CatSTR.put(Cat.NTC_A2, "no_overtaking"); + CatSTR.put(Cat.NTC_A3, "no_convoy_overtaking"); + CatSTR.put(Cat.NTC_A4, "no_passing"); + CatSTR.put(Cat.NTC_A4, "no_convoy_passing"); + CatSTR.put(Cat.NTC_A5, "no_berthing"); + CatSTR.put(Cat.NTC_A5_1, "no_berthing_lateral_limit"); + CatSTR.put(Cat.NTC_A6, "no_anchoring"); + CatSTR.put(Cat.NTC_A7, "no_mooring"); + CatSTR.put(Cat.NTC_A8, "no_turning"); + CatSTR.put(Cat.NTC_A9, "no_wash"); + CatSTR.put(Cat.NTC_A10a, "no_passage_left"); + CatSTR.put(Cat.NTC_A10b, "no_passage_right"); + CatSTR.put(Cat.NTC_A12, "no_motor_craft"); + CatSTR.put(Cat.NTC_A13, "no_sport_craft"); + CatSTR.put(Cat.NTC_A14, "no_waterskiing"); + CatSTR.put(Cat.NTC_A15, "no_sailing_craft"); + CatSTR.put(Cat.NTC_A16, "no_unpowered_craft"); + CatSTR.put(Cat.NTC_A17, "no_sailboards"); + CatSTR.put(Cat.NTC_A18, "no_high_speeds"); + CatSTR.put(Cat.NTC_A19, "no_launching_beaching"); + CatSTR.put(Cat.NTC_A20, "no_waterbikes"); } @@ -1078,5 +1106,6 @@ public enum Fnc { UNKFNC, HMO, CSTM, HLTH, HOSP, POFF, HOTEL, RWSTA, POLICE, WPOL, PILO, PILL, BANK, DCHQ, TRNS, FACT, PWRS, ADMIN, EDUC, CHCH, CHPL, - TMPL, PGDA, SHSH, BTMP, MOSQ, MRBT, LOOK, COMS, TV, RADO, RADR, LSUP, MWAV, COOL, OBSV, TIMB, CLK, CTRL, AMOR, STAD, BUSS + TMPL, PGDA, SHSH, BTMP, MOSQ, MRBT, LOOK, COMS, TV, RADO, RADR, LSUP, MWAV, COOL, OBSV, TIMB, CLK, CTRL, AMOR, STAD, BUSS, + PRHB, RGLN, RSTN, RCMD, INFO } @@ -1125,5 +1154,10 @@ FncSTR.put(Fnc.STAD, "stadium"); FncSTR.put(Fnc.BUSS, "bus_station"); - }; + FncSTR.put(Fnc.PRHB, "prohibition"); + FncSTR.put(Fnc.RGLN, "regulation"); + FncSTR.put(Fnc.RSTN, "restriction"); + FncSTR.put(Fnc.RCMD, "recommendation"); + FncSTR.put(Fnc.INFO, "information"); + } private Fnc function = Fnc.UNKFNC;