Changeset 35388 in osm for applications/editors/josm/plugins/seachart

Timestamp:

2020-03-21T09:42:31+01:00 (5 years ago)

Author:

malcolmh

Message:

add new jchart utility

Location:

applications/editors/josm/plugins/seachart

Files:

• jchart (added)
• jchart/build.xml (added)
• jchart/src (added)
• jchart/src/jchart (added)
• jchart/src/jchart/Jchart.java (added)
• src/render/Rules.java (modified) (6 diffs)
• src/render/Signals.java (modified) (1 diff)
• src/s57/S57osm.java (modified) (7 diffs)
• src/s57/S57val.java (modified) (2 diffs)

applications/editors/josm/plugins/seachart/src/render/Rules.java

@@ -356 +356 @@
                         return false;
                 } catch (Exception e) {
+                    e.printStackTrace();
                         return true;
                 }
@@ -979 +980 @@
                                         fncSym = Landmarks.RadioTV;
                                 Renderer.symbol(catSym);
-                                if (catSym != Landmarks.Spire)
-                                        Renderer.symbol(fncSym);
+                                Renderer.symbol(fncSym);
                                 break;
                         case SILTNK:
@@ -1049 +1049 @@
                         ArrayList<CatSCF> scfs = (ArrayList<CatSCF>) getAttList(Obj.SMCFAC, Att.CATSCF);
                         for (CatSCF scf : scfs) {
-                                symbols.add(Facilities.Cats.get(scf));
+                            Symbol sym = Facilities.Cats.get(scf);
+                            if (sym != null) symbols.add(sym);
                         }
                         Renderer.cluster(symbols);
@@ -1059 +1060 @@
                         switch ((CatMOR) getAttEnum(feature.type, Att.CATMOR)) {
                         case MOR_DLPN:
-                                Renderer.symbol(Harbours.Dolphin);
+                            if (feature.geom.prim == Pflag.AREA) {
+                                Renderer.lineVector(new LineStyle(Color.black, 4, Symbols.Yland));
+                            } else {
+                                Renderer.symbol(Harbours.Dolphin);
+                            }
                     Signals.addSignals();
                                 break;
@@ -1079 +1084 @@
                                 Renderer.symbol(Topmarks.TopMooring, Topmarks.BuoyDeltas.get(shape));
                             Signals.addSignals();
+                            addName(15, new Font("Arial", Font.BOLD, 40), new Delta(Handle.BL, AffineTransform.getTranslateInstance(60, -50)));
                             }
                                 break;
@@ -1542 +1548 @@
             }
         }
+        addName(15, new Font("Arial", Font.BOLD, 40), new Delta(Handle.BL, AffineTransform.getTranslateInstance(50, 0)));
         if (Renderer.zoom >= 15) {
                 Renderer.labelText("V-AIS", new Font("Arial", Font.PLAIN, 40), Symbols.Msymb, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, 70)));

applications/editors/josm/plugins/seachart/src/render/Signals.java

@@ -469 +469 @@
                     str += "." + df.format(atts.get(Att.SIGPER).val) + "s";
                 }
-                if ((s1 <= 360) && (s2 <= 360) && (s1 != s2))
+                if ((s1 < 360) && (s2 < 360) && (s1 != s2))
                     Renderer.lightSector(LightColours.get(col1), LightColours.get(col2), radius, s1, s2, dir, (Renderer.zoom >= 15) ? str : "");
             }

applications/editors/josm/plugins/seachart/src/s57/S57osm.java

