Ticket #18012: create-trackseg-names-from-gpxLayerName-if-there-is-no-name-attribute-attached.patch

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

@@ -165 +165 @@
                                 .filter(relsFound::contains)
                                 .findFirst()
                                 .ifPresent(r -> {
-                                    trkAttr.put("name", r.getName() != null ? r.getName() : r.getId());
+                                    trkAttr.put("name", r.getName() != null ? r.getName() : Long.toString(r.getId()));
                                     trkAttr.put("desc", tr("based on osm route relation data, timestamps are synthetic"));
                                 });
-                        GpxData.ensureUniqueName(trkAttr, names);
+                        GpxData.ensureUniqueName(trkAttr, names, (String) trkAttr.get("name"));
                     }
                     List<Node> ln = flat.get(i).getWay().getNodes();
                     if (wayConnectionType.direction == WayConnectionType.Direction.BACKWARD)

src/org/openstreetmap/josm/data/gpx/GpxData.java

@@ -441 +441 @@
      *
      * @since 13210
      */
-    public static String ensureUniqueName(Map<String, Object> attrs, Map<String, Integer> counts) {
-        String name = attrs.getOrDefault("name", "GPX split result").toString();
+    public static String ensureUniqueName(Map<String, Object> attrs, Map<String, Integer> counts, String srcLayerName) {
+        String name = attrs.getOrDefault("name", srcLayerName).toString().replaceFirst(" #\\d+$", "");
         Integer count = counts.getOrDefault(name, 0) + 1;
         counts.put(name, count);
 
-        attrs.put("name", MessageFormat.format("{0}{1}", name, (count > 1) ? " #"+count : ""));
+        attrs.put("name", MessageFormat.format("{0}{1}", name, " #" + count));
         return attrs.get("name").toString();
     }
 
@@ -456 +456 @@
      *
      * @since 13210
      */
-    public synchronized void splitTrackSegmentsToTracks() {
+    public synchronized void splitTrackSegmentsToTracks(String srcLayerName) {
         final HashMap<String, Integer> counts = new HashMap<>();
 
         List<GpxTrack> trks = getTracks().stream()
             .flatMap(trk -> trk.getSegments().stream().map(seg -> {
                     HashMap<String, Object> attrs = new HashMap<>(trk.getAttributes());
-                    ensureUniqueName(attrs, counts);
+                    ensureUniqueName(attrs, counts, srcLayerName);
                     return new ImmutableGpxTrack(Arrays.asList(seg), attrs);
                 }))
             .collect(Collectors.toCollection(ArrayList<GpxTrack>::new));
@@ -480 +480 @@
      *
      * @since 13210
      */
-    public synchronized void splitTracksToLayers() {
+    public synchronized void splitTracksToLayers(String srcLayerName) {
         final HashMap<String, Integer> counts = new HashMap<>();
 
         getTracks().stream()
@@ -489 +489 @@
                 HashMap<String, Object> attrs = new HashMap<>(trk.getAttributes());
                 GpxData d = new GpxData();
                 d.addTrack(trk);
-                return new GpxLayer(d, ensureUniqueName(attrs, counts));
+                return new GpxLayer(d, ensureUniqueName(attrs, counts, srcLayerName));
             })
             .forEachOrdered(layer -> MainApplication.getLayerManager().addLayer(layer));
     }
@@ -706 +706 @@
     * Warning: there are lot of track with broken timestamps,
     * so we just ingore points from future and from year before 1970 in this method
     * works correctly @since 5815
-     * @return minimum and maximum dates in array of 2 elements
+    * @return minimum and maximum dates in array of 2 elements
     */
     public synchronized Date[] getMinMaxTimeForAllTracks() {
         long now = System.currentTimeMillis();

src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -426 +426 @@
 
         @Override
         public void actionPerformed(ActionEvent e) {
-            layer.data.splitTrackSegmentsToTracks();
+            layer.data.splitTrackSegmentsToTracks(layer.getName().length()>0 ? layer.getName() : "GPX split result");
             layer.invalidate();
         }
 
@@ -459 +459 @@
 
         @Override
         public void actionPerformed(ActionEvent e) {
-            layer.data.splitTracksToLayers();
+            layer.data.splitTracksToLayers(layer.getName().length()>0 ? layer.getName() : "GPX split result");
             // layer is not modified by this action
         }