Index: src/org/openstreetmap/josm/io/OsmReader.java =================================================================== --- src/org/openstreetmap/josm/io/OsmReader.java (revision 15466) +++ src/org/openstreetmap/josm/io/OsmReader.java (working copy) @@ -6,6 +6,8 @@ import java.io.InputStream; import java.util.Collection; import java.util.Objects; +import java.util.Set; +import java.util.TreeSet; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -39,6 +41,23 @@ protected XMLStreamReader parser; + protected boolean convertUnknownToTags; + + private static final Set COMMON_XML_ATTRIBUTES = new TreeSet<>(); + + static { + COMMON_XML_ATTRIBUTES.add("id"); + COMMON_XML_ATTRIBUTES.add("timestamp"); + COMMON_XML_ATTRIBUTES.add("user"); + COMMON_XML_ATTRIBUTES.add("uid"); + COMMON_XML_ATTRIBUTES.add("visible"); + COMMON_XML_ATTRIBUTES.add("version"); + COMMON_XML_ATTRIBUTES.add("action"); + COMMON_XML_ATTRIBUTES.add("changeset"); + COMMON_XML_ATTRIBUTES.add("lat"); + COMMON_XML_ATTRIBUTES.add("lon"); + } + /** * constructor (for private and subclasses use only) * @@ -45,7 +64,19 @@ * @see #parseDataSet(InputStream, ProgressMonitor) */ protected OsmReader() { + this(false); + } + + /** + * constructor (for private and subclasses use only) + * @param convertUnknownToTags if true, keep unknown xml attributes as tags + * + * @see #parseDataSet(InputStream, ProgressMonitor) + * @since xxx + */ + protected OsmReader(boolean convertUnknownToTags) { // Restricts visibility + this.convertUnknownToTags = convertUnknownToTags; } protected void setParser(XMLStreamReader parser) { @@ -393,6 +424,14 @@ parseVersion(current, parser.getAttributeValue(null, "version")); parseAction(current, parser.getAttributeValue(null, "action")); parseChangeset(current, parser.getAttributeValue(null, "changeset")); + + if (convertUnknownToTags) { + for (int i = 0; i < parser.getAttributeCount(); i++) { + if (!COMMON_XML_ATTRIBUTES.contains(parser.getAttributeLocalName(i))) { + parseTag(current, parser.getAttributeLocalName(i), parser.getAttributeValue(i)); + } + } + } } catch (UncheckedParseException | XMLStreamException e) { throw new IllegalDataException(e); } @@ -457,6 +496,23 @@ * @throws IllegalArgumentException if source is null */ public static DataSet parseDataSet(InputStream source, ProgressMonitor progressMonitor) throws IllegalDataException { - return new OsmReader().doParseDataSet(source, progressMonitor); + return parseDataSet(source, progressMonitor, false); } + + /** + * Parse the given input source and return the dataset. + * + * @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 + * + * @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 xxx + */ + public static DataSet parseDataSet(InputStream source, ProgressMonitor progressMonitor, boolean convertUnknownToTags) + throws IllegalDataException { + return new OsmReader(convertUnknownToTags).doParseDataSet(source, progressMonitor); + } } Index: test/unit/org/openstreetmap/josm/io/OsmReaderTest.java =================================================================== --- test/unit/org/openstreetmap/josm/io/OsmReaderTest.java (revision 15466) +++ test/unit/org/openstreetmap/josm/io/OsmReaderTest.java (working copy) @@ -12,11 +12,13 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Paths; +import java.util.Arrays; import org.junit.Rule; import org.junit.Test; import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.gui.progress.NullProgressMonitor; import org.openstreetmap.josm.gui.progress.ProgressMonitor; @@ -73,8 +75,18 @@ ("" + osm).getBytes(StandardCharsets.UTF_8))) { assertTrue(OsmReader.parseDataSet(in, NullProgressMonitor.INSTANCE).allPrimitives().isEmpty()); } + testUnknown(osm, true); + testUnknown(osm, false); } + private static void testUnknown(String osm, boolean parseUnknownAttributes) throws Exception { + try (InputStream in = new ByteArrayInputStream( + ("" + osm).getBytes(StandardCharsets.UTF_8))) { + assertTrue(OsmReader.parseDataSet(in, NullProgressMonitor.INSTANCE, parseUnknownAttributes).allPrimitives() + .isEmpty()); + } + } + /** * Unit test of {@link OsmReader#parseUnknown} - root case. * @throws Exception if any error occurs @@ -126,6 +138,20 @@ } /** + * Test valid data. + * @param osm OSM data without XML prefix + * @param parseUnknownAttributes if true, attempt to parse unknown xml attributes + * @return parsed data set + * @throws Exception if any error occurs + */ + private static DataSet testValidData(String osm, boolean parseUnknownAttributes) throws Exception { + try (InputStream in = new ByteArrayInputStream( + ("" + osm).getBytes(StandardCharsets.UTF_8))) { + return OsmReader.parseDataSet(in, NullProgressMonitor.INSTANCE, parseUnknownAttributes); + } + } + + /** * Test invalid data. * @param osm OSM data without XML prefix * @param expectedError expected error message @@ -139,9 +165,31 @@ } catch (IllegalDataException e) { assertEquals(expectedError, e.getMessage()); } + testInvalidData(osm, expectedError, true); + testInvalidData(osm, expectedError, false); } /** + * Test invalid data. + * + * @param osm OSM data without XML prefix + * @param expectedError expected error message + * @param parseUnknownAttributes if true, attempt to parse unknown xml + * attributes + * @throws Exception if any error occurs + */ + private static void testInvalidData(String osm, String expectedError, boolean parseUnknownAttributes) + throws Exception { + try (InputStream in = new ByteArrayInputStream( + ("" + osm).getBytes(StandardCharsets.UTF_8))) { + OsmReader.parseDataSet(in, NullProgressMonitor.INSTANCE, parseUnknownAttributes); + fail("should throw exception"); + } catch (IllegalDataException e) { + assertEquals(expectedError, e.getMessage()); + } + } + + /** * Test invalid UID. * @throws Exception if any error occurs */ @@ -274,7 +322,10 @@ */ @Test public void testGdprChangeset() throws Exception { - testValidData(""); + String gdprChangeset = ""; + testValidData(gdprChangeset); + testValidData(gdprChangeset, true); + testValidData(gdprChangeset, false); } /** @@ -349,12 +400,33 @@ */ @Test public void testRemark() throws Exception { - DataSet ds = testValidData( - "\r\n" + + String query = "\r\n" + "The data included in this document is from www.openstreetmap.org. The data is made available under ODbL.\r\n" + "\r\n" + "runtime error: Query ran out of memory in \"query\" at line 5.\r\n" + - ""); - assertEquals("runtime error: Query ran out of memory in \"query\" at line 5.", ds.getRemark()); + ""; + for (DataSet ds : Arrays.asList(testValidData(query), testValidData(query, true), testValidData(query, false))) { + assertEquals("runtime error: Query ran out of memory in \"query\" at line 5.", ds.getRemark()); + } } + + /** + * Test reading a file with unknown attributes in osm primitives + * @throws Exception if any error occurs + */ + @Test + public void testUnknownAttributeTags() throws Exception { + String testData = "" + + "" + ""; + DataSet ds = testValidData(testData); + assertEquals(0, ds.getNodes().iterator().next().getKeys().size()); + + ds = testValidData(testData, true); + Node firstNode = ds.getNodes().iterator().next(); + assertEquals(1, firstNode.getKeys().size()); + assertEquals("randomvalue", firstNode.get("randomkey")); + + ds = testValidData(testData, false); + assertEquals(0, ds.getNodes().iterator().next().getKeys().size()); + } }