Changeset 4243 in josm

Timestamp:

2011-07-14T18:05:50+02:00 (13 years ago)

Author:

stoecker

Message:

fix track coloring and NMEA import

Location:

trunk

Files:

• build.xml (modified) (2 diffs)
• src/org/openstreetmap/josm/data/Preferences.java (modified) (2 diffs)
• src/org/openstreetmap/josm/io/NmeaReader.java (modified) (4 diffs)

trunk/build.xml

@@ -21 +21 @@
     </condition>
     <!-- Java classpath addition (all jar files to compile tests with this) -->
-    <path id="classpath">
+    <!-- <path id="classpath">
         <fileset dir="lib">
             <include name="**/*.jar"/>
         </fileset>
-    </path>
+    </path> -->
     <!--
           ** Used by Eclipse ant builder for updating
@@ -106 +106 @@
     </target>
     <target name="compile" depends="init">
-        <javac srcdir="src" classpathref="classpath" includes="com/drew/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.5" source="1.5" debug="on" encoding="iso-8859-1"/>
-        <javac srcdir="src" classpathref="classpath" excludes="com/drew/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.5" source="1.5" debug="on" encoding="UTF-8">
+        <javac srcdir="src" includes="com/drew/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.5" source="1.5" debug="on" encoding="iso-8859-1"/>
+        <javac srcdir="src" excludes="com/drew/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.5" source="1.5" debug="on" encoding="UTF-8">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -605 +605 @@
         putDefault(key, Integer.toString(def));
         String v = get(key);
-        if(null == v)
+        if(v.isEmpty())
             return def;
 
@@ -619 +619 @@
         putDefault(key, Integer.toString(def));
         String v = get(key+"."+specName);
-        if(null == v)
+        if(v.isEmpty())
             v = get(key);
-        if(null == v)
+        if(v.isEmpty())
             return def;
 

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

@@ -266 +266 @@
 
             // handle the packet content
-            if(e[0].equals("$GPGGA")) {
+            if(e[0].equals("$GPGGA") || e[0].equals("$GNGGA")) {
                 // Position
                 LatLon latLon = parseLatLon(
@@ -346 +346 @@
                     }
                 }
-            } else if(e[0].equals("$GPVTG")) {
+            } else if(e[0].equals("$GPVTG") || e[0].equals("$GNVTG")) {
                 // COURSE
                 accu = e[GPVTG.COURSE_REF.position];
@@ -367 +367 @@
                     }
                 }
-            } else if(e[0].equals("$GPGSA")) {
+            } else if(e[0].equals("$GPGSA") || e[0].equals("$GNGSA")) {
                 // vdop
                 accu=e[GPGSA.VDOP.position];
@@ -384 +384 @@
                 }
             }
-            else if(e[0].equals("$GPRMC")) {
+            else if(e[0].equals("$GPRMC") || e[0].equals("$GNRMC")) {
                 // coordinates
                 LatLon latLon = parseLatLon(