Changeset 12495 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2017-07-23T01:09:45+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #5869 - Download dialog, bookmarks: add "home location" bookmark (if set in OSM user settings) + last 15 changesets bookmarks

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• ChangesetQuery.java (modified) (2 diffs)
• OsmChangesetParser.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java

@@ -19 +19 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.gui.JosmUserIdentityManager;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Utils;
@@ -61 +62 @@
     public static ChangesetQuery buildFromUrlQuery(String query) throws ChangesetQueryUrlException {
         return new ChangesetQueryUrlParser().parse(query);
+    }
+
+    /**
+     * Replies a changeset query object restricted to the current user, if known.
+     * @return a changeset query object restricted to the current user, if known
+     * @throws IllegalStateException if current user is anonymous
+     * @since 12495
+     */
+    public static ChangesetQuery forCurrentUser() {
+        JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
+        if (im.isAnonymous()) {
+            throw new IllegalStateException("anonymous user");
+        }
+        ChangesetQuery query = new ChangesetQuery();
+        if (im.isFullyIdentified()) {
+            return query.forUser(im.getUserId());
+        } else {
+            return query.forUser(im.getUserName());
+        }
     }
 

trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java

@@ -153 +153 @@
                     throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "max_lat", maxLatStr));
                 }
-                current.setMax(new LatLon(maxLon, maxLat));
+                current.setMax(new LatLon(maxLat, maxLon));
             }