Changeset 15121 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2019-05-27T12:37:31+02:00 (6 years ago)

Author:

Don-vip

Message:

sonarqube, javadoc

File:

• trunk/src/org/openstreetmap/josm/actions/relation/ExportRelationToGpxAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/relation/ExportRelationToGpxAction.java

@@ -152 +152 @@
             final HashMap<String, Integer> names = new HashMap<>();
             for (int i = 0; i < flat.size(); i++) {
-                if (!wct.get(i).isOnewayLoopBackwardPart) {
-                    if (!wct.get(i).direction.isRoundabout()) {
-                        if (!wct.get(i).linkPrev && !trkseg.isEmpty()) {
-                            gpxData.addTrack(new ImmutableGpxTrack(trk, trkAttr));
-                            trkAttr.clear();
-                            trk.clear();
-                            trkseg.clear();
-                            trk.add(trkseg);
-                        }
-                        if (trkAttr.isEmpty()) {
-                            flat.get(i).getWay().referrers(Relation.class)
-                                    .filter(relsFound::contains)
-                                    .findFirst()
-                                    .ifPresent(r -> {
-                                        trkAttr.put("name", r.getName() != null ? r.getName() : r.getId());
-                                        trkAttr.put("desc", tr("based on osm route relation data, timestamps are synthetic"));
-                                    });
-                            GpxData.ensureUniqueName(trkAttr, names);
-                        }
-                        List<Node> ln = flat.get(i).getWay().getNodes();
-                        if (wct.get(i).direction == WayConnectionType.Direction.BACKWARD)
-                            Collections.reverse(ln);
-                        for (Node n: ln) {
-                            trkseg.add(OsmDataLayer.nodeToWayPoint(n, TimeUnit.SECONDS.toMillis(time)));
-                            time += 1;
-                        }
+                WayConnectionType wayConnectionType = wct.get(i);
+                if (!wayConnectionType.isOnewayLoopBackwardPart && !wayConnectionType.direction.isRoundabout()) {
+                    if (!wayConnectionType.linkPrev && !trkseg.isEmpty()) {
+                        gpxData.addTrack(new ImmutableGpxTrack(trk, trkAttr));
+                        trkAttr.clear();
+                        trk.clear();
+                        trkseg.clear();
+                        trk.add(trkseg);
+                    }
+                    if (trkAttr.isEmpty()) {
+                        flat.get(i).getWay().referrers(Relation.class)
+                                .filter(relsFound::contains)
+                                .findFirst()
+                                .ifPresent(r -> {
+                                    trkAttr.put("name", r.getName() != null ? r.getName() : r.getId());
+                                    trkAttr.put("desc", tr("based on osm route relation data, timestamps are synthetic"));
+                                });
+                        GpxData.ensureUniqueName(trkAttr, names);
+                    }
+                    List<Node> ln = flat.get(i).getWay().getNodes();
+                    if (wayConnectionType.direction == WayConnectionType.Direction.BACKWARD)
+                        Collections.reverse(ln);
+                    for (Node n: ln) {
+                        trkseg.add(OsmDataLayer.nodeToWayPoint(n, TimeUnit.SECONDS.toMillis(time)));
+                        time += 1;
                     }
                 }