Changeset 35693 in osm for applications/editors/josm/plugins/seachart/src/render

Timestamp:

2021-02-01T10:33:15+01:00 (4 years ago)

Author:

malcolmh

Message:

catch null pointer

Location:

applications/editors/josm/plugins/seachart/src/render

Files:

• Rules.java (modified) (3 diffs)
• Signals.java (modified) (1 diff)

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

@@ -183 +183 @@
                 else
                         return null;
-                if ((item = atts.get(att)) == null)
+                if ((atts == null) || ((item = atts.get(att)) == null))
                         return null;
                 else
@@ -703 +703 @@
 
         private static void cables() {
-                if ((Renderer.zoom >= 16) && (feature.geom.length < 2)) {
+                if ((Renderer.zoom >= 16) && (feature.geom.length < 20)) {
                         if (feature.type == Obj.CBLSUB) {
                                 Renderer.lineSymbols(Areas.Cable, 0.0, null, null, 0, Symbols.Mline);
@@ -1300 +1300 @@
 
         private static void pipelines() {
-                if ((Renderer.zoom >= 16) && (feature.geom.length < 2)) {
+                if ((Renderer.zoom >= 16) && (feature.geom.length < 20)) {
                         if (feature.type == Obj.PIPSOL) {
                                 switch ((CatPIP) getAttEnum(feature.type, Att.CATPIP)) {

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

@@ -617 +617 @@
                                 }
                         } else {
-                                if ((Renderer.zoom >= 15) && (lights.get(0) != null)) {
-                                        AttMap atts = lights.get(0);
+                                AttMap atts = lights.get(0);
+                                if ((Renderer.zoom >= 15) && (atts != null)) {
                                         ArrayList<CatLIT> cats = new ArrayList<>();
                                         if (atts.containsKey(Att.CATLIT)) {