when we have a full week, take sorting by year into account

Author: glaslos

openhours.go

@@ -247,7 +247,10 @@ func merge(o []time.Time) []time.Time {
 		if o[i].Day() == o[j].Day() {
 			return o[i].Hour() < o[j].Hour()
 		}
-		return o[i].Day() < o[j].Day()
+		if o[i].Year() == o[j].Year() {
+			return o[i].Day() < o[j].Day()
+		}
+		return o[i].Year() < o[j].Year()
 	})
 	for i := 0; i < len(o); i += 2 {
 		for j := i + 2; j < len(o); j += 2 {

openhours_test.go

@@ -241,6 +241,15 @@ func TestNew(t *testing.T) {
 			newDate(4, 10, 30, 0, 0, l), newDate(4, 13, 0, 0, 0, l),
 			newDate(4, 14, 0, 0, 0, l), newDate(4, 24, 0, 0, 0, l),
 		}},
+		{"", "Mo-Sa 10:00-21:00; Su 12:00-19:00", l, []time.Time{
+			time.Date(2016, 12, 31, 12, 0, 0, 0, l), time.Date(2016, 12, 31, 19, 0, 0, 0, l),
+			newDate(1, 10, 0, 0, 0, l), newDate(1, 21, 0, 0, 0, l),
+			newDate(2, 10, 0, 0, 0, l), newDate(2, 21, 0, 0, 0, l),
+			newDate(3, 10, 0, 0, 0, l), newDate(3, 21, 0, 0, 0, l),
+			newDate(4, 10, 0, 0, 0, l), newDate(4, 21, 0, 0, 0, l),
+			newDate(5, 10, 0, 0, 0, l), newDate(5, 21, 0, 0, 0, l),
+			newDate(6, 10, 0, 0, 0, l), newDate(6, 21, 0, 0, 0, l),
+		}},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {