Changeset 3336 in osm for applications/editors

Timestamp:

2007-06-25T19:09:35+02:00 (17 years ago)

Author:

christofd

Message:

changed way's string representation

File:

• applications/editors/josm/plugins/livegps/livegps/LiveGpsData.java (modified) (3 diffs)

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

@@ -21 +21 @@
     private boolean fix;
     private String wayString;
+    private Way way;
     
     /**
@@ -117 +118 @@
      * @return the name of the way that is closest to the current coordinates.
      */
-    public String getWay() {
+    public String getWayInfo() {
         if(wayString == null) {
-            EastNorth eastnorth = Main.proj.latlon2eastNorth(getLatLon()); 
-            Point xy = Main.map.mapView.getPoint(eastnorth); 
-            Way way = Main.map.mapView.getNearestWay(xy);
+            Way way = getWay();
             if(way != null) {
-                wayString = way.get("name") + " (" + way.get("highway") + ")";
+                StringBuilder builder = new StringBuilder();
+                String tmp = way.get("name");
+                if(tmp != null) {
+                    builder.append(tmp);
+                } else {
+                    builder.append("no name");
+                }
+                tmp = way.get("ref");
+                if(tmp != null) {
+                    builder.append(" (").append(tmp).append(")");
+                }
+                tmp = way.get("highway");
+                if(tmp != null) {
+                    builder.append(" {").append(tmp).append("}");
+                }
+                String type = "";
+                tmp = way.get("tunnel");
+                if(tmp != null) {
+                    type = type + "T";
+                }
+                tmp = way.get("bridge");
+                if(tmp != null) {
+                    type = type + "B";
+                }
+                if(type.length() > 0) {
+                    builder.append(" [").append(type).append("]");
+                }
+                wayString = builder.toString();
             } else {
                 wayString = "";
@@ -129 +155 @@
         }
         return wayString;
+    }
+    
+    /**
+     * Returns the closest way to this position.
+     * @return the closest way to this position.
+     */
+    public Way getWay() {
+        if(way == null) {
+            EastNorth eastnorth = Main.proj.latlon2eastNorth(getLatLon()); 
+            Point xy = Main.map.mapView.getPoint(eastnorth); 
+            way = Main.map.mapView.getNearestWay(xy);
+        }
+        return way;
+        
     }