improved parsing of TimePosition values

Author: clausnagel

src/main/java/org/xmlobjects/gml/model/temporal/TimePosition.java

@@ -20,11 +20,11 @@
 package org.xmlobjects.gml.model.temporal;
 
 import org.xmlobjects.gml.model.GMLObject;
+import org.xmlobjects.gml.util.GMLPatterns;
 import org.xmlobjects.xml.TextContent;
 
 import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeParseException;
+import java.time.LocalTime;
 
 public class TimePosition extends GMLObject {
     private TimePositionValue<?> value;
@@ -66,10 +66,11 @@ public void setValue(String value) {
         } else if (content.isDouble()) {
             this.value = new TimeCoordinate(content.getAsDouble());
         } else {
-            try {
-                LocalDate date = LocalDate.parse(value, DateTimeFormatter.ISO_WEEK_DATE);
-                this.value = new CalendarDate(TextContent.of(date.toString()).getAsDate(), CalenderDateType.DATE);
-            } catch (DateTimeParseException e) {
+            this.value = getAsWeekDate(value);
+            if (this.value == null) {
+                this.value = getAsTime(value);
+            }
+            if (this.value == null) {
                 this.value = new OrdinalPosition(value);
             }
         }
@@ -142,4 +143,21 @@ public TimeCoordinate asTimeCoordinate() {
     public boolean isTimeCoordinate() {
         return value instanceof TimeCoordinate;
     }
+
+    private CalendarDate getAsWeekDate(String value) {
+        try {
+            LocalDate date = LocalDate.parse(value, GMLPatterns.ISO_WEEK_DATE);
+            return new CalendarDate(TextContent.of(date.toString()).getAsDate(), CalenderDateType.DATE);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    private ClockTime getAsTime(String value) {
+        try {
+            return new ClockTime(LocalTime.parse(value, GMLPatterns.ISO_TIME));
+        } catch (Exception e) {
+            return null;
+        }
+    }
 }

src/main/java/org/xmlobjects/gml/util/GMLPatterns.java

@@ -19,11 +19,58 @@
 
 package org.xmlobjects.gml.util;
 
+import java.time.chrono.IsoChronology;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.format.ResolverStyle;
+import java.time.format.SignStyle;
+import java.time.temporal.IsoFields;
 import java.util.regex.Pattern;
 
+import static java.time.temporal.ChronoField.*;
+
 public class GMLPatterns {
     public static final Pattern UOM_SYMBOL = Pattern.compile("[^: \\n\\r\\t]+");
     public static final Pattern UOM_URI = Pattern.compile("([a-zA-Z][a-zA-Z0-9\\-+.]*:|\\.\\./|\\./|#).*");
     public static final Pattern AXIS_DIRECTION = Pattern.compile("[+\\-][1-9][0-9]*");
     public static final Pattern OTHER_VALUE = Pattern.compile("other:\\w{2,}");
+
+    public static final DateTimeFormatter ISO_WEEK_DATE = new DateTimeFormatterBuilder()
+            .parseCaseInsensitive()
+            .appendValue(IsoFields.WEEK_BASED_YEAR, 4, 10, SignStyle.EXCEEDS_PAD)
+            .optionalStart()
+            .appendLiteral('-')
+            .optionalEnd()
+            .appendLiteral('W')
+            .appendValue(IsoFields.WEEK_OF_WEEK_BASED_YEAR, 2)
+            .optionalStart()
+            .appendLiteral('-')
+            .optionalEnd()
+            .appendValue(DAY_OF_WEEK, 1)
+            .optionalStart()
+            .appendOffsetId()
+            .toFormatter()
+            .withResolverStyle(ResolverStyle.STRICT)
+            .withChronology(IsoChronology.INSTANCE);
+
+    public static final DateTimeFormatter ISO_TIME = new DateTimeFormatterBuilder()
+            .parseCaseInsensitive()
+            .appendLiteral('T')
+            .appendValue(HOUR_OF_DAY, 2)
+            .optionalStart()
+            .optionalStart()
+            .appendLiteral(':')
+            .optionalEnd()
+            .appendValue(MINUTE_OF_HOUR, 2)
+            .optionalStart()
+            .optionalStart()
+            .appendLiteral(':')
+            .optionalEnd()
+            .appendValue(SECOND_OF_MINUTE, 2)
+            .optionalStart()
+            .appendFraction(NANO_OF_SECOND, 0, 9, true)
+            .optionalStart()
+            .appendOffsetId()
+            .toFormatter()
+            .withResolverStyle(ResolverStyle.LENIENT);
 }