Merge pull request #173 from jenetics/issues/JPX-170-lenien_gpx_version

#170: lenien gpx version

Author: jenetics

jpx/src/main/java/io/jenetics/jpx/GPX.java

@@ -1966,7 +1966,7 @@ private static String keywords(final GPX gpx) {
 	private static XMLReaders
 	readers(final Function<? super String, Length> lengthParser) {
 		return new XMLReaders()
-			.v00(XMLReader.attr("version").map(Version::of))
+			.v00(XMLReader.attr("version").map(Version::of, Version.V11))
 			.v00(XMLReader.attr("creator"))
 			.v11(Metadata.READER)
 			.v10(XMLReader.elem("name"))

jpx/src/main/java/io/jenetics/jpx/XMLReader.java

@@ -128,6 +128,21 @@ public abstract T read(final XMLStreamReaderAdapter xml, final boolean lenient)
 	 *         {@code null}
 	 */
 	public <B> XMLReader<B> map(final Function<? super T, ? extends B> mapper) {
+		return map(mapper, null);
+	}
+
+	/**
+	 * Create a new reader for the new mapped type {@code B}.
+	 *
+	 * @param mapper the mapper function
+	 * @param devault the default value if the mapping function fails and the
+	 *        reader is in {@link io.jenetics.jpx.GPX.Reader.Mode#LENIENT} mode
+	 * @param <B> the target type of the new reader
+	 * @return a new reader
+	 * @throws NullPointerException if the given {@code mapper} function is
+	 *         {@code null}
+	 */
+	public <B> XMLReader<B> map(final Function<? super T, ? extends B> mapper, B devault) {
 		requireNonNull(mapper);
 
 		return new XMLReader<B>(_name, _type) {
@@ -147,7 +162,7 @@ public B read(final XMLStreamReaderAdapter xml, final boolean lenient)
 							e
 						);
 					} else {
-						return null;
+						return devault;
 					}
 				}
 			}

jpx/src/test/java/io/jenetics/jpx/GPXTest.java

@@ -943,4 +943,21 @@ public void issue162_NumberFormattingParsing() {
 		assertThat(gpx2).isEqualTo(gpx);
 	}
 
+	@Test
+	public void issue170_InvalidGPXVersion() throws IOException {
+		final var resource = "/io/jenetics/jpx/ISSUE-170.gpx";
+		final GPX gpx;
+		try (InputStream in = getClass().getResourceAsStream(resource)) {
+			gpx = GPX.Reader.of(Mode.LENIENT).read(in);
+		}
+
+		assertThat(gpx.getVersion()).isEqualTo("1.1");
+		assertThat(gpx.getCreator()).isEqualTo("Zepp App");
+		assertThat(gpx.getTracks()).hasSize(1);
+		assertThat(gpx.getTracks().get(0).getName().orElseThrow())
+			.isEqualTo("20230507 mile iles");
+		assertThat(gpx.getTracks().get(0).getSegments()).hasSize(1);
+		assertThat(gpx.getTracks().get(0).getSegments().get(0)).hasSize(2);
+	}
+
 }

jpx/src/test/resources/io/jenetics/jpx/ISSUE-170.gpx

@@ -0,0 +1,34 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes' ?>
+<gpx xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd"
+	 xmlns="http://www.topografix.com/GPX/1/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	 xmlns:ns3="http://www.garmin.com/xmlschemas/TrackPointExtension/v1"
+	 creator="Zepp App" version="7.7.5-play"
+>
+	<trk>
+		<name><![CDATA[20230507 mile iles]]></name>
+		<trkseg>
+			<trkpt lat="45.5898" lon="-73.67509">
+				<ele>42.05</ele>
+				<time>2023-05-07T18:34:59Z</time>
+				<extensions>
+					<ns3:TrackPointExtension>
+						<ns3:speed>2.3255813</ns3:speed>
+						<ns3:cad>0.0</ns3:cad>
+						<ns3:hr>72</ns3:hr>
+					</ns3:TrackPointExtension>
+				</extensions>
+			</trkpt>
+			<trkpt lat="45.589817" lon="-73.67511">
+				<ele>42.05</ele>
+				<time>2023-05-07T18:34:59Z</time>
+				<extensions>
+					<ns3:TrackPointExtension>
+						<ns3:speed>2.3255813</ns3:speed>
+						<ns3:cad>0.0</ns3:cad>
+						<ns3:hr>72</ns3:hr>
+					</ns3:TrackPointExtension>
+				</extensions>
+			</trkpt>
+		</trkseg>
+	</trk>
+</gpx>