Changeset 13109 in josm for trunk

Timestamp:

2017-11-11T02:03:41+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #15537 - Support changeset hashtags (hashtags changeset tag, extracted from comment at upload, or set by remote control through new changeset_hashtags parameter)

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/io/ChangesetCommentModel.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java (modified) (3 diffs)
• src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/gui/io/ChangesetCommentModelTest.java (added)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.io;
 
+import java.util.Arrays;
+import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 import org.openstreetmap.josm.gui.util.ChangeNotifier;
@@ -35 +38 @@
         return comment == null ? "" : comment;
     }
+
+    /**
+     * Extracts the list of hashtags from the comment text.
+     * @return the list of hashtags from the comment text. Can be empty, but not null.
+     * @since 13109
+     */
+    public List<String> findHashTags() {
+        return Arrays.stream(comment.split("\\s")).filter(s -> s.length() >= 2 && s.charAt(0) == '#').collect(Collectors.toList());
+    }
 }

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

@@ -48 +48 @@
         this.changesetSourceModel = changesetSourceModel;
         this.changesetReviewModel = changesetReviewModel;
-        changesetCommentModel.addChangeListener(new ChangesetCommentChangeListener("comment"));
+        changesetCommentModel.addChangeListener(new ChangesetCommentChangeListener("comment", "hashtags"));
         changesetSourceModel.addChangeListener(new ChangesetCommentChangeListener("source"));
         changesetReviewModel.addChangeListener(new ChangesetReviewChangeListener());
@@ -135 +135 @@
 
         private final String key;
+        private final String hashtagsKey;
 
         ChangesetCommentChangeListener(String key) {
+            this(key, null);
+        }
+
+        ChangesetCommentChangeListener(String key, String hashtagsKey) {
             this.key = key;
+            this.hashtagsKey = hashtagsKey;
         }
 
@@ -143 +149 @@
         public void stateChanged(ChangeEvent e) {
             if (e.getSource() instanceof ChangesetCommentModel) {
-                String newValue = ((ChangesetCommentModel) e.getSource()).getComment();
+                ChangesetCommentModel model = ((ChangesetCommentModel) e.getSource());
+                String newValue = model.getComment();
                 String oldValue = Optional.ofNullable(getTagEditorValue(key)).orElse("");
                 if (!oldValue.equals(newValue)) {
                     setProperty(key, newValue);
+                    if (hashtagsKey != null) {
+                        String newHashTags = String.join(";", model.findHashTags());
+                        String oldHashTags = Optional.ofNullable(getTagEditorValue(hashtagsKey)).orElse("");
+                        if (!oldHashTags.equals(newHashTags)) {
+                            setProperty(hashtagsKey, newHashTags);
+                        }
+                    }
                 }
             }

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java

@@ -6 +6 @@
 import java.awt.geom.Area;
 import java.awt.geom.Rectangle2D;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -77 +78 @@
     @Override
     public String[] getOptionalParams() {
-        return new String[] {"new_layer", "layer_name", "addtags", "select", "zoom_mode", "changeset_comment", "changeset_source", "search"};
+        return new String[] {"new_layer", "layer_name", "addtags", "select", "zoom_mode",
+                "changeset_comment", "changeset_source", "changeset_hashtags", "search"};
     }
 
@@ -213 +215 @@
 
         // add changeset tags after download if necessary
-        if (args.containsKey("changeset_comment") || args.containsKey("changeset_source")) {
+        if (args.containsKey("changeset_comment") || args.containsKey("changeset_source") || args.containsKey("changeset_hashtags")) {
             MainApplication.worker.submit(() -> {
-                if (MainApplication.getLayerManager().getEditDataSet() != null) {
-                    if (args.containsKey("changeset_comment")) {
-                        MainApplication.getLayerManager().getEditDataSet().addChangeSetTag("comment", args.get("changeset_comment"));
-                    }
-                    if (args.containsKey("changeset_source")) {
-                        MainApplication.getLayerManager().getEditDataSet().addChangeSetTag("source", args.get("changeset_source"));
+                DataSet ds = MainApplication.getLayerManager().getEditDataSet();
+                if (ds != null) {
+                    for (String tag : Arrays.asList("changeset_comment", "changeset_source", "changeset_hashtags")) {
+                        if (args.containsKey(tag)) {
+                            ds.addChangeSetTag(tag.substring("changeset_".length()), args.get(tag));
+                        }
                     }
                 }