Changeset 16382 in osm for applications/editors/josm

Timestamp:

2009-07-08T16:30:54+02:00 (16 years ago)

Author:

stoecker

Message:

tcxplugin moved into dataimport - patch by dmuecke

Location:

applications/editors/josm/plugins

Files:

• build.xml (modified) (2 diffs)
• dataimport/.classpath (modified) (1 diff)
• dataimport/README (modified) (1 diff)
• dataimport/build.xml (modified) (2 diffs)
• dataimport/lib/jaxb-api.jar (copied) (copied from applications/editors/josm/plugins/tcxplugin/lib/jaxb-api.jar )
• dataimport/lib/jaxb-impl.jar (copied) (copied from applications/editors/josm/plugins/tcxplugin/lib/jaxb-impl.jar )
• dataimport/lib/jsr173-1.0_api.jar (copied) (copied from applications/editors/josm/plugins/tcxplugin/lib/jsr173-1.0_api.jar )
• dataimport/src/org/openstreetmap/josm/io/Tcx.java (copied) (copied from applications/editors/josm/plugins/tcxplugin/src/org/openstreetmap/josm/io/TcxReader.java ) (6 diffs)
• dataimport/src/org/openstreetmap/josm/io/tcx (copied) (copied from applications/editors/josm/plugins/tcxplugin/src/org/openstreetmap/josm/io/tcx )
• dataimport/src/org/openstreetmap/josm/plugins/DataImport.java (modified) (1 diff)
• tcxplugin (deleted)

applications/editors/josm/plugins/build.xml

@@ -33 +33 @@
         <ant antfile="build.xml" target="dist" dir="tagging-preset-tester"/>
         <ant antfile="build.xml" target="dist" dir="tageditor"/>
-        <ant antfile="build.xml" target="dist" dir="tcxplugin"/>
         <ant antfile="build.xml" target="dist" dir="terracer"/>
         <ant antfile="build.xml" target="dist" dir="usertools"/>
@@ -74 +73 @@
         <ant antfile="build.xml" target="clean" dir="tagging-preset-tester"/>
         <ant antfile="build.xml" target="clean" dir="tageditor"/>
-        <ant antfile="build.xml" target="clean" dir="tcxplugin"/>
         <ant antfile="build.xml" target="clean" dir="terracer"/>
         <ant antfile="build.xml" target="clean" dir="usertools"/>

applications/editors/josm/plugins/dataimport/.classpath

@@ -3 +3 @@
         <classpathentry kind="src" path="src"/>
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+        <classpathentry exported="true" kind="lib" path="lib/jsr173-1.0_api.jar"/>
+        <classpathentry exported="true" kind="lib" path="lib/jaxb-impl.jar"/>
+        <classpathentry exported="true" kind="lib" path="lib/jaxb-api.jar"/>
+        <classpathentry exported="true" kind="lib" path="lib/activation.jar"/>
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
         <classpathentry kind="output" path="bin"/>

applications/editors/josm/plugins/dataimport/README

@@ -1 @@
-README 
+README
 ======
 
 This plugin adds additional file formats into file open dialog.
 
-Following file formats are support:
+Following file formats get support:
 
 - TangoGPS
+- Garmin Trainings Center TCX

applications/editors/josm/plugins/dataimport/build.xml

@@ -51 +51 @@
     <target name="compile" depends="init">
         <echo message="compiling sources for  ${plugin.jar} ... "/>
-        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
+        <javac srcdir="src" debug="true" destdir="${plugin.build.dir}">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
+            <classpath>
+                <pathelement location="${josm}"/>
+                <fileset dir="lib">
+                    <include name="**/*.jar"/>
+                </fileset>
+            </classpath>
         </javac>
     </target>
@@ -79 +85 @@
         ************************************************
     -->
