Changeset 3374 in josm


Ignore:
Timestamp:
Jul 16, 2010 6:15:13 PM (3 years ago)
Author:
bastiK
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java

    r3237 r3374  
    122122                } 
    123123 
    124                 if (uri == null) 
    125                     return new Marker(wpt.getCoor(), name_desc, wpt.getString("symbol"), parentLayer, time, offset); 
     124                if (uri == null) { 
     125                    String symbolName = wpt.getString("symbol"); 
     126                    if (symbolName == null) { 
     127                        symbolName = wpt.getString("sym"); 
     128                    } 
     129                    return new Marker(wpt.getCoor(), name_desc, symbolName, parentLayer, time, offset); 
     130                } 
    126131                else if (uri.endsWith(".wav")) 
    127132                    return AudioMarker.create(wpt.getCoor(), name_desc, uri, parentLayer, time, offset); 
Note: See TracChangeset for help on using the changeset viewer.