Changeset 6709 in osm for applications/editors/josm/plugins/livegps

Timestamp:

2008-01-29T19:15:15+01:00 (17 years ago)

Author:

t2000

Message:

added configfile to livegps to be able to change host and port where gpsd is running on

Location:

applications/editors/josm/plugins/livegps

Files:

• build.xml (modified) (4 diffs)
• liveGPS.conf (added)
• livegps/LiveGpsAcquirer.java (modified) (4 diffs)
• livegps/LiveGpsDialog.java (modified) (1 diff)
• livegps/LiveGpsPlugin.java (modified) (2 diffs)

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

@@ -10 +10 @@
 
   <!-- compilation properties -->
-  <property name="josm.build.dir"       value="../../core"/>
+  <!--<property name="josm.build.dir"   value="../../JOSM/"/> -->
+  <property name="josm.build.dir"       value="../../core/"/>
   <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
+  <!-- <property name="josm"                    location="../../JOSM/dist/josm-custom.jar" /> -->
   <property name="josm"                 location="../../core/dist/josm-custom.jar" />
   <property name="plugin.build.dir"     value="build"/>
@@ -39 +41 @@
     <copy todir="${plugin.build.dir}/images">
       <fileset dir="images" />
-    </copy>
+    </copy>     
     
     <!-- create jar file -->
@@ -59 +61 @@
         <pathelement path="${josm.build.dir}/build"/>
         <fileset dir="${josm.build.dir}/lib">
+          <include name="/usr/lib/josm/josm.jar"/>
           <include name="**/*.jar"/>
         </fileset>
@@ -68 +71 @@
   <target name="install" depends="dist">
     <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
+        <copy file="liveGPS.conf" todir="${josm.plugins.dir}/livegps/" />
   </target>
 

applications/editors/josm/plugins/livegps/livegps/LiveGpsAcquirer.java

@@ -5 +5 @@
 import java.beans.PropertyChangeListener;
 import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -11 +13 @@
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Properties;
 
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -20 +23 @@
         String gpsdHost = "localhost";
         int gpsdPort = 2947;
+        String configFile = "liveGPS.conf";
         boolean shutdownFlag = false;
     private List<PropertyChangeListener> propertyChangeListener = new ArrayList<PropertyChangeListener>();
@@ -25 +29 @@
     private PropertyChangeEvent lastDataEvent;
         
-        public LiveGpsAcquirer() {
+        public LiveGpsAcquirer(String pluginDir) {
+                                
+                Properties liveGPSconfig = new Properties();
+                
+                FileInputStream fis = null;
+                                
+                try {
+                        fis = new FileInputStream(pluginDir + configFile);
+                } catch (FileNotFoundException e) {
+                        System.err.println("No liveGPS.conf found, using defaults");
+                }
+                
+                if(fis != null)
+                {               
+                        try {
+                                liveGPSconfig.load(fis);
+                                this.gpsdHost = liveGPSconfig.getProperty("host");
+                                this.gpsdPort = Integer.parseInt(liveGPSconfig.getProperty("port"));
+                                
+                        } catch (IOException e) {
+                                System.err.println("Error while loading liveGPS.conf, using defaults");
+                        }
+                        
+                        if(this.gpsdHost == null || this.gpsdPort == 0)
+                        {
+                                System.err.println("Error in liveGPS.conf, using defaults");
+                                this.gpsdHost = "localhost";
+                                this.gpsdPort = 2947;
+                        }
+                }
                 
         }

applications/editors/josm/plugins/livegps/livegps/LiveGpsDialog.java

@@ -73 +73 @@
                 latLabel.setText(data.getLatitude() + "deg");
                 longLabel.setText(data.getLongitude() + "deg");
-                speedLabel.setText((data.getSpeed() * 3.6f) + "km/h"); // m(s to km/h
+                double mySpeed = data.getSpeed() * 3.6f;
+                speedLabel.setText((Math.round(mySpeed*100)/100) + "km/h"); // m(s to km/h
                 courseLabel.setText(data.getCourse() + "deg");
                 

applications/editors/josm/plugins/livegps/livegps/LiveGpsPlugin.java

@@ -30 +30 @@
     private LiveGpsDialog lgpsdialog;
     List<PropertyChangeListener>listenerQueue;
-    
+        
         private GpxData data = new GpxData();
     private LiveGpsLayer lgpslayer;
@@ -125 +125 @@
         {
             if (acquirer == null) {
-                acquirer = new LiveGpsAcquirer();
+                acquirer = new LiveGpsAcquirer(getPluginDir());
                 if (lgpslayer == null) {
                     lgpslayer = new LiveGpsLayer(data);