-            <manifest>
+          <zipfileset src="lib/jsr173-1.0_api.jar" includes="**/*.class"/>
+          <zipfileset src="lib/jaxb-api.jar" includes="**/*.class"/>
+          <zipfileset src="lib/jaxb-api.jar" includes="**/*.properties"/>
+
+          <zipfileset src="lib/jaxb-impl.jar" includes="**/*.class"/>
+
+          <manifest>
                 <attribute name="Author" value="Dieter Muecke"/>
                 <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.DataImport"/>

applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java

@@ -2 +2 @@
 package org.openstreetmap.josm.io;
 
+import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -12 +15 @@
 import javax.xml.datatype.XMLGregorianCalendar;
 
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.ExtensionFileFilter;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.gpx.GpxTrack;
 import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.gui.layer.GpxLayer;
+import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
 import org.openstreetmap.josm.io.tcx.ActivityLapT;
 import org.openstreetmap.josm.io.tcx.ActivityT;
@@ -23 +30 @@
 import org.openstreetmap.josm.io.tcx.TrackpointT;
 import org.openstreetmap.josm.io.tcx.TrainingCenterDatabaseT;
+
 
 /**
@@ -43 +51 @@
  * to the endorsed directory (create it if necessary) of your JRE. Usually it is something like this:
  * \<program files>\Java\jre<java version>\lib\endorsed
- * 
+ *
  * @author adrian <as@nitegate.de>
- * 
+ *
  */
-public class TcxReader {
-
-    private File tcxFile;
+public class Tcx extends FileImporter {
+
+    //private File tcxFile;
 
     private GpxData gpxData;
 
+
+    public Tcx() {
+        super(new ExtensionFileFilter("tcx", "tcx",tr("TCX Files (*.tcx)")));
+    }
+
     /**
      * @param tcxFile
      */
-    public TcxReader(File tcxFile) {
-        super();
-        this.tcxFile = tcxFile;
-        parseFile();
-    }
-
-    /**
-     * 
-     */
-    @SuppressWarnings("unchecked") private void parseFile() {
+    @Override
+    public void importData(File tcxFile) throws IOException {
+        //this.tcxFile = tcxFile;
+        parseFile(tcxFile);
+
+        GpxData gpxData = getGpxData();
+        gpxData.storageFile = tcxFile;
+        GpxLayer gpxLayer = new GpxLayer(gpxData, tcxFile.getName());
+        Main.main.addLayer(gpxLayer);
+        if (Main.pref.getBoolean("marker.makeautomarkers", true))
+        {
+            MarkerLayer ml = new MarkerLayer(gpxData, tr("Markers from {0}", tcxFile.getName()), tcxFile, gpxLayer);
+            if (ml.data.size() > 0)
+            {
+                Main.main.addLayer(ml);
+            }
+        }
+
+    }
+
+    /**
+     *
+     */
+    @SuppressWarnings("unchecked") private void parseFile(File tcxFile) {
         try {
             JAXBContext jc = JAXBContext
@@ -96 +123 @@
         PositionT p = tp.getPosition();
 
-        if (p == null) {
+        if (p == null)
             // If the TrackPointT lacks a position, return null.
             return null;
-        }
 
         WayPoint waypt = new WayPoint(new LatLon(p.getLatitudeDegrees(),
@@ -189 +215 @@
     }
 
-    public GpxData getGpxData() {
+    private GpxData getGpxData() {
         return gpxData;
     }

applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/DataImport.java

@@ -4 +4 @@
 package org.openstreetmap.josm.plugins;
 
+import java.io.IOException;
+
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
 import org.openstreetmap.josm.io.TangoGPS;
+import org.openstreetmap.josm.io.Tcx;
 
 public class DataImport extends Plugin {
 
-        /**
-         * Add new File import filter into open dialog
-         */
-        public DataImport() {
-                super();
-                ExtensionFileFilter.importers.add(new TangoGPS());
-        }
+    /**
+     * Add new File import filter into open dialog
+     */
+    public DataImport() throws IOException{
+        super();
+
+        ExtensionFileFilter.importers.add(new TangoGPS());
+        ExtensionFileFilter.importers.add(new Tcx());
+    }
+
 
 }