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

Timestamp:

2013-04-14T12:50:53+02:00 (12 years ago)

Author:

bastiK

Message:

fixed #7648 - GPS-Download in JOSM in specific area not possible

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• GpxReader.java (modified) (1 diff)
• InvalidXmlCharacterFilter.java (added)
• UTFInputStreamReader.java (modified) (1 diff)

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

@@ -423 +423 @@
      * Parse the input stream and store the result in trackData and markerData
      *
+     * @param source the source input stream
+     * @throws IOException if an IO error occurs, e.g. the input stream is closed.
      */
     public GpxReader(InputStream source) throws IOException {
-        this.inputSource = new InputSource(UTFInputStreamReader.create(source, "UTF-8"));
+        InputStream filtered = new InvalidXmlCharacterFilter(source);
+        this.inputSource = new InputSource(UTFInputStreamReader.create(filtered, "UTF-8"));
     }
 
     /**
+     * Parse the GPX data.
      *
-     * @return True if file was properly parsed, false if there was error during parsing but some data were parsed anyway
+     * @param tryToFinish true, if the reader should return at least part of the GPX
+     * data in case of an error.
+     * @return true if file was properly parsed, false if there was error during
+     * parsing but some data were parsed anyway
      * @throws SAXException
      * @throws IOException

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

@@ -2 +2 @@
 package org.openstreetmap.josm.io;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.IOException;
 import java.io.PushbackInputStream;
 import java.io.UnsupportedEncodingException;