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

Timestamp:

2022-05-25T23:29:07+02:00 (3 years ago)

Author:

taylor.smock

Message:

Fix #22056: source in the dataset tags overrides automatic sources

This ocurred when changeset_source is set via remote control or file load.

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• io/BasicUploadSettingsPanel.java (modified) (1 diff)
• io/UploadDialog.java (modified) (1 diff)
• layer/OsmDataLayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java

@@ -233 +233 @@
      * @return The source from the layer info.
      */
-    private String getSourceFromLayer() {
+    String getSourceFromLayer() {
         String source = MainApplication.getMap().mapView.getLayerInformationForSourceTag();
         return Utils.shortenString(source, Changeset.MAX_CHANGESET_TAG_LENGTH);

trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

@@ -239 +239 @@
         model.putAll(map);          // init with tags from history
         model.putAll(this.dataSet); // overwrite with tags from the dataset
+        if (Config.getPref().getBoolean("upload.source.obtainautomatically", false)
+        && this.dataSet.getChangeSetTags().containsKey(UploadDialogModel.SOURCE)) {
+            model.put(UploadDialogModel.SOURCE, pnlBasicUploadSettings.getSourceFromLayer());
+        }
 
         tpConfigPanels.setSelectedIndex(0);

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -1279 +1279 @@
 
     @Override
+    public String getChangesetSourceTag() {
+        return this.data.getChangeSetTags().getOrDefault("source", null);
+    }
+
+    @Override
     public AbstractUploadDialog getUploadDialog() {
         UploadDialog dialog = UploadDialog.getUploadDialog();