[Treebase-guts] SF.net SVN: treebase:[719] trunk/treebase-core/src/main/java/org/cipres/ treebase/domain/nexus/nexml/NexmlMatrixConverter.java

[<rv...@us...>]

Revision: 719
          http://treebase.svn.sourceforge.net/treebase/?rev=719&view=rev
Author:   rvos
Date:     2010-06-15 16:05:56 +0000 (Tue, 15 Jun 2010)

Log Message:
-----------
Attaching DarwinCore geocoding predicates to OTUs, bugfix

Modified Paths:
--------------
    trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/nexml/NexmlMatrixConverter.java

Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/nexml/NexmlMatrixConverter.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/nexml/NexmlMatrixConverter.java	2010-06-09 12:40:28 UTC (rev 718)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/nexml/NexmlMatrixConverter.java	2010-06-15 16:05:56 UTC (rev 719)
@@ -333,16 +333,14 @@
 				xmlMatrix.setSeq(seq,xmlOTU);
 			}
 			for ( RowSegment tbSegment : tbSegments ) {
-				if ( tbSegment.getStartIndex() <= charIndex && charIndex <= tbSegment.getEndIndex() ) {
-					Double latitude = tbSegment.getSpecimenLabel().getLatitude();
-					Double longitude = tbSegment.getSpecimenLabel().getLongitude();
-					if ( null != latitude ) {
-						xmlOTU.addAnnotationValue("DwC:DecimalLatitude", Constants.DwCURI, latitude);
-					}
-					if ( null != longitude ) {
-						xmlOTU.addAnnotationValue("DwC:DecimalLongitude", Constants.DwCURI, longitude);
-					}
+				Double latitude = tbSegment.getSpecimenLabel().getLatitude();
+				Double longitude = tbSegment.getSpecimenLabel().getLongitude();
+				if ( null != latitude ) {
+					xmlOTU.addAnnotationValue("DwC:DecimalLatitude", Constants.DwCURI, latitude);
 				}
+				if ( null != longitude ) {
+					xmlOTU.addAnnotationValue("DwC:DecimalLongitude", Constants.DwCURI, longitude);
+				}
 			}			
 		}	
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.