/explore/tile join Accession only when required

fcecd19f · Matija Obreza · f89e2d72 · fcecd19f
Commit fcecd19f authored Dec 22, 2015 by Matija Obreza
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

src/main/java/org/genesys2/server/service/impl/GenesysFilterServiceImpl.java ...enesys2/server/service/impl/GenesysFilterServiceImpl.java +5 -1

No files found.
--- a/src/main/java/org/genesys2/server/service/impl/GenesysFilterServiceImpl.java
+++ b/src/main/java/org/genesys2/server/service/impl/GenesysFilterServiceImpl.java
@@ -284,7 +284,11 @@ public class GenesysFilterServiceImpl implements GenesysFilterService {

 		final DirectMysqlQuery directQuery = new DirectMysqlQuery("accessiongeo", "geo");
 		directQuery.filterTile(zoom, xtile, ytile);
-		directQuery.innerJoin("accession", "a", "a.id=geo.accessionId");
+
+		if (!filters.isEmpty() || !distinct) {
+			// Join accession table when we have filters or looking at details
+			directQuery.innerJoin("accession", "a", "a.id=geo.accessionId");
+		}

 		if (!filters.isEmpty()) {
 			directQuery.join(filters);