// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
//
// Contact: phylosoft @ gmail . com
-// WWW: www.phylosoft.org/
+// WWW: https://sites.google.com/site/cmzmasek/home/software/forester
package org.forester.archaeopteryx;
import org.forester.phylogeny.data.Distribution;
import org.forester.phylogeny.data.Event;
import org.forester.phylogeny.data.PhylogenyData;
+import org.forester.phylogeny.data.PhylogenyDataUtil;
import org.forester.phylogeny.data.Point;
import org.forester.phylogeny.data.PropertiesMap;
import org.forester.phylogeny.data.Property;
final DefaultMutableTreeNode category = new DefaultMutableTreeNode( name );
top.add( category );
addSubelement( category, NODE_NAME, phylogeny_node.getName() );
- if ( phylogeny_node.getDistanceToParent() != PhylogenyNode.DISTANCE_DEFAULT ) {
+ if ( phylogeny_node.getDistanceToParent() != PhylogenyDataUtil.BRANCH_LENGTH_DEFAULT ) {
addSubelement( category,
NODE_BRANCH_LENGTH,
ForesterUtil.FORMATTER_6.format( phylogeny_node.getDistanceToParent() ) );
}
}
if ( !phylogeny_node.isRoot() ) {
- addSubelement( category, "Depth", String.valueOf( PhylogenyMethods.calculateDepth( phylogeny_node ) ) );
- final double d = PhylogenyMethods.calculateDistanceToRoot( phylogeny_node );
+ addSubelement( category, "Depth", String.valueOf( phylogeny_node.calculateDepth() ) );
+ final double d = phylogeny_node.calculateDistanceToRoot();
if ( d > 0 ) {
addSubelement( category, "Distance to root", String.valueOf( ForesterUtil.FORMATTER_6.format( d ) ) );
}
addSubelement( category, DIST_DESCRIPTION, dist.getDesc() );
if ( ( dist.getPoints() != null ) && ( dist.getPoints().size() > 0 ) ) {
final Point p0 = dist.getPoints().get( 0 );
- if ( p0 != null ) {
+ if ( ( p0 != null ) && !Point.isSeemsEmpty( p0 ) ) {
addSubelement( category, DIST_GEODETIC_DATUM, p0.getGeodeticDatum() );
addSubelement( category, DIST_LATITUDE, String.valueOf( p0.getLatitude() ) );
addSubelement( category, DIST_LONGITUDE, String.valueOf( p0.getLongitude() ) );