public static final Field WAYPT_NAME = new Field("fieldname.waypointname", true);
public static final Field WAYPT_TYPE = new Field("fieldname.waypointtype", true);
public static final Field DESCRIPTION = new Field("fieldname.description", true);
+ public static final Field COMMENT = new Field("fieldname.comment", true);
public static final Field NEW_SEGMENT = new Field("fieldname.newsegment", true);
public static final Field SPEED = new Field("fieldname.speed", true);
*/
public String getName()
{
- if (_labelKey != null)
+ if (_labelKey != null) {
return I18nManager.getText(_labelKey);
+ }
return _customLabel;
}
private String _latitude = null, _longitude = null;
private GpxTag _elevation = new GpxTag(), _time = new GpxTag();
private GpxTag _type = new GpxTag(), _description = new GpxTag();
- private GpxTag _link = new GpxTag();
+ private GpxTag _link = new GpxTag(), _comment = new GpxTag();
private GpxTag _currentTag = null;
private ArrayList<String[]> _pointList = new ArrayList<String[]>();
private ArrayList<String> _linkList = new ArrayList<String>();
_type.setValue(null);
_link.setValue(null);
_description.setValue(null);
+ _comment.setValue(null);
}
else if (tag.equals("ele")) {
_currentTag = _elevation;
else if (tag.equals("description") || tag.equals("desc")) {
_currentTag = _description;
}
+ else if (tag.equals("cmt")) {
+ _currentTag = _comment;
+ }
else if (tag.equals("link")) {
_link.setValue(attributes.getValue("href"));
}
private void processPoint()
{
// Put the values into a String array matching the order in getFieldArray()
- String[] values = new String[8];
+ String[] values = new String[9];
values[0] = _latitude;
values[1] = _longitude;
values[2] = _elevation.getValue();
}
values[6] = _type.getValue();
values[7] = _description.getValue();
+ values[8] = _comment.getValue();
_pointList.add(values);
_trackNameList.addPoint(_trackNum, _trackName.getValue(), _isTrackPoint);
_linkList.add(_link.getValue());
{
final Field[] fields = {Field.LATITUDE, Field.LONGITUDE, Field.ALTITUDE,
Field.WAYPT_NAME, Field.TIMESTAMP, Field.NEW_SEGMENT,
- Field.WAYPT_TYPE, Field.DESCRIPTION};
+ Field.WAYPT_TYPE, Field.DESCRIPTION, Field.COMMENT};
return fields;
}
}
source = replaceGpxTags(source, "<desc>", "</desc>",
XmlUtils.fixCdata(inPoint.getFieldValue(Field.DESCRIPTION)));
+ source = replaceGpxTags(source, "<cmt>", "</cmt>", inPoint.getFieldValue(Field.COMMENT));
}
// photo / audio links
if (source != null && (inPoint.hasMedia() || source.indexOf("</link>") > 0)) {
inWriter.write(XmlUtils.fixCdata(inPoint.getWaypointName().trim()));
inWriter.write("</name>\n");
// description, if any
- String desc = XmlUtils.fixCdata(inPoint.getFieldValue(Field.DESCRIPTION));
+ final String desc = XmlUtils.fixCdata(inPoint.getFieldValue(Field.DESCRIPTION));
if (desc != null && !desc.equals(""))
{
inWriter.write("\t\t<desc>");
inWriter.write(desc);
inWriter.write("</desc>\n");
}
+ // comment, if any
+ final String comment = XmlUtils.fixCdata(inPoint.getFieldValue(Field.COMMENT));
+ if (comment != null && !comment.equals(""))
+ {
+ inWriter.write("\t\t<cmt>");
+ inWriter.write(comment);
+ inWriter.write("</cmt>\n");
+ }
// Media links, if any
if (inSettings.getExportPhotoPoints() && inPoint.getPhoto() != null)
{