Fix missing '-' for negative offset values smaller than an hour

Author: simonpoole

src/main/java/ch/poole/openinghoursparser/VariableTime.java

@@ -57,12 +57,11 @@ public String toString() {
             if (offset != 0) {
                 b.append("(");
                 b.append(event);
-                if (offset > 0) {
-                    b.append("+");
-                }
-                b.append(String.format(Locale.US, "%02d", offset / 60));
+                b.append(offset >= 0 ? '+' : '-');
+                int absOffset = Math.abs(offset);
+                b.append(String.format(Locale.US, "%02d", absOffset / 60));
                 b.append(":");
-                b.append(String.format(Locale.US, "%02d", Math.abs(offset) % 60));
+                b.append(String.format(Locale.US, "%02d", absOffset % 60));
                 b.append(")");
             } else {
                 b.append(event);

test-data/oh.txt-result

@@ -99156,7 +99156,7 @@
 0	Mo-Su 09:30-23:30
 0	Mo-Su 09:30-24:00
 0	Mo-Su 09:30+; Fr,Sa 09:00+
-0	Mo-Su 09:30-(sunset-1:00); Nov-Feb off
+0	Mo-Su 09:30-(sunset-01:00); Nov-Feb off
 1
 0	Mo-Su 09:45-01:00
 0	Mo-Su 09:45-12:25,12:55-17:50
@@ -102824,7 +102824,7 @@
 0	Mo-Su,Su 12:00-23:00; Fr,Sa 12:00-01:00
 0	Mo-Su,Su 15:00-01:00; Th-Sa 15:00-03:00
 0	Mo-Su,Su 17:00-23:00; Fr,Sa 17:00-01:00
-0	Mo-Su (sunrise00:30)-(sunset+00:30)
+0	Mo-Su (sunrise-00:30)-(sunset+00:30)
 0	Mo-Su (sunrise+01:00)-(sunset+01:00)
 0	Mo-Su sunrise-22:00
 0	Mo-Su sunrise-23:00
@@ -136708,9 +136708,9 @@
 1
 1
 0	sunrise
-0	(sunrise+01:00)-(sunset00:30)
-0	(sunrise+01:45)-(sunset00:15)
-0	(sunrise+02:00)-(sunset00:30)
+0	(sunrise+01:00)-(sunset-00:30)
+0	(sunrise+01:45)-(sunset-00:15)
+0	(sunrise+02:00)-(sunset-00:30)
 0	sunrise-12:00
 0	sunrise-16:00
 0	sunrise-16:00
@@ -136743,7 +136743,7 @@
 0	sunset
 0	sunset-24:00
 0	sunset-sunrise
-0	sunset-(sunrise-7:00)
+0	sunset-(sunrise-07:00)
 0	sunset-sunrise open
 0	Su-Su 11:00-24:00
 0	Su-Th 08:00-24:00; Fr-Sa 08:00-01:00

test-data/oh.txt-result-strict

@@ -99156,7 +99156,7 @@
 0	Mo-Su 09:30-23:30
 0	Mo-Su 09:30-24:00
 0	Mo-Su 09:30+; Fr,Sa 09:00+
-0	Mo-Su 09:30-(sunset-1:00); Nov-Feb off
+0	Mo-Su 09:30-(sunset-01:00); Nov-Feb off
 1
 1
 0	Mo-Su 09:45-12:25,12:55-17:50
@@ -102824,7 +102824,7 @@
 1
 1
 1
-0	Mo-Su (sunrise00:30)-(sunset+00:30)
+0	Mo-Su (sunrise-00:30)-(sunset+00:30)
 0	Mo-Su (sunrise+01:00)-(sunset+01:00)
 0	Mo-Su sunrise-22:00
 0	Mo-Su sunrise-23:00
@@ -136708,9 +136708,9 @@
 1
 1
 0	sunrise
-0	(sunrise+01:00)-(sunset00:30)
-0	(sunrise+01:45)-(sunset00:15)
-0	(sunrise+02:00)-(sunset00:30)
+0	(sunrise+01:00)-(sunset-00:30)
+0	(sunrise+01:45)-(sunset-00:15)
+0	(sunrise+02:00)-(sunset-00:30)
 0	sunrise-12:00
 0	sunrise-16:00
 0	sunrise-16:00
@@ -136743,7 +136743,7 @@
 0	sunset
 0	sunset-24:00
 0	sunset-sunrise
-0	sunset-(sunrise-7:00)
+0	sunset-(sunrise-07:00)
 0	sunset-sunrise open
 1
 1