Changeset 15560 in josm for trunk/src/org/openstreetmap

Timestamp:

2019-12-07T16:38:26+01:00 (5 years ago)

Author:

GerdP

Message:

fix #18389: GPX track with color black is invisible (Patch by Bjoeni)
Show popup that track is not visible because color matches backgroud color. This shows a popup only if

• background color of all tracks in the file equals background color and
• no imagery layer is currently visible

"I noticed that Garmin actually uses gpxx:TrackExtension instead of gpxx:TrackExtensions, so the abbreviations don't work and files are sometimes not written according to the standard."

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/gpx/GpxConstants.java (modified) (1 diff)
• data/gpx/GpxExtensionCollection.java (modified) (1 diff)
• data/gpx/GpxTrack.java (modified) (1 diff)
• gui/io/importexport/GpxImporter.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/gpx/GpxConstants.java

@@ -239 +239 @@
     static Map<String, String> getExtensionAbbreviations() {
         TreeMap<String, String> m = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
-        m.put("gpx:extension:gpxx:TrackExtensions:DisplayColor", "gpxx:DisplayColor");
+        m.put("gpx:extension:gpxx:TrackExtension:DisplayColor", "gpxx:DisplayColor");
         m.put("gpx:extension:gpxd:color", "gpxd:color");
         return m;

trunk/src/org/openstreetmap/josm/data/gpx/GpxExtensionCollection.java

@@ -148 +148 @@
     /**
      * Adds an extension from a flat chain without prefix, e.g. when converting from OSM
-     * @param chain the full key chain, e.g. ["extension", "gpxx", "TrackExtensions", "DisplayColor"]
+     * @param chain the full key chain, e.g. ["extension", "gpxx", "TrackExtension", "DisplayColor"]
      * @param value the value
      */

trunk/src/org/openstreetmap/josm/data/gpx/GpxTrack.java

@@ -170 +170 @@
                 }
                 closestGarminColorCache.put(c, colorString);
-                getExtensions().addIfNotPresent("gpxx", "TrackExtensions").getExtensions().addOrUpdate("gpxx", "DisplayColor", colorString);
+                getExtensions().addIfNotPresent("gpxx", "TrackExtension").getExtensions().addOrUpdate("gpxx", "DisplayColor", colorString);
             } else if (cFormat == ColorFormat.GPXD) {
                 setColor(c);

trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxImporter.java

@@ -13 +13 @@
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
+import org.openstreetmap.josm.gui.layer.ImageryLayer;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -154 +157 @@
             }
         }
+
+        final boolean isSameColor = MainApplication.getLayerManager()
+                .getLayersOfType(ImageryLayer.class)
+                .stream().noneMatch(ImageryLayer::isVisible)
+                && data.getTracks().stream().anyMatch(t -> OsmDataLayer.getBackgroundColor().equals(t.getColor()));
+
         Runnable postLayerTask = () -> {
             if (!parsedProperly) {
@@ -166 +175 @@
                 JOptionPane.showMessageDialog(null, msg);
             }
+            if (isSameColor) {
+                new Notification(tr("The imported track \"{0}\" might not be visible because it has the same color as the background." +
+                        "<br>You can change this in the context menu of the imported layer.", gpxLayerName))
+                .setIcon(JOptionPane.WARNING_MESSAGE)
+                .setDuration(Notification.TIME_LONG)
+                .show();
+            }
         };
         return new GpxImporterData(gpxLayer, markerLayer, postLayerTask);