Changeset 4243 in josm for trunk/src/org
- Timestamp:
- 2011-07-14T18:05:50+02:00 (13 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/Preferences.java
r4230 r4243 605 605 putDefault(key, Integer.toString(def)); 606 606 String v = get(key); 607 if( null == v)607 if(v.isEmpty()) 608 608 return def; 609 609 … … 619 619 putDefault(key, Integer.toString(def)); 620 620 String v = get(key+"."+specName); 621 if( null == v)621 if(v.isEmpty()) 622 622 v = get(key); 623 if( null == v)623 if(v.isEmpty()) 624 624 return def; 625 625 -
trunk/src/org/openstreetmap/josm/io/NmeaReader.java
r3083 r4243 266 266 267 267 // handle the packet content 268 if(e[0].equals("$GPGGA") ) {268 if(e[0].equals("$GPGGA") || e[0].equals("$GNGGA")) { 269 269 // Position 270 270 LatLon latLon = parseLatLon( … … 346 346 } 347 347 } 348 } else if(e[0].equals("$GPVTG") ) {348 } else if(e[0].equals("$GPVTG") || e[0].equals("$GNVTG")) { 349 349 // COURSE 350 350 accu = e[GPVTG.COURSE_REF.position]; … … 367 367 } 368 368 } 369 } else if(e[0].equals("$GPGSA") ) {369 } else if(e[0].equals("$GPGSA") || e[0].equals("$GNGSA")) { 370 370 // vdop 371 371 accu=e[GPGSA.VDOP.position]; … … 384 384 } 385 385 } 386 else if(e[0].equals("$GPRMC") ) {386 else if(e[0].equals("$GPRMC") || e[0].equals("$GNRMC")) { 387 387 // coordinates 388 388 LatLon latLon = parseLatLon(
Note:
See TracChangeset
for help on using the changeset viewer.