Changeset 3374 in josm for trunk/src

Timestamp:

2010-07-16T18:15:13+02:00 (14 years ago)

Author:

bastiK

Message:

see #5238 - Add custom icon to GPX marker (patch by Nakor)

File:

• trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java

@@ -122 +122 @@
                 }
 
-                if (uri == null)
-                    return new Marker(wpt.getCoor(), name_desc, wpt.getString("symbol"), parentLayer, time, offset);
+                if (uri == null) {
+                    String symbolName = wpt.getString("symbol");
+                    if (symbolName == null) {
+                        symbolName = wpt.getString("sym");
+                    }
+                    return new Marker(wpt.getCoor(), name_desc, symbolName, parentLayer, time, offset);
+                }
                 else if (uri.endsWith(".wav"))
                     return AudioMarker.create(wpt.getCoor(), name_desc, uri, parentLayer, time, offset);