@@ -112 +112 @@
                     for (String token : ln.split("[ ]+")) {
                         if (token.matches("^minlat=.+")) {
-                            map.bounds.minlat = Math.toRadians(Double.parseDouble(token.split("[\"\']")[1]));
+                            map.bounds.minlat = Math.toRadians(Double.parseDouble(token.split("[\"]")[1]));
                             map.nodes.get(2L).lat = map.bounds.minlat;
                             map.nodes.get(3L).lat = map.bounds.minlat;
                         } else if (token.matches("^minlon=.+")) {
-                            map.bounds.minlon = Math.toRadians(Double.parseDouble(token.split("[\"\']")[1]));
+                            map.bounds.minlon = Math.toRadians(Double.parseDouble(token.split("[\"]")[1]));
                             map.nodes.get(1L).lon = map.bounds.minlon;
                             map.nodes.get(2L).lon = map.bounds.minlon;
                         } else if (token.matches("^maxlat=.+")) {
-                            map.bounds.maxlat = Math.toRadians(Double.parseDouble(token.split("[\"\']")[1]));
+                            map.bounds.maxlat = Math.toRadians(Double.parseDouble(token.split("[\"]")[1]));
                             map.nodes.get(1L).lat = map.bounds.maxlat;
                             map.nodes.get(4L).lat = map.bounds.maxlat;
                         } else if (token.matches("^maxlon=.+")) {
-                            map.bounds.maxlon = Math.toRadians(Double.parseDouble(token.split("[\"\']")[1]));
+                            map.bounds.maxlon = Math.toRadians(Double.parseDouble(token.split("[\"]")[1]));
                             map.nodes.get(3L).lon = map.bounds.maxlon;
                             map.nodes.get(4L).lon = map.bounds.maxlon;
@@ -133 +133 @@
                         k = v = "";
                         String[] token = ln.split("k=");
-                        k = token[1].split("[\"\']")[1];
+                        k = token[1].split("[\"]")[1];
                         token = token[1].split("v=");
-                        v = token[1].split("[\"\']")[1];
+                        v = token[1].split("[\"]")[1];
                         if (!k.isEmpty() && !v.isEmpty()) {
                             map.addTag(k, v);
@@ -148 +148 @@
                         for (String token : ln.split("[ ]+")) {
                             if (token.matches("^id=.+")) {
-                                id = Long.parseLong(token.split("[\"\']")[1]);
+                                id = Long.parseLong(token.split("[\"]")[1]);
                             } else if (token.matches("^lat=.+")) {
-                                lat = Double.parseDouble(token.split("[\"\']")[1]);
+                                lat = Double.parseDouble(token.split("[\"]")[1]);
                             } else if (token.matches("^lon=.+")) {
-                                lon = Double.parseDouble(token.split("[\"\']")[1]);
+                                lon = Double.parseDouble(token.split("[\"]")[1]);
                             }
                         }
@@ -166 +166 @@
                             for (String token : ln.split("[ ]+")) {
                                 if (token.matches("^ref=.+")) {
-                                    ref = Long.parseLong(token.split("[\"\']")[1]);
+                                    ref = Long.parseLong(token.split("[\"]")[1]);
                                 }
                             }
@@ -182 +182 @@
                         for (String token : ln.split("[ ]+")) {
                             if (token.matches("^id=.+")) {
-                                id = Long.parseLong(token.split("[\"\']")[1]);
+                                id = Long.parseLong(token.split("[\"]")[1]);
                             }
                         }
@@ -202 +202 @@
                             for (String token : ln.split("[ ]+")) {
                                 if (token.matches("^ref=.+")) {
-                                    ref = Long.parseLong(token.split("[\"\']")[1]);
+                                    ref = Long.parseLong(token.split("[\"]")[1]);
                                 } else if (token.matches("^type=.+")) {
-                                    type = token.split("[\"\']")[1];
+                                    type = token.split("[\"]")[1];
                                 } else if (token.matches("^role=.+")) {
-                                    String[] str = token.split("[\"\']");
+                                    String[] str = token.split("[\"]");
                                     if (str.length > 1) {
-                                        role = token.split("[\"\']")[1];
+                                        role = token.split("[\"]")[1];
                                     }
                                 }
@@ -222 +222 @@
                         for (String token : ln.split("[ ]+")) {
                             if (token.matches("^id=.+")) {
-                                id = Long.parseLong(token.split("[\"\']")[1]);
+                                id = Long.parseLong(token.split("[\"]")[1]);
                             }
                         }

applications/editors/josm/plugins/seachart/src/s57/S57val.java

@@ -661 +661 @@
         SPM_NOTC, SPM_TSS, SPM_NANC, SPM_NBRT, SPM_NOTK, SPM_NTWT, SPM_RWAK, SPM_SPDL, SPM_STOP, SPM_WRNG, SPM_SSSN, SPM_RVCL, SPM_MVDT, SPM_RHCL, SPM_SCNT, SPM_BRTH, SPM_OHPC, SPM_CHEG, SPM_TELE, SPM_FCRS,
         SPM_MTRL, SPM_PLIN, SPM_ANCH, SPM_CLRG, SPM_CTRL, SPM_DIVG, SPM_RBCN, SPM_FGND, SPM_YCHT, SPM_HPRT, SPM_GPS, SPM_SLDG, SPM_NENT, SPM_WRKP, SPM_UKPP, SPM_WELH, SPM_CHSP, SPM_MFRM, SPM_AREF,
-        SPM_ICE, SPM_NATR, SPM_FAD, SPM_WREK, SPM_CUST, SPM_CSWY, SPM_WAVR, }
+        SPM_ICE, SPM_NATR, SPM_FAD, SPM_WREK, SPM_CUST, SPM_CSWY, SPM_WAVR, SPM_NJET }
 
     private static final EnumMap<CatSPM, S57enum> Catspm = new EnumMap<>(CatSPM.class); static {
@@ -686 +686 @@
         Catspm.put(CatSPM.SPM_AREF, new S57enum(56, "artificial_reef")); Catspm.put(CatSPM.SPM_ICE, new S57enum(57, "ice")); Catspm.put(CatSPM.SPM_NATR, new S57enum(58, "nature_reserve"));
         Catspm.put(CatSPM.SPM_FAD, new S57enum(59, "fish_aggregator")); Catspm.put(CatSPM.SPM_WREK, new S57enum(60, "wreck")); Catspm.put(CatSPM.SPM_CUST, new S57enum(61, "customs"));
-        Catspm.put(CatSPM.SPM_CSWY, new S57enum(62, "causeway")); Catspm.put(CatSPM.SPM_WAVR, new S57enum(63, "wave_recorder"));
+        Catspm.put(CatSPM.SPM_CSWY, new S57enum(62, "causeway")); Catspm.put(CatSPM.SPM_WAVR, new S57enum(63, "wave_recorder")); Catspm.put(CatSPM.SPM_NJET, new S57enum(64, "no_jetski"));
     }