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

Timestamp:

2020-06-14T19:35:04+02:00 (4 years ago)

Author:

simon04

Message:

fix #18258 - OsmReader: Allow end user to know what the original id of a feature was (patch by taylor.smock, modified)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/AbstractPrimitive.java (modified) (1 diff)
• io/OsmReader.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java

@@ -735 +735 @@
                             "created_by",
                             "converted_by",
+                            "current_id",
                             "geobase:datasetName",
                             "geobase:uuid",

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

@@ -5 +5 @@
 
 import java.io.InputStream;
+import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Objects;
 import java.util.Set;
@@ -40 +42 @@
 public class OsmReader extends AbstractReader {
 
+    /**
+     * Options are used to change how the xml data is parsed.
+     * For example, {@link Options#CONVERT_UNKNOWN_TO_TAGS} is used to convert unknown XML attributes to a tag for the object.
+     * @since 16641
+     */
+    public enum Options {
+        /**
+         * Convert unknown XML attributes to tags
+         */
+        CONVERT_UNKNOWN_TO_TAGS,
+        /**
+         * Save the original id of an object (currently stored in `current_id`)
+         */
+        SAVE_ORIGINAL_ID
+    }
+
     protected XMLStreamReader parser;
 
-    protected boolean convertUnknownToTags;
+    /** The {@link OsmReader.Options} to use when parsing the xml data */
+    protected final Collection<Options> options;
 
     private static final Set<String> COMMON_XML_ATTRIBUTES = new TreeSet<>();
@@ -65 +84 @@
      */
     protected OsmReader() {
-        this(false);
+        this((Options) null);
     }
 
     /**
      * constructor (for private and subclasses use only)
-     * @param convertUnknownToTags if true, keep unknown xml attributes as tags
+     * @param options The options to use when reading data
      *
      * @see #parseDataSet(InputStream, ProgressMonitor)
-     * @since 15470
-     */
-    protected OsmReader(boolean convertUnknownToTags) {
+     * @since 16641
+     */
+    protected OsmReader(Options... options) {
         // Restricts visibility
-        this.convertUnknownToTags = convertUnknownToTags;
+        this.options = options == null ? Collections.emptyList() : Arrays.asList(options);
     }
 
@@ -426 +445 @@
             parseChangeset(current, parser.getAttributeValue(null, "changeset"));
 
-            if (convertUnknownToTags) {
+            if (options.contains(Options.SAVE_ORIGINAL_ID)) {
+                parseTag(current, "current_id", Long.toString(getLong("id")));
+            }
+            if (options.contains(Options.CONVERT_UNKNOWN_TO_TAGS)) {
                 for (int i = 0; i < parser.getAttributeCount(); i++) {
                     if (!COMMON_XML_ATTRIBUTES.contains(parser.getAttributeLocalName(i))) {
@@ -497 +519 @@
      */
     public static DataSet parseDataSet(InputStream source, ProgressMonitor progressMonitor) throws IllegalDataException {
-        return parseDataSet(source, progressMonitor, false);
+        return parseDataSet(source, progressMonitor, (Options) null);
     }
 
@@ -505 +527 @@
      * @param source the source input stream. Must not be null.
      * @param progressMonitor the progress monitor. If null, {@link NullProgressMonitor#INSTANCE} is assumed
-     * @param convertUnknownToTags true if unknown xml attributes should be kept as tags
+     * @param options The options to use when parsing the dataset
      *
      * @return the dataset with the parsed data
      * @throws IllegalDataException if an error was found while parsing the data from the source
      * @throws IllegalArgumentException if source is null
-     * @since 15470
-     */
-    public static DataSet parseDataSet(InputStream source, ProgressMonitor progressMonitor, boolean convertUnknownToTags)
+     * @since 16641
+     */
+    public static DataSet parseDataSet(InputStream source, ProgressMonitor progressMonitor, Options... options)
             throws IllegalDataException {
-        return new OsmReader(convertUnknownToTags).doParseDataSet(source, progressMonitor);
+        return new OsmReader(options).doParseDataSet(source, progressMonitor);
     }
 }