Changeset 16866 in josm for trunk/src/org/openstreetmap/josm/gui/io

Timestamp:

2020-08-10T23:19:10+02:00 (4 years ago)

Author:

simon04

Message:

GpxImporter: compute markerLayerName

Location:

trunk/src/org/openstreetmap/josm/gui/io/importexport

Files:

• GpxImporter.java (modified) (4 diffs)
• NMEAImporter.java (modified) (1 diff)
• RtkLibImporter.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxImporter.java

@@ -124 +124 @@
             boolean parsedProperly = r.parse(true);
             r.getGpxData().storageFile = file;
-            addLayers(loadLayers(r.getGpxData(), parsedProperly, fileName, tr("Markers from {0}", fileName)));
+            addLayers(loadLayers(r.getGpxData(), parsedProperly, fileName));
         } catch (SAXException e) {
             Logging.error(e);
@@ -157 +157 @@
      * @param parsedProperly True if GPX data has been properly parsed by {@link GpxReader#parse}
      * @param gpxLayerName The GPX layer name
-     * @param markerLayerName The marker layer name
      * @return the new GPX and marker layers corresponding to the specified GPX data, to be used with {@link #addLayers}
      * @see #addLayers
      */
-    public static GpxImporterData loadLayers(final GpxData data, final boolean parsedProperly,
-            final String gpxLayerName, String markerLayerName) {
+    public static GpxImporterData loadLayers(final GpxData data, final boolean parsedProperly, final String gpxLayerName) {
         MarkerLayer markerLayer = null;
         GpxRouteLayer gpxRouteLayer = null;
         GpxLayer gpxLayer = new GpxLayer(data, gpxLayerName, data.storageFile != null);
         if (Config.getPref().getBoolean("marker.makeautomarkers", true) && !data.waypoints.isEmpty()) {
-            markerLayer = new MarkerLayer(data, markerLayerName, data.storageFile, gpxLayer);
+            markerLayer = new MarkerLayer(data, tr("Markers from {0}", gpxLayerName), data.storageFile, gpxLayer);
             if (markerLayer.data.isEmpty()) {
                 markerLayer = null;
@@ -211 +209 @@
      * @param associatedFile GPX file
      * @param gpxLayerName The GPX layer name
-     * @param markerLayerName The marker layer name
      * @param progressMonitor The progress monitor
      * @return the new GPX and marker layers corresponding to the specified GPX file
@@ -217 +214 @@
      */
     public static GpxImporterData loadLayers(InputStream is, final File associatedFile,
-            final String gpxLayerName, String markerLayerName, ProgressMonitor progressMonitor) throws IOException {
+                                             final String gpxLayerName, ProgressMonitor progressMonitor) throws IOException {
         try {
             final GpxReader r = new GpxReader(is);
             final boolean parsedProperly = r.parse(true);
             r.getGpxData().storageFile = associatedFile;
-            return loadLayers(r.getGpxData(), parsedProperly, gpxLayerName, markerLayerName);
+            return loadLayers(r.getGpxData(), parsedProperly, gpxLayerName);
         } catch (SAXException e) {
             Logging.error(e);

trunk/src/org/openstreetmap/josm/gui/io/importexport/NMEAImporter.java

@@ -97 +97 @@
      * @param associatedFile NMEA file
      * @param gpxLayerName The GPX layer name
-     * @param markerLayerName The marker layer name
      * @return the new GPX and marker layers corresponding to the specified NMEA file
      * @throws IOException if an I/O error occurs
      */
     public static GpxImporterData loadLayers(InputStream is, final File associatedFile,
-            final String gpxLayerName, String markerLayerName) throws IOException {
+                                             final String gpxLayerName) throws IOException {
         final NmeaReader r = buildAndParse(is);
         final boolean parsedProperly = r.getNumberOfCoordinates() > 0;
         r.getGpxData().storageFile = associatedFile;
-        return GpxImporter.loadLayers(r.getGpxData(), parsedProperly, gpxLayerName, markerLayerName);
+        return GpxImporter.loadLayers(r.getGpxData(), parsedProperly, gpxLayerName);
     }
 

trunk/src/org/openstreetmap/josm/gui/io/importexport/RtkLibImporter.java

@@ -91 +91 @@
      * @param associatedFile RTKLib file
      * @param gpxLayerName The GPX layer name
-     * @param markerLayerName The marker layer name
      * @return the new GPX and marker layers corresponding to the specified RTKLib file
      * @throws IOException if an I/O error occurs
      */
     public static GpxImporterData loadLayers(InputStream is, final File associatedFile,
-            final String gpxLayerName, String markerLayerName) throws IOException {
+                                             final String gpxLayerName) throws IOException {
         final RtkLibPosReader r = buildAndParse(is);
         final boolean parsedProperly = r.getNumberOfCoordinates() > 0;
         r.getGpxData().storageFile = associatedFile;
-        return GpxImporter.loadLayers(r.getGpxData(), parsedProperly, gpxLayerName, markerLayerName);
+        return GpxImporter.loadLayers(r.getGpxData(), parsedProperly, gpxLayerName);
     }