Index: trunk/src/org/openstreetmap/josm/actions/SaveAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/SaveAction.java (revision 18285) +++ trunk/src/org/openstreetmap/josm/actions/SaveAction.java (revision 18287) @@ -15,12 +15,12 @@ import javax.swing.SwingConstants; -import org.openstreetmap.josm.data.gpx.GpxData.GpxDataChangeListener; +import org.openstreetmap.josm.data.gpx.GpxConstants; import org.openstreetmap.josm.gui.ExtendedDialog; import org.openstreetmap.josm.gui.MainApplication; +import org.openstreetmap.josm.gui.layer.AbstractModifiableLayer; import org.openstreetmap.josm.gui.layer.GpxLayer; import org.openstreetmap.josm.gui.layer.Layer; import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent; import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent; -import org.openstreetmap.josm.gui.layer.OsmDataLayer; import org.openstreetmap.josm.gui.layer.SaveToFile; import org.openstreetmap.josm.gui.util.GuiHelper; @@ -38,10 +38,8 @@ private final PropertyChangeListener updateOnRequireSaveChange = evt -> { - if (OsmDataLayer.REQUIRES_SAVE_TO_DISK_PROP.equals(evt.getPropertyName())) { + if (AbstractModifiableLayer.REQUIRES_SAVE_TO_DISK_PROP.equals(evt.getPropertyName())) { updateEnabledState(); } }; - - private final GpxDataChangeListener updateOnRequireSaveChangeGpx = evt -> updateEnabledState(); /** @@ -69,9 +67,6 @@ public void layerAdded(LayerAddEvent e) { Layer l = e.getAddedLayer(); - if (l instanceof OsmDataLayer) { + if (l instanceof AbstractModifiableLayer) { l.addPropertyChangeListener(updateOnRequireSaveChange); - } - if (l instanceof GpxLayer) { - ((GpxLayer) l).data.addWeakChangeListener(updateOnRequireSaveChangeGpx); } super.layerAdded(e); @@ -81,9 +76,6 @@ public void layerRemoving(LayerRemoveEvent e) { Layer l = e.getRemovedLayer(); - if (l instanceof OsmDataLayer) { + if (l instanceof AbstractModifiableLayer) { l.removePropertyChangeListener(updateOnRequireSaveChange); - } - if (l instanceof GpxLayer) { - ((GpxLayer) l).data.removeChangeListener(updateOnRequireSaveChangeGpx); } super.layerRemoving(e); @@ -114,9 +106,16 @@ // Ask for overwrite in case of GpxLayer - if (f != null && layer instanceof GpxLayer && !Config.getPref().getBoolean("gpx.export.overwrite", false)) { + if (f != null + && layer instanceof GpxLayer + && (((GpxLayer) layer).data == null + || !GpxConstants.JOSM_CREATOR_NAME.equals(((GpxLayer) layer).data.creator)) + && !Config.getPref().getBoolean("gpx.export.overwrite", false)) { + JPanel p = new JPanel(new GridBagLayout()); - JLabel label = new JLabel(tr("File {0} exists. Overwrite?", f.getName())); + JLabel label = new JLabel("" + + tr("The file \"{0}\" will be modified.
Would you like to overwrite the existing file?", f.getName()) + + ""); label.setHorizontalAlignment(SwingConstants.CENTER); - JCheckBox remember = new JCheckBox(tr("Remember choice")); + JCheckBox remember = new JCheckBox(tr("Always overwrite GPX files without asking")); remember.setHorizontalAlignment(SwingConstants.CENTER); p.add(label, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 5, 5, 10)); @@ -125,11 +124,14 @@ MainApplication.getMainFrame(), tr("Overwrite"), - tr("Overwrite"), tr("Cancel")) - .setButtonIcons("save_as", "cancel") + tr("Overwrite"), tr("Save As..."), tr("Cancel")) + .setButtonIcons("save", "save_as", "cancel") .setContent(p); - if (dialog.showDialog().getValue() != 1) { + int val = dialog.showDialog().getValue(); + if (val == 1) { + Config.getPref().putBoolean("gpx.export.overwrite", remember.isSelected()); + } else if (val == 2) { f = null; - } else if (remember.isSelected()) { - Config.getPref().putBoolean("gpx.export.overwrite", true); + } else { + return null; } } Index: trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java (revision 18285) +++ trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java (revision 18287) @@ -20,4 +20,5 @@ import java.util.Set; import java.util.stream.Collectors; +import java.util.stream.Stream; import javax.swing.BorderFactory; @@ -33,4 +34,5 @@ import javax.swing.filechooser.FileFilter; +import org.openstreetmap.josm.data.preferences.BooleanProperty; import org.openstreetmap.josm.gui.ExtendedDialog; import org.openstreetmap.josm.gui.HelpAwareOptionPane; @@ -39,4 +41,5 @@ import org.openstreetmap.josm.gui.MapFrameListener; import org.openstreetmap.josm.gui.Notification; +import org.openstreetmap.josm.gui.layer.AbstractModifiableLayer; import org.openstreetmap.josm.gui.layer.Layer; import org.openstreetmap.josm.gui.util.WindowGeometry; @@ -61,4 +64,6 @@ private transient MultiMap dependencies; + private static final BooleanProperty SAVE_LOCAL_FILES_PROPERTY = new BooleanProperty("session.savelocal", true); + /** * Constructs a new {@code SessionSaveAsAction}. @@ -158,4 +163,32 @@ .filter(layer -> exporters.get(layer) != null && exporters.get(layer).shallExport()) .collect(Collectors.toList()); + + Stream layersToSaveStream = layersOut.stream() + .filter(layer -> layer.isSavable() + && layer instanceof AbstractModifiableLayer + && ((AbstractModifiableLayer) layer).requiresSaveToFile() + && exporters.get(layer) != null + && !exporters.get(layer).requiresZip()); + + if (SAVE_LOCAL_FILES_PROPERTY.get()) { + // individual files must be saved before the session file as the location may change + if (layersToSaveStream + .map(layer -> SaveAction.getInstance().doSave(layer, true)) + .collect(Collectors.toList()) // force evaluation of all elements + .contains(false)) { + + new Notification(tr("Not all local files referenced by the session file could be saved." + + "
Make sure you save them before closing JOSM.")) + .setIcon(JOptionPane.WARNING_MESSAGE) + .setDuration(Notification.TIME_LONG) + .show(); + } + } else if (layersToSaveStream.anyMatch(l -> true)) { + new Notification(tr("Not all local files referenced by the session file are saved yet." + + "
Make sure you save them before closing JOSM.")) + .setIcon(JOptionPane.INFORMATION_MESSAGE) + .setDuration(Notification.TIME_LONG) + .show(); + } int active = -1; @@ -251,4 +284,5 @@ protected final Component build() { + JPanel op = new JPanel(new GridBagLayout()); JPanel ip = new JPanel(new GridBagLayout()); for (Layer layer : layers) { @@ -273,5 +307,11 @@ final JTabbedPane tabs = new JTabbedPane(); tabs.addTab(tr("Layers"), p); - return tabs; + op.add(tabs, GBC.eol().fill()); + JCheckBox chkSaveLocal = new JCheckBox(tr("Save all local files to disk"), SAVE_LOCAL_FILES_PROPERTY.get()); + chkSaveLocal.addChangeListener(l -> { + SAVE_LOCAL_FILES_PROPERTY.put(chkSaveLocal.isSelected()); + }); + op.add(chkSaveLocal); + return op; } Index: trunk/src/org/openstreetmap/josm/data/gpx/GpxConstants.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/gpx/GpxConstants.java (revision 18285) +++ trunk/src/org/openstreetmap/josm/data/gpx/GpxConstants.java (revision 18287) @@ -99,4 +99,10 @@ */ String META_BOUNDS = META_PREFIX + "bounds"; + + /** + * The creator element that will be written when exporting a GPX file + * @since 18287 + */ + String JOSM_CREATOR_NAME = "JOSM GPX export"; /** Index: trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java (revision 18285) +++ trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java (revision 18287) @@ -44,5 +44,5 @@ * @author Raphael Mack <ramack@raphael-mack.de> */ -public class GpxData extends WithAttributes implements Data { +public class GpxData extends WithAttributes implements Data, IGpxLayerPrefs { /** @@ -68,4 +68,9 @@ */ public boolean fromServer; + /** + * A boolean flag indicating if the data was read from a session file. + * @since 18287 + */ + public boolean fromSession; /** @@ -1017,10 +1022,5 @@ } - /** - * The layer specific prefs formerly saved in the preferences, e.g. drawing options. - * NOT the track specific settings (e.g. color, width) - * @return Modifiable map - * @since 15496 - */ + @Override public Map getLayerPrefs() { return layerPrefs; @@ -1137,5 +1137,5 @@ } else { if (setModified) { - modified = true; + setModified(true); } if (listeners.hasListeners()) { @@ -1179,4 +1179,12 @@ */ void gpxDataChanged(GpxDataChangeEvent e); + + /** + * Called when the modified state of the data changed + * @param modified the new modified state + */ + default void modifiedStateChanged(boolean modified) { + // Override if needed + } } @@ -1217,6 +1225,12 @@ * @since 15496 */ + @Override public void setModified(boolean value) { - modified = value; + if (!initializing && modified != value) { + modified = value; + if (listeners.hasListeners()) { + listeners.fireEvent(l -> l.modifiedStateChanged(modified)); + } + } } Index: trunk/src/org/openstreetmap/josm/data/gpx/IGpxLayerPrefs.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/gpx/IGpxLayerPrefs.java (revision 18287) +++ trunk/src/org/openstreetmap/josm/data/gpx/IGpxLayerPrefs.java (revision 18287) @@ -0,0 +1,25 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.data.gpx; + +import java.util.Map; + +/** + * Interface containing the layer preferences. + * Implemented by GpxLayer and MarkerLayer + * @since 18287 + */ +public interface IGpxLayerPrefs { + + /** + * The layer specific prefs formerly saved in the preferences, e.g. drawing options. + * NOT the track specific settings (e.g. color, width) + * @return Modifiable map + */ + Map getLayerPrefs(); + + /** + * Sets the modified flag to the value. + * @param value modified flag + */ + void setModified(boolean value); +} Index: trunk/src/org/openstreetmap/josm/gui/MainFrame.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MainFrame.java (revision 18285) +++ trunk/src/org/openstreetmap/josm/gui/MainFrame.java (revision 18287) @@ -26,4 +26,5 @@ import org.openstreetmap.josm.data.UserIdentityManager; +import org.openstreetmap.josm.gui.layer.AbstractModifiableLayer; import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent; import org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener; @@ -46,7 +47,7 @@ private final transient PropertyChangeListener updateTitleOnSaveChange = evt -> { - if (evt.getPropertyName().equals(OsmDataLayer.REQUIRES_SAVE_TO_DISK_PROP) + if (evt.getPropertyName().equals(AbstractModifiableLayer.REQUIRES_SAVE_TO_DISK_PROP) || evt.getPropertyName().equals(OsmDataLayer.REQUIRES_UPLOAD_TO_SERVER_PROP)) { - OsmDataLayer layer = (OsmDataLayer) evt.getSource(); + AbstractModifiableLayer layer = (AbstractModifiableLayer) evt.getSource(); onLayerChange(layer); } @@ -187,5 +188,5 @@ } - private void onLayerChange(OsmDataLayer layer) { + private void onLayerChange(AbstractModifiableLayer layer) { if (layer == MainApplication.getLayerManager().getEditLayer()) { refreshTitle(); Index: trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxImporter.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxImporter.java (revision 18285) +++ trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxImporter.java (revision 18287) @@ -148,4 +148,5 @@ if (data.gpxLayer != null) { MainApplication.getLayerManager().addLayer(data.gpxLayer); + MainApplication.getLayerManager().setActiveLayer(data.gpxLayer); } data.postLayerTask.run(); Index: trunk/src/org/openstreetmap/josm/gui/layer/AbstractModifiableLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/AbstractModifiableLayer.java (revision 18285) +++ trunk/src/org/openstreetmap/josm/gui/layer/AbstractModifiableLayer.java (revision 18287) @@ -16,4 +16,11 @@ */ public abstract class AbstractModifiableLayer extends Layer implements DownloadFromServer, UploadToServer, SaveToFile, Lockable { + + /** + * Property used to know if this layer has to be saved on disk. + * @since 18287 + */ + public static final String REQUIRES_SAVE_TO_DISK_PROP = AbstractModifiableLayer.class.getName() + ".requiresSaveToDisk"; + static final String IS_DIRTY_SYMBOL = "*"; /** @@ -53,4 +60,14 @@ // Override if needed return false; + } + + /** + * Determines if this layer is "dirty", i.e. requires save or upload + * @return if this layer is "dirty" + * @since 18287 + */ + public boolean isDirty() { + // Override if needed + return requiresSaveToFile() || (requiresUploadToServer() && !isUploadDiscouraged()); } Index: trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (revision 18285) +++ trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (revision 18287) @@ -34,6 +34,7 @@ import org.openstreetmap.josm.data.gpx.GpxConstants; import org.openstreetmap.josm.data.gpx.GpxData; +import org.openstreetmap.josm.data.gpx.GpxData.GpxDataChangeEvent; +import org.openstreetmap.josm.data.gpx.GpxData.GpxDataChangeListener; import org.openstreetmap.josm.data.gpx.GpxDataContainer; -import org.openstreetmap.josm.data.gpx.GpxData.GpxDataChangeListener; import org.openstreetmap.josm.data.gpx.IGpxTrack; import org.openstreetmap.josm.data.gpx.IGpxTrackSegment; @@ -59,4 +60,5 @@ import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer; import org.openstreetmap.josm.gui.preferences.display.GPXSettingsPanel; +import org.openstreetmap.josm.gui.util.GuiHelper; import org.openstreetmap.josm.gui.widgets.HtmlPanel; import org.openstreetmap.josm.tools.ImageProvider; @@ -86,5 +88,15 @@ * Added as field to be kept as reference. */ - private final GpxDataChangeListener dataChangeListener = e -> this.invalidate(); + private final GpxDataChangeListener dataChangeListener = new GpxDataChangeListener() { + @Override + public void gpxDataChanged(GpxDataChangeEvent e) { + invalidate(); + } + + @Override + public void modifiedStateChanged(boolean modified) { + GuiHelper.runInEDT(() -> propertyChangeSupport.firePropertyChange(REQUIRES_SAVE_TO_DISK_PROP, !modified, modified)); + } + }; /** * The MarkerLayer imported from the same file. @@ -376,4 +388,9 @@ @Override + public String getLabel() { + return isDirty() ? super.getLabel() + ' ' + IS_DIRTY_SYMBOL : super.getLabel(); + } + + @Override public void visitBoundingBox(BoundingXYVisitor v) { if (data != null) { @@ -555,5 +572,5 @@ @Override public boolean requiresSaveToFile() { - return isModified() && isLocalFile(); + return data != null && isModified() && (isLocalFile() || data.fromSession); } @@ -622,4 +639,7 @@ @Override public synchronized void destroy() { + if (linkedMarkerLayer != null && MainApplication.getLayerManager().containsLayer(linkedMarkerLayer)) { + linkedMarkerLayer.data.transferLayerPrefs(data.getLayerPrefs()); + } data.clear(); data = null; Index: trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 18285) +++ trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 18287) @@ -149,7 +149,4 @@ // U+2205 EMPTY SET private static final String IS_EMPTY_SYMBOL = "\u2205"; - private static final String IS_DIRTY_SYMBOL = "*"; - /** Property used to know if this layer has to be saved on disk */ - public static final String REQUIRES_SAVE_TO_DISK_PROP = OsmDataLayer.class.getName() + ".requiresSaveToDisk"; /** Property used to know if this layer has to be uploaded */ public static final String REQUIRES_UPLOAD_TO_SERVER_PROP = OsmDataLayer.class.getName() + ".requiresUploadToServer"; @@ -1073,13 +1070,4 @@ } - /** - * Determines if this layer is "dirty", i.e., requires save or upload - * @return if this layer is "dirty" - * @since 17626 - */ - public boolean isDirty() { - return requiresSaveToFile() || (requiresUploadToServer() && !isUploadDiscouraged()); - } - @Override public String getLabel() { Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (revision 18285) +++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (revision 18287) @@ -190,5 +190,7 @@ public WayPoint convertToWayPoint() { WayPoint wpt = new WayPoint(getCoor()); - wpt.setTimeInMillis((long) (time * 1000)); + if (time > 0d) { + wpt.setTimeInMillis((long) (time * 1000)); + } if (text != null) { wpt.getExtensions().add("josm", "text", text); Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (revision 18285) +++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (revision 18287) @@ -21,5 +21,7 @@ import java.util.Collection; import java.util.Comparator; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Optional; @@ -38,4 +40,5 @@ import org.openstreetmap.josm.data.gpx.GpxExtension; import org.openstreetmap.josm.data.gpx.GpxLink; +import org.openstreetmap.josm.data.gpx.IGpxLayerPrefs; import org.openstreetmap.josm.data.gpx.WayPoint; import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; @@ -57,4 +60,5 @@ import org.openstreetmap.josm.io.audio.AudioPlayer; import org.openstreetmap.josm.spi.preferences.Config; +import org.openstreetmap.josm.tools.ColorHelper; import org.openstreetmap.josm.tools.ImageProvider; import org.openstreetmap.josm.tools.Logging; @@ -77,5 +81,5 @@ * A list of markers. */ - public final List data; + public final MarkerData data; private boolean mousePressed; public GpxLayer fromLayer; @@ -101,15 +105,18 @@ super(name); this.setAssociatedFile(associatedFile); - this.data = new ArrayList<>(); + this.data = new MarkerData(); this.fromLayer = fromLayer; double firstTime = -1.0; String lastLinkedFile = ""; + if (fromLayer == null || fromLayer.data == null) { + data.ownLayerPrefs = indata.getLayerPrefs(); + } + + String cs = GPXSettingsPanel.tryGetDataPrefLocal(data, "markers.color"); Color c = null; - String cs = GPXSettingsPanel.tryGetLayerPrefLocal(indata, "markers.color"); if (cs != null) { - try { - c = Color.decode(cs); - } catch (NumberFormatException ex) { + c = ColorHelper.html2color(cs); + if (c == null) { Logging.warn("Could not read marker color: " + cs); } @@ -460,5 +467,5 @@ */ private boolean isTextOrIconShown() { - return Boolean.parseBoolean(GPXSettingsPanel.getLayerPref(fromLayer, "markers.show-text")); + return Boolean.parseBoolean(GPXSettingsPanel.getDataPref(data, "markers.show-text")); } @@ -476,11 +483,9 @@ public void setColor(Color color) { setPrivateColors(color); - if (fromLayer != null) { - String cs = null; - if (color != null) { - cs = String.format("#%02X%02X%02X", color.getRed(), color.getGreen(), color.getBlue()); - } - GPXSettingsPanel.putLayerPrefLocal(fromLayer, "markers.color", cs); - } + String cs = null; + if (color != null) { + cs = ColorHelper.color2html(color); + } + GPXSettingsPanel.putDataPrefLocal(data, "markers.color", cs); invalidate(); } @@ -534,5 +539,5 @@ @Override public void actionPerformed(ActionEvent e) { - GPXSettingsPanel.putLayerPrefLocal(layer.fromLayer, "markers.show-text", Boolean.toString(!layer.isTextOrIconShown())); + GPXSettingsPanel.putDataPrefLocal(layer.data, "markers.show-text", Boolean.toString(!layer.isTextOrIconShown())); layer.invalidate(); } @@ -618,3 +623,40 @@ } } + + /** + * the data of a MarkerLayer + * @since 18287 + */ + public class MarkerData extends ArrayList implements IGpxLayerPrefs { + + private Map ownLayerPrefs; + + @Override + public Map getLayerPrefs() { + if (ownLayerPrefs == null && fromLayer != null && fromLayer.data != null) { + return fromLayer.data.getLayerPrefs(); + } + // fallback to own layerPrefs if the corresponding gpxLayer has already been deleted + // by the user or never existed when loaded from a session file + if (ownLayerPrefs == null) { + ownLayerPrefs = new HashMap<>(); + } + return ownLayerPrefs; + } + + /** + * Transfers the layerPrefs from the GpxData to MarkerData (when GpxData is deleted) + * @param gpxLayerPrefs the layerPrefs from the GpxData object + */ + public void transferLayerPrefs(Map gpxLayerPrefs) { + ownLayerPrefs = new HashMap<>(gpxLayerPrefs); + } + + @Override + public void setModified(boolean value) { + if (fromLayer != null && fromLayer.data != null) { + fromLayer.data.setModified(value); + } + } + } } Index: trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java (revision 18285) +++ trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java (revision 18287) @@ -30,4 +30,5 @@ import org.openstreetmap.josm.actions.ExpertToggleAction; import org.openstreetmap.josm.data.gpx.GpxData; +import org.openstreetmap.josm.data.gpx.IGpxLayerPrefs; import org.openstreetmap.josm.gui.MainApplication; import org.openstreetmap.josm.gui.layer.GpxLayer; @@ -174,4 +175,16 @@ */ public static String getLayerPref(GpxLayer layer, String key) { + GpxData data = layer != null ? layer.data : null; + return getDataPref(data, key); + } + + /** + * Reads the preference for the given layer or the default preference if not available + * @param data the data. Can be null, default preference will be returned then + * @param key the drawing key to be read, without "draw.rawgps." + * @return the value + * @since 18287 + */ + public static String getDataPref(IGpxLayerPrefs data, String key) { Object d = DEFAULT_PREFS.get(key); String ds; @@ -182,5 +195,5 @@ ds = null; } - return Optional.ofNullable(tryGetLayerPrefLocal(layer, key)).orElse(Config.getPref().get("draw.rawgps." + key, ds)); + return Optional.ofNullable(tryGetDataPrefLocal(data, key)).orElse(Config.getPref().get("draw.rawgps." + key, ds)); } @@ -192,5 +205,17 @@ */ public static int getLayerPrefInt(GpxLayer layer, String key) { - String s = getLayerPref(layer, key); + GpxData data = layer != null ? layer.data : null; + return getDataPrefInt(data, key); + } + + /** + * Reads the integer preference for the given data or the default preference if not available + * @param data the data. Can be null, default preference will be returned then + * @param key the drawing key to be read, without "draw.rawgps." + * @return the integer value + * @since 18287 + */ + public static int getDataPrefInt(IGpxLayerPrefs data, String key) { + String s = getDataPref(data, key); if (s != null) { try { @@ -215,5 +240,5 @@ */ public static String tryGetLayerPrefLocal(GpxLayer layer, String key) { - return layer != null ? tryGetLayerPrefLocal(layer.data, key) : null; + return layer != null ? tryGetDataPrefLocal(layer.data, key) : null; } @@ -224,5 +249,5 @@ * @return the value or null if not found */ - public static String tryGetLayerPrefLocal(GpxData data, String key) { + public static String tryGetDataPrefLocal(IGpxLayerPrefs data, String key) { return data != null ? data.getLayerPrefs().get(key) : null; } @@ -238,5 +263,5 @@ if (layers != null) { for (GpxLayer l : layers) { - putLayerPrefLocal(l.data, key, v); + putDataPrefLocal(l.data, key, v); } } else { @@ -253,5 +278,5 @@ public static void putLayerPrefLocal(GpxLayer layer, String key, String value) { if (layer == null || layer.data == null) return; - putLayerPrefLocal(layer.data, key, value); + putDataPrefLocal(layer.data, key, value); } @@ -261,6 +286,9 @@ * @param key the drawing key to be written, without "draw.rawgps." * @param value the value or null to remove key - */ - public static void putLayerPrefLocal(GpxData data, String key, String value) { + * @since 18287 + */ + public static void putDataPrefLocal(IGpxLayerPrefs data, String key, String value) { + if (data == null) return; + data.setModified(true); if (Utils.isBlank(value) || (getLayerPref(null, key).equals(value) && DEFAULT_PREFS.get(key) != null && DEFAULT_PREFS.get(key).toString().equals(value))) { Index: trunk/src/org/openstreetmap/josm/io/GpxWriter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/GpxWriter.java (revision 18285) +++ trunk/src/org/openstreetmap/josm/io/GpxWriter.java (revision 18287) @@ -149,6 +149,10 @@ validprefixes = namespaces.stream().map(n -> n.getPrefix()).collect(Collectors.toList()); + data.creator = JOSM_CREATOR_NAME; out.println(""); - out.println(" { + + private Instant metaTime; /** @@ -37,6 +40,13 @@ Writer writer = new OutputStreamWriter(out, StandardCharsets.UTF_8); GpxWriter w = new GpxWriter(new PrintWriter(writer)); + if (metaTime != null) { + w.setMetaTime(metaTime); + } w.write(layer.data); w.flush(); } + + protected void setMetaTime(Instant metaTime) { + this.metaTime = metaTime; + } } Index: trunk/src/org/openstreetmap/josm/io/session/GpxTracksSessionImporter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/session/GpxTracksSessionImporter.java (revision 18285) +++ trunk/src/org/openstreetmap/josm/io/session/GpxTracksSessionImporter.java (revision 18287) @@ -55,4 +55,7 @@ importData = GpxImporter.loadLayers(in, support.getFile(fileStr), support.getLayerName(), progressMonitor); } + if (importData.getGpxLayer() != null && importData.getGpxLayer().data != null) { + importData.getGpxLayer().data.fromSession = true; + } support.addPostLayersTask(importData.getPostLayerTask()); Index: trunk/src/org/openstreetmap/josm/io/session/MarkerSessionExporter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/session/MarkerSessionExporter.java (revision 18285) +++ trunk/src/org/openstreetmap/josm/io/session/MarkerSessionExporter.java (revision 18287) @@ -10,4 +10,5 @@ import java.io.Writer; import java.nio.charset.StandardCharsets; +import java.time.Instant; import java.util.Collection; import java.util.Collections; @@ -32,4 +33,6 @@ */ public class MarkerSessionExporter extends AbstractSessionExporter { + + private Instant metaTime; /** @@ -87,6 +90,13 @@ Writer writer = new OutputStreamWriter(out, StandardCharsets.UTF_8); MarkerWriter w = new MarkerWriter(new PrintWriter(writer)); + if (metaTime != null) { + w.setMetaTime(metaTime); + } w.write(layer); w.flush(); + } + + protected void setMetaTime(Instant metaTime) { + this.metaTime = metaTime; } @@ -110,4 +120,9 @@ public void write(MarkerLayer layer) { GpxData data = new GpxData(); + layer.data.getLayerPrefs().forEach((k, v) -> { + if (k != null && k.indexOf("markers.") == 0) { + data.getLayerPrefs().put(k, v); + } + }); data.put(GpxData.META_DESC, "exported JOSM marker layer"); for (Marker m : layer.data) { Index: trunk/src/org/openstreetmap/josm/io/session/MarkerSessionImporter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/session/MarkerSessionImporter.java (revision 18285) +++ trunk/src/org/openstreetmap/josm/io/session/MarkerSessionImporter.java (revision 18287) @@ -6,5 +6,4 @@ import java.io.IOException; import java.io.InputStream; -import java.util.List; import javax.xml.xpath.XPath; @@ -15,5 +14,4 @@ import org.openstreetmap.josm.gui.io.importexport.GpxImporter; -import org.openstreetmap.josm.gui.layer.GpxLayer; import org.openstreetmap.josm.gui.layer.Layer; import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer; @@ -51,19 +49,5 @@ support.addPostLayersTask(importData.getPostLayerTask()); - GpxLayer gpxLayer = null; - List deps = support.getLayerDependencies(); - if (!deps.isEmpty()) { - Layer layer = deps.get(0).getLayer(); - if (layer instanceof GpxLayer) { - gpxLayer = (GpxLayer) layer; - } - } - - MarkerLayer markerLayer = importData.getMarkerLayer(); - if (markerLayer != null) { - markerLayer.fromLayer = gpxLayer; - } - - return markerLayer; + return importData.getMarkerLayer(); } } catch (XPathExpressionException e) { Index: trunk/src/org/openstreetmap/josm/io/session/SessionReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/session/SessionReader.java (revision 18285) +++ trunk/src/org/openstreetmap/josm/io/session/SessionReader.java (revision 18287) @@ -4,5 +4,4 @@ import static org.openstreetmap.josm.tools.I18n.tr; -import java.awt.Color; import java.awt.GraphicsEnvironment; import java.io.BufferedInputStream; @@ -47,5 +46,4 @@ import org.openstreetmap.josm.io.IllegalDataException; import org.openstreetmap.josm.tools.CheckParameterUtil; -import org.openstreetmap.josm.tools.ColorHelper; import org.openstreetmap.josm.tools.JosmRuntimeException; import org.openstreetmap.josm.tools.Logging; @@ -620,13 +618,4 @@ } } - String colorString = el.getAttribute("color"); - if (colorString != null) { - try { - Color color = ColorHelper.html2color(colorString); - layer.setColor(color); - } catch (RuntimeException ex) { - Logging.warn("Cannot parse color " + colorString); - } - } layer.setName(names.get(entry.getKey())); layers.add(layer); Index: trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java (revision 18285) +++ trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java (revision 18287) @@ -44,5 +44,4 @@ import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer; import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference; -import org.openstreetmap.josm.tools.ColorHelper; import org.openstreetmap.josm.tools.JosmRuntimeException; import org.openstreetmap.josm.tools.Logging; @@ -241,7 +240,4 @@ if (!Utils.equalsEpsilon(layer.getOpacity(), 1.0)) { el.setAttribute("opacity", Double.toString(layer.getOpacity())); - } - if (layer.getColor() != null) { - el.setAttribute("color", ColorHelper.color2html(layer.getColor())); } Set deps = dependencies.get(layer);