Changeset 29489 in osm for applications/editors/josm
- Timestamp:
- 2013-04-09T11:51:53+02:00 (12 years ago)
- Location:
- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam
- Files:
-
- 3 edited
-
msg/messages.properties (modified) (1 diff)
-
panels/PanelLights.java (modified) (1 diff)
-
seamarks/SeaMark.java (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties
r29423 r29489 350 350 Surveillance=Surveillance 351 351 CoastRadar=Coast radar 352 AIS=Physical AIS 353 S-AIS=Synthetic AIS 354 V-AIS=Virtual AIS 355 V-AISNC=V-AIS North Cardinal 356 V-AISSC=V-AIS South Cardinal 357 V-AISEC=V-AIS East Cardinal 358 V-AISWC=V-AIS West Cardinal 359 V-AISPL=V-AIS Port Lateral 360 V-AISSL=V-AIS Starboard Lateral 361 V-AISID=V-AIS isolated Danger 362 V-AISSW=V-AIS Safe Water 363 V-AISSP=V-AIS Special Purpose 364 V-AISWK=V-AIS Emergency Wreck 352 365 353 366 NotDecimal=Not a valid decimal string -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java
r28144 r29489 396 396 radioCatBox.addActionListener(alRadioCatBox); 397 397 addROItem("", Cat.NOCAT); 398 addROItem(Messages.getString("CircularBeacon"), Cat.ROS_ BNO);399 addROItem(Messages.getString("DirectionalBeacon"), Cat.ROS_ BND);400 addROItem(Messages.getString("RotatingBeacon"), Cat.ROS_ BNR);401 addROItem(Messages.getString("ConsolBeacon"), Cat.ROS_ BNC);398 addROItem(Messages.getString("CircularBeacon"), Cat.ROS_OMNI); 399 addROItem(Messages.getString("DirectionalBeacon"), Cat.ROS_DIRL); 400 addROItem(Messages.getString("RotatingBeacon"), Cat.ROS_ROTP); 401 addROItem(Messages.getString("ConsolBeacon"), Cat.ROS_CNSL); 402 402 addROItem(Messages.getString("DirectionFinding"), Cat.ROS_RDF); 403 403 addROItem(Messages.getString("QTGService"), Cat.ROS_QTG); 404 addROItem(Messages.getString("AeronaticalBeacon"), Cat.ROS_AER );405 addROItem(Messages.getString("Decca"), Cat.ROS_D CA);406 addROItem(Messages.getString("LoranC"), Cat.ROS_L RN);404 addROItem(Messages.getString("AeronaticalBeacon"), Cat.ROS_AERO); 405 addROItem(Messages.getString("Decca"), Cat.ROS_DECA); 406 addROItem(Messages.getString("LoranC"), Cat.ROS_LORN); 407 407 addROItem(Messages.getString("DGPS"), Cat.ROS_DGPS); 408 addROItem(Messages.getString("Toran"), Cat.ROS_TRN); 409 addROItem(Messages.getString("Omega"), Cat.ROS_OMA); 410 addROItem(Messages.getString("Syledis"), Cat.ROS_SDS); 411 addROItem(Messages.getString("Chiaka"), Cat.ROS_CKA); 412 addROItem(Messages.getString("PublicCommunication"), Cat.ROS_PUB); 413 addROItem(Messages.getString("CommercialBroadcast"), Cat.ROS_COM); 414 addROItem(Messages.getString("Facsimile"), Cat.ROS_FAX); 415 addROItem(Messages.getString("TimeSignal"), Cat.ROS_TIM); 408 addROItem(Messages.getString("Toran"), Cat.ROS_TORN); 409 addROItem(Messages.getString("Omega"), Cat.ROS_OMGA); 410 addROItem(Messages.getString("Syledis"), Cat.ROS_SYLD); 411 addROItem(Messages.getString("Chiaka"), Cat.ROS_CHKA); 412 addROItem(Messages.getString("PublicCommunication"), Cat.ROS_PCOM); 413 addROItem(Messages.getString("CommercialBroadcast"), Cat.ROS_COMB); 414 addROItem(Messages.getString("Facsimile"), Cat.ROS_FACS); 415 addROItem(Messages.getString("TimeSignal"), Cat.ROS_TIME); 416 addROItem(Messages.getString("AIS"), Cat.ROS_PAIS); 417 addROItem(Messages.getString("S-AIS"), Cat.ROS_SAIS); 418 addROItem(Messages.getString("V-AIS"), Cat.ROS_VAIS); 419 addROItem(Messages.getString("V-AISNC"), Cat.ROS_VANC); 420 addROItem(Messages.getString("V-AISSC"), Cat.ROS_VASC); 421 addROItem(Messages.getString("V-AISEC"), Cat.ROS_VAEC); 422 addROItem(Messages.getString("V-AISWC"), Cat.ROS_VAWC); 423 addROItem(Messages.getString("V-AISPL"), Cat.ROS_VAPL); 424 addROItem(Messages.getString("V-AISSL"), Cat.ROS_VASL); 425 addROItem(Messages.getString("V-AISID"), Cat.ROS_VAID); 426 addROItem(Messages.getString("V-AISSW"), Cat.ROS_VASW); 427 addROItem(Messages.getString("V-AISSP"), Cat.ROS_VASP); 428 addROItem(Messages.getString("V-AISWK"), Cat.ROS_VAWK); 416 429 radioCatBox.setVisible(false); 417 430 -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java
r29423 r29489 218 218 OFP_OIL, OFP_PRD, OFP_OBS, OFP_ALP, OFP_SALM, OFP_MOR, OFP_ISL, OFP_FPSO, OFP_ACC, OFP_NCCB, 219 219 RSC_LFB, RSC_RKT, RSC_RSW, RSC_RIT, RSC_MLB, RSC_RAD, RSC_FAE, RSC_SPL, RSC_AIR, RSC_TUG, 220 ROS_BNO, ROS_BND, ROS_BNR, ROS_BNC, ROS_RDF, ROS_QTG, ROS_AER, ROS_DCA, ROS_LRN, ROS_DGPS, ROS_TRN, ROS_OMA, 221 ROS_SDS, ROS_CKA, ROS_PUB, ROS_COM, ROS_FAX, ROS_TIM, RAS_SRV, RAS_CST, PIL_VESS, PIL_HELI, PIL_SHORE, 220 RAS_SRV, RAS_CST, PIL_VESS, PIL_HELI, PIL_SHORE, 222 221 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, 223 222 NTC_A10a, NTC_A10b, NTC_A12, NTC_A13, NTC_A14, NTC_A15, NTC_A16, NTC_A17, NTC_A18, NTC_A19, NTC_A20, 224 223 NTC_B1a, NTC_B1b, NTC_B2a, NTC_B2b, NTC_B3a, NTC_B3b, NTC_B4a, NTC_B4b, NTC_B5, NTC_B6, NTC_B7, NTC_B8, NTC_B9a, NTC_B9b, NTC_B11, 225 NTC_C1, NTC_C2, NTC_C3, NTC_C4, NTC_C5a, NTC_C5b, NTC_D1a, NTC_D1b, NTC_D2a, NTC_D2b, NTC_D3a, NTC_D3b 224 NTC_C1, NTC_C2, NTC_C3, NTC_C4, NTC_C5a, NTC_C5b, NTC_D1a, NTC_D1b, NTC_D2a, NTC_D2b, NTC_D3a, NTC_D3b, 225 NOROS, ROS_UNKN, ROS_OMNI, ROS_DIRL, ROS_ROTP, ROS_CNSL, ROS_RDF, ROS_QTG, ROS_AERO, ROS_DECA, ROS_LORN, ROS_DGPS, ROS_TORN, ROS_OMGA, ROS_SYLD, ROS_CHKA, 226 ROS_PCOM, ROS_COMB, ROS_FACS, ROS_TIME, ROS_PAIS, ROS_SAIS, ROS_VAIS, ROS_VANC, ROS_VASC, ROS_VAEC, ROS_VAWC, ROS_VAPL, ROS_VASL, ROS_VAID, ROS_VASW, ROS_VASP, ROS_VAWK 226 227 } 227 228 … … 334 335 CatSTR.put(Cat.RAS_SRV, "surveillance"); 335 336 CatSTR.put(Cat.RAS_CST, "coast"); 336 CatSTR.put(Cat.ROS_ BNO, "beacon_circular");337 CatSTR.put(Cat.ROS_ BND, "beacon_directional");338 CatSTR.put(Cat.ROS_ BNR, "beacon_rotating");339 CatSTR.put(Cat.ROS_ BNC, "beacon_consol");340 CatSTR.put(Cat.ROS_RDF, " direction_finding");341 CatSTR.put(Cat.ROS_QTG, "qtg _service");342 CatSTR.put(Cat.ROS_AER , "beacon_aero");343 CatSTR.put(Cat.ROS_D CA, "decca");344 CatSTR.put(Cat.ROS_L RN, "loran");337 CatSTR.put(Cat.ROS_OMNI, "omnidirectional"); 338 CatSTR.put(Cat.ROS_DIRL, "directional"); 339 CatSTR.put(Cat.ROS_ROTP, "rotating_pattern"); 340 CatSTR.put(Cat.ROS_CNSL, "consol"); 341 CatSTR.put(Cat.ROS_RDF, "rdf"); 342 CatSTR.put(Cat.ROS_QTG, "qtg"); 343 CatSTR.put(Cat.ROS_AERO, "aeronautical"); 344 CatSTR.put(Cat.ROS_DECA, "decca"); 345 CatSTR.put(Cat.ROS_LORN, "loran"); 345 346 CatSTR.put(Cat.ROS_DGPS, "dgps"); 346 CatSTR.put(Cat.ROS_TRN, "toran"); 347 CatSTR.put(Cat.ROS_OMA, "omega"); 348 CatSTR.put(Cat.ROS_SDS, "syledis"); 349 CatSTR.put(Cat.ROS_CKA, "chiaka"); 350 CatSTR.put(Cat.ROS_PUB, "public_communication"); 351 CatSTR.put(Cat.ROS_COM, "comercial_broadcast"); 352 CatSTR.put(Cat.ROS_FAX, "facsimile"); 353 CatSTR.put(Cat.ROS_TIM, "time_signal"); 347 CatSTR.put(Cat.ROS_TORN, "toran"); 348 CatSTR.put(Cat.ROS_OMGA, "omega"); 349 CatSTR.put(Cat.ROS_SYLD, "syledis"); 350 CatSTR.put(Cat.ROS_CHKA, "chaika"); 351 CatSTR.put(Cat.ROS_PCOM, "public_communication"); 352 CatSTR.put(Cat.ROS_COMB, "commercial_broadcast"); 353 CatSTR.put(Cat.ROS_FACS, "facsimile"); 354 CatSTR.put(Cat.ROS_TIME, "time_signal"); 355 CatSTR.put(Cat.ROS_PAIS, "ais"); 356 CatSTR.put(Cat.ROS_SAIS, "s-ais"); 357 CatSTR.put(Cat.ROS_VAIS, "v-ais"); 358 CatSTR.put(Cat.ROS_VANC, "v-ais_north_cardinal"); 359 CatSTR.put(Cat.ROS_VASC, "v-ais_south_cardinal"); 360 CatSTR.put(Cat.ROS_VAEC, "v-ais_east_cardinal"); 361 CatSTR.put(Cat.ROS_VAWC, "v-ais_west_cardinal"); 362 CatSTR.put(Cat.ROS_VAPL, "v-ais_port_lateral"); 363 CatSTR.put(Cat.ROS_VASL, "v-ais_starboard_lateral"); 364 CatSTR.put(Cat.ROS_VAID, "v-ais_isolated_danger"); 365 CatSTR.put(Cat.ROS_VASW, "v-ais_safe_water"); 366 CatSTR.put(Cat.ROS_VASP, "v-ais_special_purpose"); 367 CatSTR.put(Cat.ROS_VAWK, "v-ais_wreck"); 354 368 CatSTR.put(Cat.NTC_A1, "no_entry"); 355 369 CatSTR.put(Cat.NTC_A1a, "closed_area"); … … 861 875 public void setTopmark(Top top) { 862 876 topShape = top; 877 repaint(); 878 } 879 880 private Cat RoType = Cat.NOROS; 881 882 public Cat getRadio() { 883 return RoType; 884 } 885 886 public void setRadio(Cat type) { 887 RoType = type; 863 888 repaint(); 864 889 } … … 1359 1384 setFogSound(Fog.NOFOG); 1360 1385 setRadar(Rtb.NORTB); 1386 setRadio(Cat.NOROS); 1361 1387 setStatus(Sts.UNKSTS); 1362 1388 setConstr(Cns.UNKCNS); … … 1441 1467 if (keys.containsKey("seamark:" + ObjSTR.get(obj) + ":category")) { 1442 1468 str = keys.get("seamark:" + ObjSTR.get(obj) + ":category"); 1443 setCategory(Cat.NOCAT); 1444 for (Cat cat : CatSTR.keySet()) { 1445 if (CatSTR.get(cat).equals(str)) { 1446 setCategory(cat); 1469 if (obj == getObject()) { 1470 setCategory(Cat.NOCAT); 1471 for (Cat cat : CatSTR.keySet()) { 1472 if (CatSTR.get(cat).equals(str)) { 1473 setCategory(cat); 1474 } 1447 1475 } 1448 1476 } … … 1794 1822 if (keys.containsKey("seamark:fog_signal:range")) { 1795 1823 setFogRange(keys.get("seamark:fog_signal:range")); 1824 } 1825 1826 if (keys.containsKey("seamark:radio_station:category")) { 1827 str = keys.get("seamark:radio_station:category"); 1828 setRadio(Cat.NOROS); 1829 for (Cat rdo : CatSTR.keySet()) { 1830 if (CatSTR.get(rdo).equals(str)) { 1831 setRadio(rdo); 1832 } 1833 } 1796 1834 } 1797 1835 … … 2693 2731 } 2694 2732 2733 if (RoType != Cat.NOROS) { 2734 Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:radio_station:category", CatSTR.get(getRadio()))); 2735 } 2736 2695 2737 if (RaType != Rtb.NORTB) { 2696 2738 if (getRadar() == Rtb.REFLECTOR) {
Note:
See TracChangeset
for help on using the changeset viewer.
