NodeDistance is now using the great circle distance using postgres packages cube and earthdistance;

create extension cube; create extension earthdistance;
CREATE VIEW site_distances AS SELECT x.site as "site1", x.id as "site1id", y.site as "site2", y.id as "site2id", point(x.longitude, x.latitude) <@> point(y.longitude, y.latitude) AS "distance" FROM vivo_aggregated.site_location AS x, vivo_aggregated.site_location AS y;

Author: tabish

src/main/java/edu/uiowa/slis/graphtaglib/filters/NodeDistance.java

@@ -60,14 +60,14 @@ public void filterNodes(Graph theGraph, String selectedNode, int radius) {
 	    // Get co-authors for node and add edge to graph only if that
 	    // neighbor is within our radius
 	    PreparedStatement theStmt = conn
-		    .prepareStatement("select candidate.* from vivo_aggregated.site_loc as candidate, vivo_aggregated.site_loc as center where center.id=? and circle(center.position,(?/111.0)) @> candidate.position");
+		    .prepareStatement("select site2id, site2 from vivo_aggregated.site_distances where site_distances.site1id=? and site_distances.distance<=?");
 
 	    theStmt.setInt(1, Integer.parseInt(selectedNode));
 	    theStmt.setInt(2, radius);
 	    logger.debug("Query:: " + theStmt.toString());
 	    ResultSet rs = theStmt.executeQuery();
 	    while (rs.next()) {
-		logger.trace(rs.getString(1) + ' ' + rs.getString(2) + ' ' + rs.getString(3));
+		logger.trace(rs.getString(1) + ' ' + rs.getString(2));
 		sites += rs.getString(1) + " ";
 		sites_hash.put(rs.getInt(1), rs.getString(2));
 	    }