Ticket #5238: patch_5238_2.txt

File patch_5238_2.txt, 1.8 KB (added by Nakor, 16 years ago)

New patch

Line 
1Index: images/markers/Bridge.png
2===================================================================
3Cannot display: file marked as a binary type.
4svn:mime-type = application/octet-stream
5
6Property changes on: images/markers/Bridge.png
7___________________________________________________________________
8Added: svn:mime-type
9 + application/octet-stream
10
11Index: images/markers/Crossing.png
12===================================================================
13Cannot display: file marked as a binary type.
14svn:mime-type = application/octet-stream
15
16Property changes on: images/markers/Crossing.png
17___________________________________________________________________
18Added: svn:mime-type
19 + application/octet-stream
20
21Index: src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java
22===================================================================
23--- src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (revision 3373)
24+++ src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (working copy)
25@@ -121,8 +121,13 @@
26 name_desc = wpt.getString("desc");
27 }
28
29- if (uri == null)
30- return new Marker(wpt.getCoor(), name_desc, wpt.getString("symbol"), parentLayer, time, offset);
31+ if (uri == null) {
32+ String symbolName=wpt.getString("symbol");
33+ if (symbolName==null) {
34+ symbolName=wpt.getString("sym");
35+ }
36+ return new Marker(wpt.getCoor(), name_desc, symbolName, parentLayer, time, offset);
37+ }
38 else if (uri.endsWith(".wav"))
39 return AudioMarker.create(wpt.getCoor(), name_desc, uri, parentLayer, time, offset);
40 else if (uri.endsWith(".png") || uri.endsWith(".jpg") || uri.endsWith(".jpeg") || uri.endsWith(".gif"))