Added a check for negative integrated data points that represent values below the detection limit. Fixed city name and site name queries. Fixed long heat map X-axis labels that were not always being rotated. Added a border to the heat map legend. Added a feature that automatically makes the heat map background light grey if the legend goes nearly all the way to white. Added a new Cube Helix colour gradient (https://people.phy.cam.ac.uk/dag9/CUBEHELIX/) for the heat maps. Fixed empty brackets appearing in the report/heat map titles when there are no units.

Author: dbeaudoinfortin

heatmaps/Continuous_By Day of the Month and Month_C8.png

@@ -186,7 +186,9 @@ protected String getReportTitle(String units) {
 			break;
 		}
 
-		if(!getConfig().getAggregateFunction().equals(AggregateFunction.NONE) && !getConfig().getAggregateFunction().equals(AggregateFunction.COUNT)) {
+		if(units != null && !units.isEmpty()
+				&& !getConfig().getAggregateFunction().equals(AggregateFunction.NONE)
+				&& !getConfig().getAggregateFunction().equals(AggregateFunction.COUNT)) {
 			title.append(" (");
 			title.append(units);
 			title.append(")");

heatmaps/Continuous_By Day of the Month and Month_C9.png

@@ -63,6 +63,59 @@ public class HeatMapGradient {
 			Color.decode("#000000"), //Black
 	};
 
+	private static final Color[] CUBEHELIX_GRADIENT = new Color[] {
+			Color.decode("#000000"),
+			Color.decode("#090309"),
+			Color.decode("#100614"),
+			Color.decode("#160a1f"),
+			Color.decode("#190f2b"),
+			Color.decode("#1a1536"),
+			Color.decode("#1a1c3f"),
+			Color.decode("#182448"),
+			Color.decode("#152d4e"),
+			Color.decode("#123752"),
+			Color.decode("#104153"),
+			Color.decode("#0e4b53"),
+			Color.decode("#0d544f"),
+			Color.decode("#0e5d4b"),
+			Color.decode("#126644"),
+			Color.decode("#176d3d"),
+			Color.decode("#207336"),
+			Color.decode("#2a782f"),
+			Color.decode("#387b29"),
+			Color.decode("#477d25"),
+			Color.decode("#577d23"),
+			Color.decode("#697d24"),
+			Color.decode("#7b7c28"),
+			Color.decode("#8d7a2f"),
+			Color.decode("#9e7938"),
+			Color.decode("#ae7745"),
+			Color.decode("#bd7654"),
+			Color.decode("#c87564"),
+			Color.decode("#d27677"),
+			Color.decode("#d9788a"),
+			Color.decode("#dd7b9d"),
+			Color.decode("#de80af"),
+			Color.decode("#de86c1"),
+			Color.decode("#db8dd1"),
+			Color.decode("#d795de"),
+			Color.decode("#d29fe9"),
+			Color.decode("#cca9f1"),
+			Color.decode("#c7b3f7"),
+			Color.decode("#c3bdfa"),
+			Color.decode("#c0c8fb"),
+			Color.decode("#bed1fa"),
+			Color.decode("#bfdaf8"),
+			Color.decode("#c2e2f6"),
+			Color.decode("#c7e9f3"),
+			Color.decode("#cdeff1"),
+			Color.decode("#d6f3f0"),
+			Color.decode("#e0f7f0"),
+			Color.decode("#eafaf3"),
+			Color.decode("#f5fdf8"),
+			Color.decode("#ffffff")
+	};
+	
 
 	private static final List<Color[]> GRADIENTS = new ArrayList<Color[]>();
 
@@ -73,6 +126,7 @@ public class HeatMapGradient {
 		GRADIENTS.add(COLOUR_BLIND_GRADIENT);
 		GRADIENTS.add(BLACK_RED_ORANGE_GRADIENT);
 		GRADIENTS.add(WHITE_HOT_GRADIENT);
+		GRADIENTS.add(CUBEHELIX_GRADIENT);
 		GRADIENTS.add(GREY_GRADIENT);
 	}
 

src/main/java/com/dbf/naps/data/analysis/DataQueryRunner.java

@@ -112,7 +112,7 @@ private static void renderHeatMap(File dataFile, List<DataQueryRecord> records,
 		final int halfCellHeight = cellHeight / 2;
 
 		//Only rotate the x-axis labels when they are too big
-		final boolean rotateXLabels = (xAxisLabelHeight - labelPadding) > cellWidth;
+		final boolean rotateXLabels = (xAxisLabelHeight ) > (cellWidth- labelPadding);
 		if(!rotateXLabels) {
 			xAxisLabelHeight = xAxisLabelMaxSize.getValue();
 		}
@@ -182,8 +182,13 @@ private static void renderHeatMap(File dataFile, List<DataQueryRecord> records,
 
         //Start the actual drawing onto the canvas
 		 try {
-			//Make the background all white
-			g2d.setColor(Color.WHITE);
+			//Make the background all white, except if the colour scale goes to white
+			Color maxColour = HeatMapGradient.getColour(1.0, colourGradient);
+			if(maxColour.getBlue() > 240 && maxColour.getGreen() > 240 && maxColour.getRed() > 240) {
+				g2d.setColor(new Color(210, 210, 210));
+			} else {
+				g2d.setColor(Color.WHITE);
+			}
 			g2d.fillRect(0, 0, imageWidth, imageHeight);
 
 			//Render the text smoothly
@@ -230,6 +235,10 @@ private static void renderHeatMap(File dataFile, List<DataQueryRecord> records,
 				g2d.fillRect(legendStartPosX, legendStartPosY + (i * cellHeight), cellWidth, cellHeight);	
     		}
 
+    		//Render the legend border on top of the boxes
+    		g2d.setColor(Color.BLACK);
+    		g2d.drawRect(legendStartPosX, legendStartPosY, cellWidth-1, (cellHeight*legendBoxes) -1);
+    		
     		//Will will need to determine the width of each title individually using fontMetrics
     		g2d.setFont(smallTitleFont);
     		g2d.setColor(Color.BLACK); //Reset back to black! The last colour was from the legend

src/main/java/com/dbf/naps/data/analysis/heatmap/HeatMapGradient.java

@@ -29,8 +29,8 @@ public interface DataMapper {
 			+ " d.year >= #{startYear} and d.year <= #{endYear}"
 			+ "<if test=\"valueUpperBound != null\">and d.data &lt;= #{valueUpperBound}</if>"
 			+ "<if test=\"valueLowerBound != null\">and d.data &gt;= #{valueLowerBound}</if>"
-			+ "<if test=\"siteName != null &amp;&amp; !siteName.isEmpty()\">and s.station_name LIKE '%#{siteName}%'</if>"
-			+ "<if test=\"cityName != null &amp;&amp; !cityName.isEmpty()\">and s.city_name LIKE '%#{cityName}%'</if>"
+			+ "<if test=\"siteName != null &amp;&amp; !siteName.isEmpty()\">and s.station_name LIKE '%' || #{siteName} || '%'</if>"
+			+ "<if test=\"cityName != null &amp;&amp; !cityName.isEmpty()\">and s.city_name LIKE '%' || #{cityName} || '%'</if>"
 			+ "<if test=\"provTerr != null &amp;&amp; !provTerr.isEmpty()\">and s.prov_terr in <foreach collection='provTerr' item='prov' index='index' open='(' separator = ',' close=')'>#{prov}</foreach></if>"
 			+ "<if test=\"siteType != null &amp;&amp; !siteType.isEmpty()\">and s.site_type in <foreach collection='siteType' item='sType' index='index' open='(' separator = ',' close=')'>#{sType}</foreach></if>"
 			+ "<if test=\"urbanization != null &amp;&amp; !urbanization.isEmpty()\">and s.urbanization in <foreach collection='urbanization' item='urb' index='index' open='(' separator = ',' close=')'>#{urb}</foreach></if>"
@@ -71,8 +71,8 @@ public List<DataRecordGroup> getExportDataGroups(
 			+ " where 1=1"
 			+ "<if test=\"valueUpperBound != null\">and d.data &lt;= #{valueUpperBound}</if>"
 			+ "<if test=\"valueLowerBound != null\">and d.data &gt;= #{valueLowerBound}</if>"
-			+ "<if test=\"siteName != null &amp;&amp; !siteName.isEmpty()\">and s.station_name LIKE '%#{siteName}%'</if>"
-			+ "<if test=\"cityName != null &amp;&amp; !cityName.isEmpty()\">and s.city_name LIKE '%#{cityName}%'</if>"
+			+ "<if test=\"siteName != null &amp;&amp; !siteName.isEmpty()\">and s.station_name LIKE '%' || #{siteName} || '%'</if>"
+			+ "<if test=\"cityName != null &amp;&amp; !cityName.isEmpty()\">and s.city_name LIKE '%' || #{cityName} || '%'</if>"
 			+ "<if test=\"provTerr != null &amp;&amp; !provTerr.isEmpty()\">and s.prov_terr in <foreach collection='provTerr' item='prov' index='index' open='(' separator = ',' close=')'>#{prov}</foreach></if>"
 			+ "<if test=\"siteType != null &amp;&amp; !siteType.isEmpty()\">and s.site_type in <foreach collection='siteType' item='sType' index='index' open='(' separator = ',' close=')'>#{sType}</foreach></if>"
 			+ "<if test=\"urbanization != null &amp;&amp; !urbanization.isEmpty()\">and s.urbanization in <foreach collection='urbanization' item='urb' index='index' open='(' separator = ',' close=')'>#{urb}</foreach></if>"
@@ -131,8 +131,8 @@ public List<String> getDistinctUnits(
 			+ " where 1=1"
 			+ "<if test=\"valueUpperBound != null\">and d.data &lt;= #{valueUpperBound}</if>"
 			+ "<if test=\"valueLowerBound != null\">and d.data &gt;= #{valueLowerBound}</if>"
-			+ "<if test=\"siteName != null &amp;&amp; !siteName.isEmpty()\">and s.station_name LIKE '%#{siteName}%'</if>"
-			+ "<if test=\"cityName != null &amp;&amp; !cityName.isEmpty()\">and s.city_name LIKE '%#{cityName}%'</if>"
+			+ "<if test=\"siteName != null &amp;&amp; !siteName.isEmpty()\">and s.station_name LIKE '%' || #{siteName} || '%'</if>"
+			+ "<if test=\"cityName != null &amp;&amp; !cityName.isEmpty()\">and s.city_name LIKE '%' || #{cityName} || '%'</if>"
 			+ "<if test=\"provTerr != null &amp;&amp; !provTerr.isEmpty()\">and s.prov_terr in <foreach collection='provTerr' item='prov' index='index' open='(' separator = ',' close=')'>#{prov}</foreach></if>"
 			+ "<if test=\"siteType != null &amp;&amp; !siteType.isEmpty()\">and s.site_type in <foreach collection='siteType' item='sType' index='index' open='(' separator = ',' close=')'>#{sType}</foreach></if>"
 			+ "<if test=\"urbanization != null &amp;&amp; !urbanization.isEmpty()\">and s.urbanization in <foreach collection='urbanization' item='urb' index='index' open='(' separator = ',' close=')'>#{urb}</foreach></if>"

src/main/java/com/dbf/naps/data/analysis/heatmap/HeatMapRunner.java

@@ -21,5 +21,6 @@ public class Constants {
 	public static final int DATASET_YEAR_END   = Year.now().getValue();
 
 	public static final BigDecimal bigDecimal1000 = new BigDecimal(1000);
+	public static final BigDecimal bigDecimal0 = new BigDecimal(0);
 
 }

src/main/java/com/dbf/naps/data/db/mappers/DataMapper.java

@@ -10,6 +10,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.dbf.naps.data.globals.Constants;
+
 public class DataCleaner {
 
 	private static final Logger log = LoggerFactory.getLogger(DataCleaner.class);
@@ -52,13 +54,19 @@ public static BigDecimal parseLongitude(String longitudeRaw) {
 	}
 
 	public static BigDecimal extractDecimalData(String rawValue, boolean ignoreError) {
-		//Data points are allowed to be null
+		//These all represent missing data points
+		//Data points are allowed to be null.
+		//Negative data points are different. They generally represent "below the detection limit"
 		if (rawValue == null || rawValue.equals("") || rawValue.equals("-") || rawValue.startsWith("-99")) return null;
 
 		try {
 			BigDecimal decimalVal = new BigDecimal(rawValue);
 			 //Make sure the scale is less than the error of a double
 			decimalVal = decimalVal.setScale(10, RoundingMode.HALF_UP);
+			if (decimalVal.compareTo(Constants.bigDecimal0) < 0) {
+				//Negative values are to be treated as below the detection limit and thus zero
+				decimalVal = Constants.bigDecimal0;
+			}
     		return decimalVal;
 		} catch (NumberFormatException e){
 			if(!ignoreError) throw new IllegalArgumentException("Invalid decimal data point: " + rawValue, e);