Changeset 11608 in josm for trunk/src/org/openstreetmap/josm/gui/layer/gpx

Timestamp:

2017-02-25T03:14:20+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #14402 - add blacklist for leisure area values to avoid false positives - improve globally the detection of keys/tags

File:

• trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java

@@ -17 +17 @@
 import java.util.Comparator;
 import java.util.Map;
+import java.util.Optional;
 
 import javax.swing.AbstractAction;
@@ -111 +112 @@
         for (GpxTrack trk : layer.data.tracks) {
             Map<String, Object> attr = trk.getAttributes();
-            String name = (String) (attr.containsKey(GpxConstants.GPX_NAME) ? attr.get(GpxConstants.GPX_NAME) : "");
-            String desc = (String) (attr.containsKey(GpxConstants.GPX_DESC) ? attr.get(GpxConstants.GPX_DESC) : "");
+            String name = (String) Optional.ofNullable(attr.get(GpxConstants.GPX_NAME)).orElse("");
+            String desc = (String) Optional.ofNullable(attr.get(GpxConstants.GPX_DESC)).orElse("");
             String time = GpxLayer.getTimespanForTrack(trk);
             TrackLength length = new TrackLength(trk.length());
-            String url = (String) (attr.containsKey("url") ? attr.get("url") : "");
+            String url = (String) Optional.ofNullable(attr.get("url")).orElse("");
             tracks[i] = new Object[]{name, desc, time, length, url};
             i++;