# HG changeset patch
# User Sascha L. Teichmann <sascha.teichmann@intevation.de>
# Date 1624191032 -7200
# Node ID 72469b713705eb252cd98770e89a562a8d79700d
# Parent  95dafb72a288378de9756c55b6bb9ffd6ed5eef2
XLSX templater: Cosmetics

diff -r 95dafb72a288 -r 72469b713705 pkg/xlsx/templater.go
--- a/pkg/xlsx/templater.go	Sun Jun 20 04:17:53 2021 +0200
+++ b/pkg/xlsx/templater.go	Sun Jun 20 14:10:32 2021 +0200
@@ -66,13 +66,11 @@
 }
 
 func mergeCellToArea(mc excelize.MergeCell) (area, error) {
-	sa := mc.GetStartAxis()
-	x1, y1, err := excelize.CellNameToCoordinates(sa)
+	x1, y1, err := excelize.CellNameToCoordinates(mc.GetStartAxis())
 	if err != nil {
 		return area{}, err
 	}
-	ea := mc.GetEndAxis()
-	x2, y2, err := excelize.CellNameToCoordinates(ea)
+	x2, y2, err := excelize.CellNameToCoordinates(mc.GetEndAxis())
 	if err != nil {
 		return area{}, err
 	}
@@ -86,7 +84,7 @@
 }
 
 func (a *area) contains(x, y int) bool {
-	return x >= a.x1 && x <= a.x2 && y >= a.y1 && y <= a.y2
+	return a.x1 <= x && x <= a.x2 && a.y1 <= y && y <= a.y2
 }
 
 func ActionFromFile(filename string) (*Action, error) {