Marshaller, Unmarshaller, Importer, Exporter for time series

src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEMarshaller.java

@@ -13,6 +13,7 @@ import org.sig3d.citygml.energyADE3beta8.ObjectFactory;
 import org.w3._1999.xlink.ActuateType;
 import org.w3._1999.xlink.ShowType;
 import org.w3._1999.xlink.TypeType;
+import org.sig3d.citygml.energyADE3beta8.AbstractADEFeatureType;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.datatype.DatatypeConfigurationException;
@@ -68,8 +69,8 @@ public class EnergyADEMarshaller implements ADEMarshaller {
                             .with(OtherResource.class, this::createOtherResource)
                             .with(RegularTimeSeries.class, this::createRegularTimeSeries)
                             .with(RegularTimeSeriesFile.class, this::createRegularTimeSeriesFile)
-                            .with(TypicalValuesTimeSeries.class, this::createTypicalValuesTimeSeries)
-                            .with(TypicalValuesTimeSeriesFile.class, this::createTypicalValuesTimeSeriesFile)
+                            .with(TypicalValuesRegularTimeSeries.class, this::createTypicalValuesTimeSeries)
+                            .with(TypicalValuesRegularTimeSeriesFile.class, this::createTypicalValuesTimeSeriesFile)
                             .with(SensorConnection.class, this::createSensorConnection)
                             .with(WeatherData.class, this::createWeatherData)
                           //  .with(WeatherDataProperty.class, this::createWeatherDataProperty)
@@ -100,8 +101,8 @@ public class EnergyADEMarshaller implements ADEMarshaller {
                             .with(DeviceOperationProperty.class, this::marshalDeviceOperationProperty)
                            // .with(AbstractBuildingPartitionProperty.class, this::marshalAbstractBuildingPartitionProperty)
                             .with(RegularTimeSeriesProperty.class, this::marshalRegularTimeSeriesProperty)
-                            .with(TypicalValuesTimeSeriesFileProperty.class, this::marshalTypicalValuesTimeSeriesFileProperty)
-                            .with(TypicalValuesTimeSeriesProperty.class, this::marshalTypicalValuesTimeSeriesProperty)
+                            .with(TypicalValuesRegularTimeSeriesFileProperty.class, this::marshalTypicalValuesRegularTimeSeriesFileProperty)
+                            .with(TypicalValuesRegularTimeSeriesProperty.class, this::marshalTypicalValuesTimeSeriesProperty)
                            // .with(TypicalValuesTimeSeries.class, this::marshalTypicalValuesTimeSeries)
                            // .with(TypicalValuesTimeSeriesFile.class, this::marshalTypicalValuesTimeSeriesFile)
                            // .with(SensorConnection.class, this::marshalSensorConnection)
@@ -134,8 +135,16 @@ public class EnergyADEMarshaller implements ADEMarshaller {
                             .with(AbstractDeviceProperty.class, this::marshalAbstractDeviceProperty)
                             .with(RegularTimeSeries.class, this::marshalRegularTimeSeries)
                             .with(RegularTimeSeriesFile.class, this::marshalRegularTimeSeriesFile)
-                            .with(TypicalValuesTimeSeries.class, this::marshalTypicalValuesTimeSeries)
-                            .with(TypicalValuesTimeSeriesFile.class, this::marshalTypicalValuesTimeSeriesFile)
+                            .with(MonthlyTimeSeries.class, this::marshalMonthlyTimeSeries)
+                            .with(MonthlyTimeSeriesProperty.class, this::marshalMonthlyTimeSeriesProperty)
+                            .with(MonthlyTimeSeriesFile.class, this::marshalMonthlyTimeSeriesFile)
+                            .with(MonthlyTimeSeriesFileProperty.class, this::marshalMonthlyTimeSeriesFileProperty)
+                            .with(TypicalValuesRegularTimeSeries.class, this::marshalTypicalValuesRegularTimeSeries)
+                            .with(TypicalValuesRegularTimeSeriesFile.class, this::marshalTypicalValuesTimeSeriesFile)
+                            .with(TypicalValuesMonthlyTimeSeries.class, this::marshalTypicalValuesMonthlyTimeSeries)
+                            .with(TypicalValuesMonthlyTimeSeriesProperty.class, this::marshalTypicalValuesMonthlyTimeSeriesProperty)
+                            .with(TypicalValuesMonthlyTimeSeriesFile.class, this::marshalTypicalValuesMonthlyTimeSeriesFile)
+                            .with(TypicalValuesMonthlyTimeSeriesFileProperty.class, this::marshalTypicalValuesMonthlyTimeSeriesFileProperty)
                             .with(SensorConnection.class, this::marshalSensorConnection)
                             .with(WeatherStationProperty.class, this::marshalWeatherStationProperty);
                 }
@@ -992,7 +1001,7 @@ public class EnergyADEMarshaller implements ADEMarshaller {
     /*
      * Convert TypicalValuesTimeSeriesFile to TypicalValuesTimeSeriesFileType.
      */
-    private TypicalValuesTimeSeriesFileType marshalTypicalValuesTimeSeriesFile(TypicalValuesTimeSeriesFile src) {
+    private TypicalValuesTimeSeriesFileType marshalTypicalValuesTimeSeriesFile(TypicalValuesRegularTimeSeriesFile src) {
         TypicalValuesTimeSeriesFileType dest = new TypicalValuesTimeSeriesFileType();
         marshalAbstractTimeSeries(src, dest);
 
@@ -1010,7 +1019,7 @@ public class EnergyADEMarshaller implements ADEMarshaller {
             dest.setStartMonth(BigInteger.valueOf(src.getStartMonth()));
         if (src.isSetUom()) {
             UnitOfMeasureType uom = new UnitOfMeasureType();
-            uom.setUom(src.getUom());
+            uom.setUom(src.getUom().getUom());
             dest.setUom(uom);
         }
         if (src.isSetFileURI())
@@ -1043,7 +1052,7 @@ public class EnergyADEMarshaller implements ADEMarshaller {
     /*
      * Convert TypicalValuesTimeSeriesFileProperty to TypicalValuesTimeSeriesFilePropertyType.
      */
-    private TypicalValuesTimeSeriesFilePropertyType marshalTypicalValuesTimeSeriesFileProperty(TypicalValuesTimeSeriesFileProperty src) {
+    private TypicalValuesTimeSeriesFilePropertyType marshalTypicalValuesRegularTimeSeriesFileProperty(TypicalValuesRegularTimeSeriesFileProperty src) {
         TypicalValuesTimeSeriesFilePropertyType dest = factory.createTypicalValuesTimeSeriesFilePropertyType();
 
         if (src.isSetTypicalValuesTimeSeriesFile()) {
@@ -1076,6 +1085,124 @@ public class EnergyADEMarshaller implements ADEMarshaller {
         return dest;
     }
 
+    /*
+     * Convert TypicalValuesMonthlyTimeSeries to TypicalValuesMonthlyTimeSeriesType.
+     */
+    private TypicalValuesMonthlyTimeSeriesType marshalTypicalValuesMonthlyTimeSeries(TypicalValuesMonthlyTimeSeries src) {
+        TypicalValuesMonthlyTimeSeriesType dest = new TypicalValuesMonthlyTimeSeriesType();
+        marshalAbstractTimeSeries(src, dest);
+
+        if (src.isSetStartMonth()) {
+            dest.setStartMonth(BigInteger.valueOf(src.getStartMonth()));
+        }
+        if (src.isTemporalExtent())
+            dest.setTemporalExtent(marshalTimeIntervalLength(src.getTemporalExtent()));
+        if (src.isSetValuesList())
+            dest.setValuesList(helper.getGMLMarshaller().marshalMeasureList(src.getValuesList()));
+
+        return dest;
+    }
+
+    /*
+     * Convert TypicalValuesMonthlyTimeSeriesProperty to TypicalValuesMonthlyTimeSeriesPropertyType.
+     */
+    private TypicalValuesMonthlyTimeSeriesPropertyType marshalTypicalValuesMonthlyTimeSeriesProperty(TypicalValuesMonthlyTimeSeriesProperty src) {
+        TypicalValuesMonthlyTimeSeriesPropertyType dest = factory.createTypicalValuesMonthlyTimeSeriesPropertyType();
+
+        if (src.isSetTypicalValuesTimeSeriesFile()) {
+            dest.setTypicalValuesMonthlyTimeSeries(marshalTypicalValuesMonthlyTimeSeries(src.getTypicalValuesMonthlyTimeSeries()));
+        }
+        if (src.isSetRemoteSchema())
+            dest.setRemoteSchema(src.getRemoteSchema());
+
+        if (src.isSetType())
+            dest.setType(TypeType.fromValue(src.getType().getValue()));
+
+        if (src.isSetHref())
+            dest.setHref(src.getHref());
+
+        if (src.isSetRole())
+            dest.setRole(src.getRole());
+
+        if (src.isSetArcrole())
+            dest.setArcrole(src.getArcrole());
+
+        if (src.isSetTitle())
+            dest.setTitle(src.getTitle());
+
+        if (src.isSetShow())
+            dest.setShow(ShowType.fromValue(src.getShow().getValue()));
+
+        if (src.isSetActuate())
+            dest.setActuate(ActuateType.fromValue(src.getActuate().getValue()));
+
+        return dest;
+    }
+
+    /*
+     * Convert TypicalValuesMonthlyTimeSeriesFile to TypicalValuesMonthlyTimeSeriesFileType.
+     */
+    private TypicalValuesMonthlyTimeSeriesFileType marshalTypicalValuesMonthlyTimeSeriesFile(TypicalValuesMonthlyTimeSeriesFile src) {
+        TypicalValuesMonthlyTimeSeriesFileType dest = new TypicalValuesMonthlyTimeSeriesFileType();
+        marshalAbstractTimeSeries(src, dest);
+
+        if (src.isSetStartMonth()) {
+            dest.setStartMonth(BigInteger.valueOf(src.getStartMonth()));
+        }
+        if (src.isSetUom())
+            dest.setUom(marshalUnitOfMeasure(src.getUom()));
+        if (src.isSetFileURI())
+            dest.setFileURI(src.getFileURI().toString());
+        if (src.isSetTemporalExtent())
+            dest.setTemporalExtent(marshalTimeIntervalLength(src.getTemporalExtent()));
+        if (src.isSetNumberOfHeaderLines())
+            dest.setNumberOfHeaderLines(BigInteger.valueOf(src.getNumberOfHeaderLines()));
+        if (src.isSetFieldSeparator())
+            dest.setFieldSeparator(src.getFieldSeparator());
+        if (src.isSetRecordSeparator())
+            dest.setRecordSeparator(src.getRecordSeparator());
+        if (src.isSetDecimalSymbol())
+            dest.setDecimalSymbol(src.getDecimalSymbol());
+        if (src.isSetValueColumnNumber())
+            dest.setValueColumnNumber(BigInteger.valueOf(src.getValueColumnNumber()));
+        return dest;
+    }
+
+    /*
+     * Convert TypicalValuesMonthlyTimeSeriesProperty to TypicalValuesMonthlyTimeSeriesPropertyType.
+     */
+    private TypicalValuesMonthlyTimeSeriesFilePropertyType marshalTypicalValuesMonthlyTimeSeriesFileProperty(TypicalValuesMonthlyTimeSeriesFileProperty src) {
+        TypicalValuesMonthlyTimeSeriesFilePropertyType dest = factory.createTypicalValuesMonthlyTimeSeriesFilePropertyType();
+
+        if (src.isSetTypicalValuesMonthlyTimeSeriesFile()) {
+            dest.setTypicalValuesMonthlyTimeSeriesFile(marshalTypicalValuesMonthlyTimeSeriesFile(src.getTypicalValuesMonthlyTimeSeriesFile()));
+        }
+        if (src.isSetRemoteSchema())
+            dest.setRemoteSchema(src.getRemoteSchema());
+
+        if (src.isSetType())
+            dest.setType(TypeType.fromValue(src.getType().getValue()));
+
+        if (src.isSetHref())
+            dest.setHref(src.getHref());
+
+        if (src.isSetRole())
+            dest.setRole(src.getRole());
+
+        if (src.isSetArcrole())
+            dest.setArcrole(src.getArcrole());
+
+        if (src.isSetTitle())
+            dest.setTitle(src.getTitle());
+
+        if (src.isSetShow())
+            dest.setShow(ShowType.fromValue(src.getShow().getValue()));
+
+        if (src.isSetActuate())
+            dest.setActuate(ActuateType.fromValue(src.getActuate().getValue()));
+
+        return dest;
+    }
 
     /*
      * Convert RegularTimeSeriesFile to RegularTimeSeriesFileType.
@@ -1154,7 +1281,7 @@ public class EnergyADEMarshaller implements ADEMarshaller {
     /*
      * Convert TypicalValuesTimeSeries to TypicalValuesTimeSeriesType.
      */
-    private TypicalValuesTimeSeriesType marshalTypicalValuesTimeSeries(TypicalValuesTimeSeries src) {
+    private TypicalValuesTimeSeriesType marshalTypicalValuesRegularTimeSeries(TypicalValuesRegularTimeSeries src) {
         TypicalValuesTimeSeriesType dest = factory.createTypicalValuesTimeSeriesType();
         marshalAbstractTimeSeries(src, dest);
 
@@ -1193,11 +1320,194 @@ public class EnergyADEMarshaller implements ADEMarshaller {
     /*
      * Convert TypicalValuesTimeSeriesProperty to TypicalValuesTimeSeriesPropertyType.
      */
-    private TypicalValuesTimeSeriesPropertyType marshalTypicalValuesTimeSeriesProperty(TypicalValuesTimeSeriesProperty src) {
+    private TypicalValuesTimeSeriesPropertyType marshalTypicalValuesTimeSeriesProperty(TypicalValuesRegularTimeSeriesProperty src) {
         TypicalValuesTimeSeriesPropertyType dest = factory.createTypicalValuesTimeSeriesPropertyType();
 
         if (src.isSetTypicalValuesTimeSeriesProperty()) {
-            dest.setTypicalValuesTimeSeries(marshalTypicalValuesTimeSeries(src.getTypicalValuesTimeSeries()));
+            dest.setTypicalValuesTimeSeries(marshalTypicalValuesRegularTimeSeries(src.getTypicalValuesTimeSeries()));
+        }
+        if (src.isSetRemoteSchema())
+            dest.setRemoteSchema(src.getRemoteSchema());
+
+        if (src.isSetType())
+            dest.setType(TypeType.fromValue(src.getType().getValue()));
+
+        if (src.isSetHref())
+            dest.setHref(src.getHref());
+
+        if (src.isSetRole())
+            dest.setRole(src.getRole());
+
+        if (src.isSetArcrole())
+            dest.setArcrole(src.getArcrole());
+
+        if (src.isSetTitle())
+            dest.setTitle(src.getTitle());
+
+        if (src.isSetShow())
+            dest.setShow(ShowType.fromValue(src.getShow().getValue()));
+
+        if (src.isSetActuate())
+            dest.setActuate(ActuateType.fromValue(src.getActuate().getValue()));
+
+        return dest;
+    }
+
+    /*
+     * Convert MonthlyTimeSeries to MonthlyTimeSeriesType.
+     */
+    private MonthlyTimeSeriesType marshalMonthlyTimeSeries(MonthlyTimeSeries src) {
+        MonthlyTimeSeriesType dest = factory.createMonthlyTimeSeriesType();
+
+        marshalAbstractTimeSeries(src, dest);
+
+        if (src.isSetTemporalExtent()) {
+            dest.setTemporalExtent(marshalTimePeriodProperty(src.getTemporalExtent()));
+        }
+        if (src.isSetValuesList()) {
+            dest.setValuesList(helper.getGMLMarshaller().marshalMeasureList(src.getValuesList()));
+        }
+
+        return dest;
+    }
+
+    /*
+     * Convert MonthlyTimeSeriesProperty to MonthlyTimeSeriesPropertyType.
+     */
+    private MonthlyTimeSeriesPropertyType marshalMonthlyTimeSeriesProperty(MonthlyTimeSeriesProperty src) {
+        MonthlyTimeSeriesPropertyType dest = factory.createMonthlyTimeSeriesPropertyType();
+
+        if (src.isSetMonthlyTimeSeries()) {
+            dest.setMonthlyTimeSeries(marshalMonthlyTimeSeries(src.getMonthlyTimeSeries()));
+        }
+        if (src.isSetRemoteSchema())
+            dest.setRemoteSchema(src.getRemoteSchema());
+
+        if (src.isSetType())
+            dest.setType(TypeType.fromValue(src.getType().getValue()));
+
+        if (src.isSetHref())
+            dest.setHref(src.getHref());
+
+        if (src.isSetRole())
+            dest.setRole(src.getRole());
+
+        if (src.isSetArcrole())
+            dest.setArcrole(src.getArcrole());
+
+        if (src.isSetTitle())
+            dest.setTitle(src.getTitle());
+
+        if (src.isSetShow())
+            dest.setShow(ShowType.fromValue(src.getShow().getValue()));
+
+        if (src.isSetActuate())
+            dest.setActuate(ActuateType.fromValue(src.getActuate().getValue()));
+
+        return dest;
+    }
+
+    /*
+     * Convert MonthlyTimeSeriesFile to MonthlyTimeSeriesFileType.
+     */
+    private MonthlyTimeSeriesFileType marshalMonthlyTimeSeriesFile(MonthlyTimeSeriesFile src) {
+        MonthlyTimeSeriesFileType dest = factory.createMonthlyTimeSeriesFileType();
+
+        marshalAbstractTimeSeries(src, dest);
+
+        if (src.isSetTemporalExtent()) {
+            dest.setTemporalExtent(marshalTimePeriodProperty(src.getTemporalExtent()));
+        }
+        if (src.isSetUom()) {
+            dest.setUom(marshalUnitOfMeasure(src.getUom()));
+        }
+        if (src.isSetFileURI()){
+            dest.setFileURI(src.getFileURI().toString());
+        }
+        if (src.isSetNumberOfHeaderLines())
+            dest.setNumberOfHeaderLines(BigInteger.valueOf(src.getNumberOfHeaderLines()));
+        if (src.isSetFieldSeparator())
+            dest.setFieldSeparator(src.getFieldSeparator());
+        if (src.isSetRecordSeparator())
+            dest.setRecordSeparator(src.getRecordSeparator());
+        if (src.isSetDecimalSymbol())
+            dest.setDecimalSymbol(src.getDecimalSymbol());
+        if (src.isSetValueColumnNumber())
+            dest.setValueColumnNumber(BigInteger.valueOf(src.getValueColumnNumber()));
+
+        return dest;
+    }
+
+    private UnitOfMeasureType marshalUnitOfMeasure(UnitOfMeasure src) {
+        UnitOfMeasureType dest = new UnitOfMeasureType();
+        if (src.isSetUom()) {
+            dest.setUom(src.getUom());
+        }
+        return dest;
+    }
+
+    /*
+     * Convert MonthlyTimeSeriesFileProperty to MonthlyTimeSeriesFilePropertyType.
+     */
+    private MonthlyTimeSeriesFilePropertyType marshalMonthlyTimeSeriesFileProperty(MonthlyTimeSeriesFileProperty src) {
+        MonthlyTimeSeriesFilePropertyType dest = factory.createMonthlyTimeSeriesFilePropertyType();
+
+        if (src.isSetMonthlyTimeSeriesFile()) {
+            dest.setMonthlyTimeSeriesFile(marshalMonthlyTimeSeriesFile(src.getMonthlyTimeSeriesFile()));
+        }
+        if (src.isSetRemoteSchema())
+            dest.setRemoteSchema(src.getRemoteSchema());
+
+        if (src.isSetType())
+            dest.setType(TypeType.fromValue(src.getType().getValue()));
+
+        if (src.isSetHref())
+            dest.setHref(src.getHref());
+
+        if (src.isSetRole())
+            dest.setRole(src.getRole());
+
+        if (src.isSetArcrole())
+            dest.setArcrole(src.getArcrole());
+
+        if (src.isSetTitle())
+            dest.setTitle(src.getTitle());
+
+        if (src.isSetShow())
+            dest.setShow(ShowType.fromValue(src.getShow().getValue()));
+
+        if (src.isSetActuate())
+            dest.setActuate(ActuateType.fromValue(src.getActuate().getValue()));
+
+        return dest;
+    }
+
+    /*
+     * Convert MonthlyTimeSeries to MonthlyTimeSeriesType.
+     */
+    private MonthlyTimeSeriesType marshalTypicalValuesRegularTimeSeries(MonthlyTimeSeries src) {
+        MonthlyTimeSeriesType dest = factory.createMonthlyTimeSeriesType();
+
+        marshalAbstractTimeSeries(src, dest);
+
+        if (src.isSetTemporalExtent()) {
+            dest.setTemporalExtent(marshalTimePeriodProperty(src.getTemporalExtent()));
+        }
+        if (src.isSetValuesList()) {
+            dest.setValuesList(helper.getGMLMarshaller().marshalMeasureList(src.getValuesList()));
+        }
+
+        return dest;
+    }
+
+    /*
+     * Convert MonthlyTimeSeriesProperty to MonthlyTimeSeriesPropertyType.
+     */
+    private MonthlyTimeSeriesPropertyType marshalTypicalValuesTimeSeriesProperty(MonthlyTimeSeriesProperty src) {
+        MonthlyTimeSeriesPropertyType dest = factory.createMonthlyTimeSeriesPropertyType();
+
+        if (src.isSetMonthlyTimeSeries()) {
+            dest.setMonthlyTimeSeries(marshalMonthlyTimeSeries(src.getMonthlyTimeSeries()));
         }
         if (src.isSetRemoteSchema())
             dest.setRemoteSchema(src.getRemoteSchema());
@@ -1235,7 +1545,6 @@ public class EnergyADEMarshaller implements ADEMarshaller {
         marshalAbstractTimeSeries(src, dest);
 
 
-
         if (src.isSetTimeInterval()) {
             dest.setTimeInterval(marshalTimeIntervalLength(src.getTimeInterval()));
         }
@@ -1243,7 +1552,7 @@ public class EnergyADEMarshaller implements ADEMarshaller {
             dest.setTemporalExtent(marshalTimePeriodProperty(src.getTemporalExtent()));
         }
         if (src.isSetValues()) {
-            dest.setValuesList(helper.getGMLMarshaller().marshalMeasureList(src.getValues()));
+            dest.setValuesList(helper.getGMLMarshaller().marshalMeasureList(src.getValuesList()));
         }
 
         return dest;
@@ -2081,6 +2390,9 @@ public class EnergyADEMarshaller implements ADEMarshaller {
 
         helper.getGMLMarshaller().marshalAbstractGML(src, dest);
 
+        if (src.isExternalReference()){
+//            dest.setExternalReference(src.getExternalReference());
+        }
         if (src.isCreationDate())
         {
             dest.setCreationDate(src.getCreationDate());
@@ -2264,15 +2576,15 @@ public class EnergyADEMarshaller implements ADEMarshaller {
         return factory.createRegularTimeSeriesProperty(marshalRegularTimeSeries(src));
     }
 
-    private JAXBElement<?> createTypicalValuesTimeSeries(TypicalValuesTimeSeries src) {
-        return factory.createTypicalValuesTimeSeries(marshalTypicalValuesTimeSeries(src));
+    private JAXBElement<?> createTypicalValuesTimeSeries(TypicalValuesRegularTimeSeries src) {
+        return factory.createTypicalValuesTimeSeries(marshalTypicalValuesRegularTimeSeries(src));
     }
 
     private JAXBElement<?> createSensorConnection(SensorConnection src) {
         return factory.createSensorConnection(marshalSensorConnection(src));
     }
 
-    private JAXBElement<?> createTypicalValuesTimeSeriesFile(TypicalValuesTimeSeriesFile src) {
+    private JAXBElement<?> createTypicalValuesTimeSeriesFile(TypicalValuesRegularTimeSeriesFile src) {
         return factory.createTypicalValuesTimeSeriesFile(marshalTypicalValuesTimeSeriesFile(src));
     }
     private JAXBElement<?> createWeatherData(WeatherData src) {

src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEUnmarshaller.java

 package org.citygml4j.ade.energy3.bind;
 
 import lombok.SneakyThrows;
-import net.opengis.citygml._1.ExternalReferenceType;
 import net.opengis.gml.*;
 import org.citygml4j.ade.energy3.model.core.*;
 import org.citygml4j.ade.energy3.model.supportingClasses.*;
 import org.citygml4j.builder.jaxb.unmarshal.citygml.ade.ADEUnmarshallerHelper;
 import org.citygml4j.model.citygml.ade.binding.ADEModelObject;
 import org.citygml4j.model.citygml.ade.binding.ADEUnmarshaller;
-import org.citygml4j.model.citygml.core.ExternalReference;
 import org.citygml4j.model.common.base.ModelObject;
 import org.citygml4j.model.gml.xlink.XLinkActuate;
 import org.citygml4j.model.gml.xlink.XLinkShow;
@@ -71,9 +69,9 @@ public class EnergyADEUnmarshaller implements ADEUnmarshaller {
                             .with(RegularTimeSeriesPropertyType.class, this::unmarshalRegularTimeSeriesProperty)
                             .with(TypicalValuesTimeSeriesPropertyType.class, this::unmarshalTypicalValuesTimeSeriesProperty)
                             .with(TypicalValuesTimeSeriesType.class, this::unmarshalTypicalValuesTimeSeries)
-                            .with(TypicalValuesTimeSeriesFileType.class, this::unmarshalTypicalValuesTimeSeriesFile)
-                            .with(RegularTimeSeriesFilePropertyType.class, this::unmarshalRegularTimeSeriesFileProperty)
-                            .with(TypicalValuesTimeSeriesFilePropertyType.class, this::unmarshalTypicalValuesTimeSeriesFileProperty)
+                            .with(TypicalValuesTimeSeriesFileType.class, this::unmarshalTypicalValuesRegularTimeSeriesFile)
+//                            .with(RegularTimeSeriesFilePropertyType.class, this::unmarshalRegularTimeSeriesFileProperty)
+                            .with(TypicalValuesTimeSeriesFilePropertyType.class, this::unmarshalTypicalValuesRegularTimeSeriesFileProperty)
                             .with(SensorConnectionPropertyType.class, this::unmarshalSensorConnectionProperty)
                             .with(SensorConnectionType.class, this::unmarshalSensorConnection)
                             .with(RefurbishmentMeasureType.class, this::unmarshalRefurbishmentMeasure)
@@ -88,6 +86,14 @@ public class EnergyADEUnmarshaller implements ADEUnmarshaller {
                             .with(WeatherDataType.class, this::unmarshalWeatherData)
                             .with(AbstractFeatureWithLifeSpanPropertyType.class, this::AbstractFeatureWithLifeSpanProperty)
                             .with(AbstractADEFeaturePropertyType.class, this::unmarshalAbstractADEFeatureProperty)
+                            .with(MonthlyTimeSeriesType.class, this::unmarshalMonthlyTimeSeries)
+                            .with(MonthlyTimeSeriesPropertyType.class, this::unmarshalMonthlyTimeSeriesProperty)
+                            .with(MonthlyTimeSeriesFileType.class, this::unmarshalMonthlyTimeSeriesFile)
+                            .with(MonthlyTimeSeriesFilePropertyType.class, this::unmarshalMonthlyTimeSeriesFileProperty)
+                            .with(TypicalValuesMonthlyTimeSeriesType.class, this::unmarshalTypicalValuesMonthlyTimeSeries)
+                            .with(TypicalValuesMonthlyTimeSeriesPropertyType.class, this::unmarshalTypicalValuesMonthlyTimeSeriesProperty)
+                            .with(TypicalValuesMonthlyTimeSeriesFileType.class, this::unmarshalTypicalValuesMonthlyTimeSeriesFile)
+                            .with(TypicalValuesMonthlyTimeSeriesFilePropertyType.class, this::unmarshalTypicalValuesMonthlyTimeSeriesFileProperty)
                             .with(JAXBElement.class, this::unmarshal);
                 }
             } finally {
@@ -781,8 +787,8 @@ public class EnergyADEUnmarshaller implements ADEUnmarshaller {
     /*
      * Convert TypicalValuesTimeSeriesFileType to TypicalValuesTimeSeriesFile.
      */
-    private TypicalValuesTimeSeriesFile unmarshalTypicalValuesTimeSeriesFile(TypicalValuesTimeSeriesFileType src) throws MissingADESchemaException {
-        TypicalValuesTimeSeriesFile dest = new TypicalValuesTimeSeriesFile();
+    private TypicalValuesRegularTimeSeriesFile unmarshalTypicalValuesRegularTimeSeriesFile(TypicalValuesTimeSeriesFileType src) throws MissingADESchemaException {
+        TypicalValuesRegularTimeSeriesFile dest = new TypicalValuesRegularTimeSeriesFile();
         unmarshalAbstractTimeSeries(src, dest);
 
         if (src.isSetStartTime()){
@@ -792,8 +798,8 @@ public class EnergyADEUnmarshaller implements ADEUnmarshaller {
             dest.setStartDay(src.getStartDay().intValue());
         if (src.isSetStartMonth())
             dest.setStartMonth(src.getStartMonth().intValue());
-        if (src.isSetUom() && src.getUom().isSetUom())
-            dest.setUom(src.getUom().getUom());
+        if (src.isSetUom())
+            dest.setUom(unmarshalUnitOfMeasure(src.getUom()));
         if (src.isSetFileURI()){
             URI uri = URI.create(src.getFileURI());
             dest.setFileURI(uri);
@@ -822,16 +828,24 @@ public class EnergyADEUnmarshaller implements ADEUnmarshaller {
         return dest;
     }
 
+    private UnitOfMeasure unmarshalUnitOfMeasure(UnitOfMeasureType src) throws MissingADESchemaException {
+        UnitOfMeasure dest = new UnitOfMeasure();
+        if (src.isSetUom()) {
+            dest.setUom(src.getUom());
+        }
+        return dest;
+    }
+
     /*
      * Convert TypicalValuesTimeSeriesFilePropertyType to TypicalValuesTimeSeriesFileProperty.
      */
-    private TypicalValuesTimeSeriesFileProperty unmarshalTypicalValuesTimeSeriesFileProperty(TypicalValuesTimeSeriesFilePropertyType src) throws MissingADESchemaException {
-        TypicalValuesTimeSeriesFileProperty dest = new TypicalValuesTimeSeriesFileProperty();
+    private TypicalValuesRegularTimeSeriesFileProperty unmarshalTypicalValuesRegularTimeSeriesFileProperty(TypicalValuesTimeSeriesFilePropertyType src) throws MissingADESchemaException {
+        TypicalValuesRegularTimeSeriesFileProperty dest = new TypicalValuesRegularTimeSeriesFileProperty();
 
         if (src.isSetTypicalValuesTimeSeriesFile()) {
             ModelObject object = helper.getJAXBUnmarshaller().unmarshal(src.getTypicalValuesTimeSeriesFile());
-            if (object instanceof TypicalValuesTimeSeriesFile)
-                dest.setTypicalValuesTimeSeriesFile((TypicalValuesTimeSeriesFile) object);
+            if (object instanceof TypicalValuesRegularTimeSeriesFile)
+                dest.setTypicalValuesTimeSeriesFile((TypicalValuesRegularTimeSeriesFile) object);
         }
 
         if (src.isSetRemoteSchema())
@@ -862,15 +876,226 @@ public class EnergyADEUnmarshaller implements ADEUnmarshaller {
     }
 
     /*
-     * Convert RegularTimeSeriesFilePropertyType to RegularTimeSeriesFileProperty.
+     * Convert MonthlyTimeSeriesType to MonthlyTimeSeries.
      */
-    private RegularTimeSeriesFileProperty unmarshalRegularTimeSeriesFileProperty(RegularTimeSeriesFilePropertyType src) throws MissingADESchemaException {
-        RegularTimeSeriesFileProperty dest = new RegularTimeSeriesFileProperty();
+    private MonthlyTimeSeries unmarshalMonthlyTimeSeries(MonthlyTimeSeriesType src) throws MissingADESchemaException {
+        MonthlyTimeSeries dest = new MonthlyTimeSeries();
+        unmarshalAbstractTimeSeries(src, dest);
 
-        if (src.isSetRegularTimeSeriesFile()) {
-            ModelObject object = helper.getJAXBUnmarshaller().unmarshal(src.getRegularTimeSeriesFile());
-            if (object instanceof RegularTimeSeriesFile)
-                dest.setRegularTimeSeriesFile((RegularTimeSeriesFile) object);
+        if (src.isSetTemporalExtent())
+            dest.setTemporalExtent(unmarshalTimePeriodProperty(src.getTemporalExtent()));
+        if (src.isSetValuesList())
+            dest.setValuesList(helper.getGMLUnmarshaller().unmarshalMeasureList(src.getValuesList()));
+
+        return dest;
+    }
+
+    /*
+     * Convert MonthlyTimeSeriesPropertyType to MonthlyTimeSeriesProperty.
+     */
+    private MonthlyTimeSeriesProperty unmarshalMonthlyTimeSeriesProperty(MonthlyTimeSeriesPropertyType src) throws MissingADESchemaException {
+        MonthlyTimeSeriesProperty dest = new MonthlyTimeSeriesProperty();
+
+        if (src.isSetMonthlyTimeSeries()) {
+            ModelObject object = helper.getJAXBUnmarshaller().unmarshal(src.getMonthlyTimeSeries());
+            if (object instanceof MonthlyTimeSeries)
+                dest.setMonthlyTimeSeries((MonthlyTimeSeries) object);
+        }
+
+        if (src.isSetRemoteSchema())
+            dest.setRemoteSchema(src.getRemoteSchema());
+
+        if (src.isSetType())
+            dest.setType(XLinkType.fromValue(src.getType().value()));
+
+        if (src.isSetHref())
+            dest.setHref(src.getHref());
+
+        if (src.isSetRole())
+            dest.setRole(src.getRole());
+
+        if (src.isSetArcrole())
+            dest.setArcrole(src.getArcrole());
+
+        if (src.isSetTitle())
+            dest.setTitle(src.getTitle());
+
+        if (src.isSetShow())
+            dest.setShow(XLinkShow.fromValue(src.getShow().value()));
+
+        if (src.isSetActuate())
+            dest.setActuate(XLinkActuate.fromValue(src.getActuate().value()));
+
+        return dest;
+    }
+
+    /*
+     * Convert TypicalValuesMonthlyTimeSeriesType to TypicalValuesMonthlyTimeSeries.
+     */
+    private TypicalValuesMonthlyTimeSeries unmarshalTypicalValuesMonthlyTimeSeries(TypicalValuesMonthlyTimeSeriesType src) throws MissingADESchemaException {
+        TypicalValuesMonthlyTimeSeries dest = new TypicalValuesMonthlyTimeSeries();
+        unmarshalAbstractTimeSeries(src, dest);
+
+        if (src.isSetTemporalExtent())
+            dest.setTemporalExtent(unmarshalTimeIntervalLength(src.getTemporalExtent()));
+        if (src.isSetStartMonth())
+            dest.setStartMonth(src.getStartMonth().intValue());
+        if (src.isSetValuesList())
+            dest.setValuesList(helper.getGMLUnmarshaller().unmarshalMeasureList(src.getValuesList()));
+
+        return dest;
+    }
+
+    /*
+     * Convert TypicalValuesMonthlyTimeSeriesType to TypicalValuesMonthlyTimeSeriesProperty.
+     */
+    private TypicalValuesMonthlyTimeSeriesProperty unmarshalTypicalValuesMonthlyTimeSeriesProperty(TypicalValuesMonthlyTimeSeriesPropertyType src) throws MissingADESchemaException {
+        TypicalValuesMonthlyTimeSeriesProperty dest = new TypicalValuesMonthlyTimeSeriesProperty();
+
+        if (src.isSetTypicalValuesMonthlyTimeSeries()) {
+            ModelObject object = helper.getJAXBUnmarshaller().unmarshal(src.getTypicalValuesMonthlyTimeSeries());
+            if (object instanceof TypicalValuesMonthlyTimeSeries)
+                dest.setTypicalValuesTimeSeriesFile((TypicalValuesMonthlyTimeSeries) object);
+        }
+
+        if (src.isSetRemoteSchema())
+            dest.setRemoteSchema(src.getRemoteSchema());
+
+        if (src.isSetType())
+            dest.setType(XLinkType.fromValue(src.getType().value()));
+
+        if (src.isSetHref())
+            dest.setHref(src.getHref());
+
+        if (src.isSetRole())
+            dest.setRole(src.getRole());
+
+        if (src.isSetArcrole())
+            dest.setArcrole(src.getArcrole());
+
+        if (src.isSetTitle())
+            dest.setTitle(src.getTitle());
+
+        if (src.isSetShow())
+            dest.setShow(XLinkShow.fromValue(src.getShow().value()));
+
+        if (src.isSetActuate())
+            dest.setActuate(XLinkActuate.fromValue(src.getActuate().value()));
+
+        return dest;
+    }
+
+    /*
+     * Convert TypicalValuesMonthlyTimeSeriesFileType to TypicalValuesMonthlyTimeSeriesFile.
+     */
+    private TypicalValuesMonthlyTimeSeriesFile unmarshalTypicalValuesMonthlyTimeSeriesFile(TypicalValuesMonthlyTimeSeriesFileType src) throws MissingADESchemaException {
+        TypicalValuesMonthlyTimeSeriesFile dest = new TypicalValuesMonthlyTimeSeriesFile();
+        unmarshalAbstractTimeSeries(src, dest);
+
+        if (src.isSetTemporalExtent())
+            dest.setTemporalExtent(unmarshalTimeIntervalLength(src.getTemporalExtent()));
+        if (src.isSetStartMonth())
+            dest.setStartMonth(src.getStartMonth().intValue());
+        if (src.isSetUom())
+            dest.setUom(unmarshalUnitOfMeasure(src.getUom()));
+        if (src.isSetFileURI()){
+            URI uri = URI.create(src.getFileURI());
+            dest.setFileURI(uri);
+        }
+        if (src.isSetTemporalExtent())
+            dest.setTemporalExtent(unmarshalTimeIntervalLength(src.getTemporalExtent()));
+
+
+        if (src.isSetNumberOfHeaderLines())
+            dest.setNumberOfHeaderLines(src.getNumberOfHeaderLines().intValue());
+
+        if (src.isSetFieldSeparator())
+            dest.setFieldSeparator(src.getFieldSeparator());
+
+        if (src.isSetRecordSeparator())
+            dest.setRecordSeparator(src.getRecordSeparator());
+
+        if (src.isSetDecimalSymbol())
+            dest.setDecimalSymbol(src.getDecimalSymbol());
+
+        if (src.isSetValueColumnNumber())
+            dest.setValueColumnNumber(src.getValueColumnNumber().intValue());
+
+        return dest;
+    }
+
+    /*
+     * Convert TypicalValuesMonthlyTimeSeriesFilePropertyType to TypicalValuesMonthlyTimeSeriesFileProperty.
+     */
+    private TypicalValuesMonthlyTimeSeriesFileProperty unmarshalTypicalValuesMonthlyTimeSeriesFileProperty(TypicalValuesMonthlyTimeSeriesFilePropertyType src) throws MissingADESchemaException {
+        TypicalValuesMonthlyTimeSeriesFileProperty dest = new TypicalValuesMonthlyTimeSeriesFileProperty();
+
+        if (src.isSetTypicalValuesMonthlyTimeSeriesFile()) {
+            ModelObject object = helper.getJAXBUnmarshaller().unmarshal(src.getTypicalValuesMonthlyTimeSeriesFile());
+            if (object instanceof TypicalValuesMonthlyTimeSeriesFile)
+                dest.setTypicalValuesTimeSeriesFile((TypicalValuesMonthlyTimeSeriesFile) object);
+        }
+
+        if (src.isSetRemoteSchema())
+            dest.setRemoteSchema(src.getRemoteSchema());
+
+        if (src.isSetType())
+            dest.setType(XLinkType.fromValue(src.getType().value()));
+
+        if (src.isSetHref())
+            dest.setHref(src.getHref());
+
+        if (src.isSetRole())
+            dest.setRole(src.getRole());
+
+        if (src.isSetArcrole())
+            dest.setArcrole(src.getArcrole());
+
+        if (src.isSetTitle())
+            dest.setTitle(src.getTitle());
+
+        if (src.isSetShow())
+            dest.setShow(XLinkShow.fromValue(src.getShow().value()));
+
+        if (src.isSetActuate())
+            dest.setActuate(XLinkActuate.fromValue(src.getActuate().value()));
+
+        return dest;
+    }
+
+    /*
+     * Convert MonthlyTimeSeriesFileType to MonthlyTimeSeriesFile.
+     */
+    private MonthlyTimeSeriesFile unmarshalMonthlyTimeSeriesFile(MonthlyTimeSeriesFileType src) throws MissingADESchemaException {
+        MonthlyTimeSeriesFile dest = new MonthlyTimeSeriesFile();
+        unmarshalAbstractTimeSeries(src, dest);
+
+        if (src.isSetTemporalExtent())
+            dest.setTemporalExtent(unmarshalTimePeriodProperty(src.getTemporalExtent()));
+        if (src.isSetNumberOfHeaderLines())
+            dest.setNumberOfHeaderLines(src.getNumberOfHeaderLines().intValue());
+        if (src.isSetFieldSeparator())
+            dest.setFieldSeparator(src.getFieldSeparator());
+        if (src.isSetRecordSeparator())
+            dest.setRecordSeparator(src.getRecordSeparator());
+        if (src.isSetDecimalSymbol())
+            dest.setDecimalSymbol(src.getDecimalSymbol());
+        if (src.isSetValueColumnNumber())
+            dest.setValueColumnNumber(src.getValueColumnNumber().intValue());
+
+        return dest;
+    }
+
+    /*
+     * Convert MonthlyTimeSeriesFilePropertyType to MonthlyTimeSeriesFileProperty.
+     */
+    private MonthlyTimeSeriesFileProperty unmarshalMonthlyTimeSeriesFileProperty(MonthlyTimeSeriesFilePropertyType src) throws MissingADESchemaException {
+        MonthlyTimeSeriesFileProperty dest = new MonthlyTimeSeriesFileProperty();
+
+        if (src.isSetMonthlyTimeSeriesFile()) {
+            ModelObject object = helper.getJAXBUnmarshaller().unmarshal(src.getMonthlyTimeSeriesFile());
+            if (object instanceof MonthlyTimeSeriesFile)
+                dest.setMonthlyTimeSeriesFile((MonthlyTimeSeriesFile) object);
         }
 
         if (src.isSetRemoteSchema())
@@ -969,7 +1194,7 @@ public class EnergyADEUnmarshaller implements ADEUnmarshaller {
             dest.setTimeInterval(unmarshalTimeIntervalLength(src.getTimeInterval()));
 
         if (src.isSetValuesList())
-            dest.setValues(helper.getGMLUnmarshaller().unmarshalMeasureList(src.getValuesList()));
+            dest.setValuesList(helper.getGMLUnmarshaller().unmarshalMeasureList(src.getValuesList()));
 
         return dest;
     }
@@ -1150,9 +1375,9 @@ public class EnergyADEUnmarshaller implements ADEUnmarshaller {
     /*
      * Convert TypicalValuesTimeSeriesType to TypicalValuesTimeSeries.
      */
-    private TypicalValuesTimeSeries unmarshalTypicalValuesTimeSeries(TypicalValuesTimeSeriesType src) throws MissingADESchemaException {
+    private TypicalValuesRegularTimeSeries unmarshalTypicalValuesTimeSeries(TypicalValuesTimeSeriesType src) throws MissingADESchemaException {
 
-        TypicalValuesTimeSeries dest = new TypicalValuesTimeSeries();
+        TypicalValuesRegularTimeSeries dest = new TypicalValuesRegularTimeSeries();
         unmarshalAbstractTimeSeries(src, dest);
 
         if (src.isSetTimeInterval()){
@@ -1182,8 +1407,8 @@ public class EnergyADEUnmarshaller implements ADEUnmarshaller {
     /*
      * Convert TypicalValuesTimeSeriesPropertyType to TypicalValuesTimeSeriesProperty.
      */
-    private TypicalValuesTimeSeriesProperty unmarshalTypicalValuesTimeSeriesProperty(TypicalValuesTimeSeriesPropertyType src) throws MissingADESchemaException {
-        TypicalValuesTimeSeriesProperty dest = new TypicalValuesTimeSeriesProperty();
+    private TypicalValuesRegularTimeSeriesProperty unmarshalTypicalValuesTimeSeriesProperty(TypicalValuesTimeSeriesPropertyType src) throws MissingADESchemaException {
+        TypicalValuesRegularTimeSeriesProperty dest = new TypicalValuesRegularTimeSeriesProperty();
 
         if (src.isSetTypicalValuesTimeSeries())
             dest.setTypicalValuesTimeSeries(unmarshalTypicalValuesTimeSeries(src.getTypicalValuesTimeSeries()));

src/main/java/org/citygml4j/ade/energy3/model/module/EnergyADEModule.java

@@ -30,10 +30,10 @@ public class EnergyADEModule extends ADEModule {
         features.put("EnergyPerformanceCertificate", EnergyPerformanceCertificate.class);
         features.put("UtilityNetworkConnection", UtilityNetworkConnection.class);
         features.put("AbstractTimeSeries", AbstractTimeSeries.class);
-        features.put("TypicalValuesTimeSeries", TypicalValuesTimeSeries.class);
+        features.put("TypicalValuesTimeSeries", TypicalValuesRegularTimeSeries.class);
         features.put("RegularTimeSeries", RegularTimeSeries.class);
         features.put("RegularTimeSeriesFile", RegularTimeSeriesFile.class);
-        features.put("TypicalValuesTimeSeriesFile", TypicalValuesTimeSeriesFile.class);
+        features.put("TypicalValuesTimeSeriesFile", TypicalValuesRegularTimeSeriesFile.class);
         features.put("SensorConnection", SensorConnection.class);
         features.put("DeviceOperation", DeviceOperation.class);
         features.put("AbstractResource", AbstractResource.class);

src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractTimeSeries.java

@@ -7,7 +7,7 @@ import org.citygml4j.model.common.visitor.GMLVisitor;
 import org.citygml4j.model.gml.basicTypes.Code;
 import org.citygml4j.model.gml.feature.AbstractFeature;
 
-public abstract class AbstractTimeSeries extends AbstractFeature implements ADEModelObject {
+public abstract class AbstractTimeSeries extends AbstractADEFeature implements ADEModelObject {
 
     private Code acquisitionMethod;
     private InterpolationTypeValue interpolationTypeValue;

src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/MonthlyTimeSeries.java

+package org.citygml4j.ade.energy3.model.supportingClasses;
+
+import org.citygml4j.builder.copy.CopyBuilder;
+import org.citygml4j.model.common.visitor.FeatureFunctor;
+import org.citygml4j.model.common.visitor.FeatureVisitor;
+import org.citygml4j.model.gml.basicTypes.MeasureList;
+
+public class MonthlyTimeSeries extends AbstractTimeSeries{
+
+    private TimePeriodProperty temporalExtent;
+    private MeasureList valuesList;
+
+    public TimePeriodProperty getTemporalExtent() {
+        return temporalExtent;
+    }
+
+    public void setTemporalExtent(TimePeriodProperty temporalExtent) {
+        this.temporalExtent = temporalExtent;
+    }
+
+    public MeasureList getValuesList() {
+        return valuesList;
+    }
+
+    public void setValuesList(MeasureList valuesList) {
+        this.valuesList = valuesList;
+    }
+
+    public boolean isSetTemporalExtent() {
+        return temporalExtent != null;
+    }
+
+    public boolean isSetValuesList() {
+        return valuesList != null;
+    }
+
+    @Override
+    public Object copy(CopyBuilder copyBuilder) {
+        return copyTo(new MonthlyTimeSeries(), copyBuilder);
+    }
+
+    @Override
+    public Object copyTo(Object target, CopyBuilder copyBuilder) {
+        MonthlyTimeSeries copy = (target == null) ? new MonthlyTimeSeries() : (MonthlyTimeSeries) target;
+
+        if (isSetTemporalExtent())
+            copy.setTemporalExtent((TimePeriodProperty) copyBuilder.copy(temporalExtent));
+
+        if (isSetValuesList())
+            copy.setValuesList((MeasureList) copyBuilder.copy(valuesList));
+
+        return super.copyTo(copy, copyBuilder);
+    }
+
+    @Override
+    public void accept(FeatureVisitor featureVisitor) {
+        featureVisitor.visit(this);
+    }
+
+    @Override
+    public <T> T accept(FeatureFunctor<T> featureFunctor) {
+        return featureFunctor.apply(this);
+    }
+
+}

src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/MonthlyTimeSeriesFile.java

+package org.citygml4j.ade.energy3.model.supportingClasses;
+
+import org.citygml4j.builder.copy.CopyBuilder;
+import org.citygml4j.model.common.visitor.FeatureFunctor;
+import org.citygml4j.model.common.visitor.FeatureVisitor;
+
+import java.net.URI;
+
+public class MonthlyTimeSeriesFile extends AbstractTimeSeries{
+
+    private UnitOfMeasure uom;
+    private URI fileURI;
+    private TimePeriodProperty temporalExtent;
+    private Integer numberOfHeaderLines;
+    private String fieldSeparator;
+    private String recordSeparator;
+    private String decimalSymbol;
+    private Integer valueColumnNumber;
+
+    public String getFieldSeparator() {
+        return fieldSeparator;
+    }
+
+    public void setFieldSeparator(String fieldSeparator) {
+        this.fieldSeparator = fieldSeparator;
+    }
+
+    public UnitOfMeasure getUom() {
+        return uom;
+    }
+
+    public void setUom(UnitOfMeasure uom) {
+        this.uom = uom;
+    }
+
+    public URI getFileURI() {
+        return fileURI;
+    }
+
+    public void setFileURI(URI fileURI) {
+        this.fileURI = fileURI;
+    }
+
+    public TimePeriodProperty getTemporalExtent() {
+        return temporalExtent;
+    }
+
+    public void setTemporalExtent(TimePeriodProperty temporalExtent) {
+        this.temporalExtent = temporalExtent;
+    }
+
+    public Integer getNumberOfHeaderLines() {
+        return numberOfHeaderLines;
+    }
+
+    public void setNumberOfHeaderLines(Integer numberOfHeaderLines) {
+        this.numberOfHeaderLines = numberOfHeaderLines;
+    }
+
+    public String getRecordSeparator() {
+        return recordSeparator;
+    }
+
+    public void setRecordSeparator(String recordSeparator) {
+        this.recordSeparator = recordSeparator;
+    }
+
+    public String getDecimalSymbol() {
+        return decimalSymbol;
+    }
+
+    public void setDecimalSymbol(String decimalSymbol) {
+        this.decimalSymbol = decimalSymbol;
+    }
+
+    public Integer getValueColumnNumber() {
+        return valueColumnNumber;
+    }
+
+    public void setValueColumnNumber(Integer valueColumnNumber) {
+        this.valueColumnNumber = valueColumnNumber;
+    }
+
+    @Override
+    public Object copy(CopyBuilder copyBuilder) {
+        return copyTo(new MonthlyTimeSeriesFile(), copyBuilder);
+    }
+
+    public boolean isSetUom(){ return uom != null;}
+    public boolean isSetFileURI(){ return fileURI != null;}
+    public boolean isSetTemporalExtent(){ return temporalExtent != null;}
+    public boolean isSetNumberOfHeaderLines(){ return numberOfHeaderLines != null;}
+    public boolean isSetFieldSeparator(){ return fieldSeparator != null;}
+    public boolean isSetRecordSeparator(){ return recordSeparator != null;}
+    public boolean isSetDecimalSymbol(){ return decimalSymbol != null;}
+    public boolean isSetValueColumnNumber(){ return valueColumnNumber != null;}
+
+    @Override
+    public Object copyTo(Object target, CopyBuilder copyBuilder) {
+        MonthlyTimeSeriesFile copy = (target == null) ? new MonthlyTimeSeriesFile() : (MonthlyTimeSeriesFile) target;
+
+        if (isSetFileURI())
+            copy.setFileURI(fileURI);
+
+        if (isSetTemporalExtent())
+            copy.setTemporalExtent((TimePeriodProperty) copyBuilder.copy(temporalExtent));
+
+        if (isSetUom())
+            copy.setUom((UnitOfMeasure) copyBuilder.copy(uom));
+
+        if (isSetNumberOfHeaderLines())
+            copy.setNumberOfHeaderLines(numberOfHeaderLines);
+
+        if (isSetFieldSeparator())
+            copy.setFieldSeparator(copyBuilder.copy(fieldSeparator));
+
+        if (isSetRecordSeparator())
+            copy.setRecordSeparator(copyBuilder.copy(recordSeparator));
+
+        if (isSetDecimalSymbol())
+            copy.setDecimalSymbol(copyBuilder.copy(decimalSymbol));
+
+        if (isSetValueColumnNumber())
+            copy.setValueColumnNumber(valueColumnNumber);
+
+        return super.copyTo(copy, copyBuilder);
+    }
+
+    @Override
+    public void accept(FeatureVisitor featureVisitor) {
+        featureVisitor.visit(this);
+    }
+
+    @Override
+    public <T> T accept(FeatureFunctor<T> featureFunctor) {
+        return featureFunctor.apply(this);
+    }
+}

src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/MonthlyTimeSeriesFileProperty.java

+package org.citygml4j.ade.energy3.model.supportingClasses;
+
+import org.citygml4j.builder.copy.CopyBuilder;
+import org.citygml4j.model.citygml.ade.binding.ADEModelObject;
+import org.citygml4j.model.gml.base.AssociationByRepOrRef;
+
+public class MonthlyTimeSeriesFileProperty  extends AssociationByRepOrRef<MonthlyTimeSeriesFile> implements ADEModelObject {
+
+    public MonthlyTimeSeriesFileProperty() {
+    }
+
+    public MonthlyTimeSeriesFileProperty(MonthlyTimeSeriesFile monthlyTimeSeriesFile) {
+        super(monthlyTimeSeriesFile);
+    }
+
+    public MonthlyTimeSeriesFileProperty(String href) {
+        super(href);
+    }
+
+    public MonthlyTimeSeriesFile getMonthlyTimeSeriesFile() {
+        return super.getObject();
+    }
+
+    public boolean isSetMonthlyTimeSeriesFile() {
+        return super.isSetObject();
+    }
+
+    public void setMonthlyTimeSeriesFile(MonthlyTimeSeriesFile monthlyTimeSeriesFile) {
+        super.setObject(monthlyTimeSeriesFile);
+    }
+
+    public void unsetMonthlyTimeSeriesFile() {
+        super.unsetObject();
+    }
+
+    @Override
+    public Class<MonthlyTimeSeriesFile> getAssociableClass() {
+        return MonthlyTimeSeriesFile.class;
+    }
+
+    @Override
+    public Object copy(CopyBuilder copyBuilder) {
+        return copyTo(new MonthlyTimeSeriesFileProperty(), copyBuilder);
+    }
+
+    @Override
+    public Object copyTo(Object target, CopyBuilder copyBuilder) {
+        MonthlyTimeSeriesFileProperty copy = (target == null) ? new MonthlyTimeSeriesFileProperty() : (MonthlyTimeSeriesFileProperty) target;
+        return super.copyTo(copy, copyBuilder);
+    }
+}

src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/MonthlyTimeSeriesProperty.java

+package org.citygml4j.ade.energy3.model.supportingClasses;
+
+import org.citygml4j.builder.copy.CopyBuilder;
+import org.citygml4j.model.citygml.ade.binding.ADEModelObject;
+import org.citygml4j.model.gml.base.AssociationByRepOrRef;
+
+public class MonthlyTimeSeriesProperty  extends AssociationByRepOrRef<MonthlyTimeSeries> implements ADEModelObject {
+
+    public MonthlyTimeSeriesProperty() {
+    }
+
+    public MonthlyTimeSeriesProperty(MonthlyTimeSeries monthlyTimeSeries) {
+        super(monthlyTimeSeries);
+    }
+
+    public MonthlyTimeSeriesProperty(String href) {
+        super(href);
+    }
+
+    public MonthlyTimeSeries getMonthlyTimeSeries() {
+        return super.getObject();
+    }
+
+    public boolean isSetMonthlyTimeSeries() {
+        return super.isSetObject();
+    }
+
+    public void setMonthlyTimeSeries(MonthlyTimeSeries monthlyTimeSeries) {
+        super.setObject(monthlyTimeSeries);
+    }
+
+    public void unsetMonthlyTimeSeries() {
+        super.unsetObject();
+    }
+
+    @Override
+    public Class<MonthlyTimeSeries> getAssociableClass() {
+        return MonthlyTimeSeries.class;
+    }
+
+    @Override
+    public Object copy(CopyBuilder copyBuilder) {
+        return copyTo(new MonthlyTimeSeriesProperty(), copyBuilder);
+    }
+
+    @Override
+    public Object copyTo(Object target, CopyBuilder copyBuilder) {
+        MonthlyTimeSeriesProperty copy = (target == null) ? new MonthlyTimeSeriesProperty() : (MonthlyTimeSeriesProperty) target;
+        return super.copyTo(copy, copyBuilder);
+    }
+}

src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/RegularTimeSeries.java

@@ -8,7 +8,7 @@ import org.citygml4j.model.gml.basicTypes.MeasureList;
 public class RegularTimeSeries extends AbstractTimeSeries {
     private TimePeriodProperty temporalExtent;
     private TimeIntervalLength timeInterval;
-    private MeasureList values;
+    private MeasureList valuesList;
 
     public TimePeriodProperty getTemporalExtent() {
         return temporalExtent;
@@ -40,19 +40,19 @@ public class RegularTimeSeries extends AbstractTimeSeries {
         this.timeInterval = timeInterval;
     }
 
-    public MeasureList getValues() {
-        return values;
+    public MeasureList getValuesList() {
+        return valuesList;
     }
 
     public boolean isSetValues() {
-        return values != null;
+        return valuesList != null;
     }
 
-    public void setValues(MeasureList values) {
-        if (values != null)
-            values.setParent(this);
+    public void setValuesList(MeasureList valuesList) {
+        if (valuesList != null)
+            valuesList.setParent(this);
 
-        this.values = values;
+        this.valuesList = valuesList;
     }
 
     @Override
@@ -71,7 +71,7 @@ public class RegularTimeSeries extends AbstractTimeSeries {
             copy.setTimeInterval((TimeIntervalLength) copyBuilder.copy(timeInterval));
 
         if (isSetValues())
-            copy.setValues((MeasureList) copyBuilder.copy(values));
+            copy.setValuesList((MeasureList) copyBuilder.copy(valuesList));
 
         return super.copyTo(copy, copyBuilder);
     }

src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SensorConnection.java

@@ -12,7 +12,7 @@ public class SensorConnection extends AbstractTimeSeries {
     private TimeIntervalLength temporalExtent;
     private Code connectionType;
     private String observationProperty;
-    private String uom;
+    private UnitOfMeasure uom;
     private String sensorID;
     private String sensorName;
     private String observationID;
@@ -56,11 +56,11 @@ public class SensorConnection extends AbstractTimeSeries {
         this.observationProperty = observationProperty;
     }
 
-    public String getUom() {
+    public UnitOfMeasure getUom() {
         return uom;
     }
 
-    public void setUom(String uom) {
+    public void setUom(UnitOfMeasure uom) {
         this.uom = uom;
     }
 
@@ -170,7 +170,7 @@ public class SensorConnection extends AbstractTimeSeries {
         if (isSetObservationProperty())
             copy.setObservationProperty(copyBuilder.copy(observationProperty));
         if (isSetUom())
-            copy.setUom(copyBuilder.copy(uom));
+            copy.setUom((UnitOfMeasure) copyBuilder.copy(uom));
         if (isSetSensorID())
             copy.setSensorID(copyBuilder.copy(sensorID));
         if (isSetSensorName())

src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesMonthlyTimeSeries.java

+package org.citygml4j.ade.energy3.model.supportingClasses;
+
+import org.citygml4j.builder.copy.CopyBuilder;
+import org.citygml4j.model.common.visitor.FeatureFunctor;
+import org.citygml4j.model.common.visitor.FeatureVisitor;
+import org.citygml4j.model.gml.basicTypes.MeasureList;
+
+public class TypicalValuesMonthlyTimeSeries extends AbstractTimeSeries{
+
+    private Integer startMonth;
+    private TimeIntervalLength temporalExtent;
+    private MeasureList valuesList;
+
+    public MeasureList getValuesList() {
+        return valuesList;
+    }
+
+    public void setValuesList(MeasureList valuesList) {
+        this.valuesList = valuesList;
+    }
+
+    public TimeIntervalLength getTemporalExtent() {
+        return temporalExtent;
+    }
+
+    public void setTemporalExtent(TimeIntervalLength temporalExtent) {
+        this.temporalExtent = temporalExtent;
+    }
+
+    public Integer getStartMonth() {
+        return startMonth;
+    }
+
+    public void setStartMonth(Integer startMonth) {
+        this.startMonth = startMonth;
+    }
+
+    public boolean isSetStartMonth() {
+        return startMonth != null;
+    }
+
+    public boolean isTemporalExtent() {
+        return temporalExtent != null;
+    }
+
+    public boolean isSetValuesList() {
+        return valuesList != null;
+    }
+
+    @Override
+    public Object copy(CopyBuilder copyBuilder) {
+        return copyTo(new TypicalValuesMonthlyTimeSeries(), copyBuilder);
+    }
+
+    @Override
+    public Object copyTo(Object target, CopyBuilder copyBuilder) {
+        TypicalValuesMonthlyTimeSeries copy = (target == null) ? new TypicalValuesMonthlyTimeSeries() : (TypicalValuesMonthlyTimeSeries) target;
+
+        if (isSetStartMonth())
+            copy.setStartMonth((Integer)copyBuilder.copy(startMonth));
+
+        if (isSetValuesList())
+            copy.setValuesList((MeasureList) copyBuilder.copy(valuesList));
+        if (isTemporalExtent())
+            copy.setTemporalExtent((TimeIntervalLength) copyBuilder.copy(temporalExtent));
+
+        return super.copyTo(copy, copyBuilder);
+    }
+
+    @Override
+    public void accept(FeatureVisitor featureVisitor) {
+        featureVisitor.visit(this);
+    }
+
+    @Override
+    public <T> T accept(FeatureFunctor<T> featureFunctor) {
+        return featureFunctor.apply(this);
+    }
+
+}

src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesMonthlyTimeSeriesFile.java

+package org.citygml4j.ade.energy3.model.supportingClasses;
+
+import org.citygml4j.builder.copy.CopyBuilder;
+import org.citygml4j.model.common.visitor.FeatureFunctor;
+import org.citygml4j.model.common.visitor.FeatureVisitor;
+
+import java.net.URI;
+
+public class TypicalValuesMonthlyTimeSeriesFile extends AbstractTimeSeries{
+
+    private Integer startMonth;
+    private UnitOfMeasure uom;
+    private URI fileURI;
+    private TimeIntervalLength temporalExtent;
+    private Integer numberOfHeaderLines;
+    private String fieldSeparator;
+    private String recordSeparator;
+    private String decimalSymbol;
+    private Integer valueColumnNumber;
+
+    public boolean isSetUom(){ return uom != null;}
+    public boolean isSetFileURI(){ return fileURI != null;}
+    public boolean isSetTemporalExtent(){ return temporalExtent != null;}
+    public boolean isSetNumberOfHeaderLines(){ return numberOfHeaderLines != null;}
+    public boolean isSetFieldSeparator(){ return fieldSeparator != null;}
+    public boolean isSetRecordSeparator(){ return recordSeparator != null;}
+    public boolean isSetDecimalSymbol(){ return decimalSymbol != null;}
+    public boolean isSetValueColumnNumber(){ return valueColumnNumber != null;}
+    public boolean isSetStartMonth(){ return startMonth != null;}
+
+    public Integer getStartMonth() {
+        return startMonth;
+    }
+
+    public void setStartMonth(Integer startMonth) {
+        this.startMonth = startMonth;
+    }
+
+    public UnitOfMeasure getUom() {
+        return uom;
+    }
+
+    public void setUom(UnitOfMeasure uom) {
+        this.uom = uom;
+    }
+
+    public URI getFileURI() {
+        return fileURI;
+    }
+
+    public void setFileURI(URI fileURI) {
+        this.fileURI = fileURI;
+    }
+
+    public TimeIntervalLength getTemporalExtent() {
+        return temporalExtent;
+    }
+
+    public void setTemporalExtent(TimeIntervalLength temporalExtent) {
+        this.temporalExtent = temporalExtent;
+    }
+
+    public Integer getNumberOfHeaderLines() {
+        return numberOfHeaderLines;
+    }
+
+    public void setNumberOfHeaderLines(Integer numberOfHeaderLines) {
+        this.numberOfHeaderLines = numberOfHeaderLines;
+    }
+
+    public String getFieldSeparator() {
+        return fieldSeparator;
+    }
+
+    public void setFieldSeparator(String fieldSeparator) {
+        this.fieldSeparator = fieldSeparator;
+    }
+
+    public String getRecordSeparator() {
+        return recordSeparator;
+    }
+
+    public void setRecordSeparator(String recordSeparator) {
+        this.recordSeparator = recordSeparator;
+    }
+
+    public String getDecimalSymbol() {
+        return decimalSymbol;
+    }
+
+    public void setDecimalSymbol(String decimalSymbol) {
+        this.decimalSymbol = decimalSymbol;
+    }
+
+    public Integer getValueColumnNumber() {
+        return valueColumnNumber;
+    }
+
+    public void setValueColumnNumber(Integer valueColumnNumber) {
+        this.valueColumnNumber = valueColumnNumber;
+    }
+
+    @Override
+    public Object copy(CopyBuilder copyBuilder) {
+        return copyTo(new TypicalValuesMonthlyTimeSeriesFile(), copyBuilder);
+    }
+
+    @Override
+    public Object copyTo(Object target, CopyBuilder copyBuilder) {
+        TypicalValuesMonthlyTimeSeriesFile copy = (target == null) ? new TypicalValuesMonthlyTimeSeriesFile() : (TypicalValuesMonthlyTimeSeriesFile) target;
+
+        if (isSetFileURI())
+            copy.setFileURI(fileURI);
+
+        if (isSetTemporalExtent())
+            copy.setTemporalExtent((TimeIntervalLength) copyBuilder.copy(temporalExtent));
+
+        if (isSetUom())
+            copy.setUom((UnitOfMeasure) copyBuilder.copy(uom));
+
+        if (isSetNumberOfHeaderLines())
+            copy.setNumberOfHeaderLines(numberOfHeaderLines);
+
+        if (isSetFieldSeparator())
+            copy.setFieldSeparator(copyBuilder.copy(fieldSeparator));
+
+        if (isSetRecordSeparator())
+            copy.setRecordSeparator(copyBuilder.copy(recordSeparator));
+
+        if (isSetDecimalSymbol())
+            copy.setDecimalSymbol(copyBuilder.copy(decimalSymbol));
+
+        if (isSetValueColumnNumber())
+            copy.setValueColumnNumber(valueColumnNumber);
+
+        if (isSetStartMonth())
+            copy.setStartMonth(startMonth);
+
+        return super.copyTo(copy, copyBuilder);
+    }
+
+    @Override
+    public void accept(FeatureVisitor featureVisitor) {
+        featureVisitor.visit(this);
+    }
+
+    @Override
+    public <T> T accept(FeatureFunctor<T> featureFunctor) {
+        return featureFunctor.apply(this);
+    }
+
+}

src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesMonthlyTimeSeriesFileProperty.java

+package org.citygml4j.ade.energy3.model.supportingClasses;
+
+import org.citygml4j.builder.copy.CopyBuilder;
+import org.citygml4j.model.citygml.ade.binding.ADEModelObject;
+import org.citygml4j.model.gml.base.AssociationByRepOrRef;
+
+public class TypicalValuesMonthlyTimeSeriesFileProperty extends AssociationByRepOrRef<TypicalValuesMonthlyTimeSeriesFile> implements ADEModelObject {
+
+    public TypicalValuesMonthlyTimeSeriesFileProperty() {
+    }
+
+    public TypicalValuesMonthlyTimeSeriesFileProperty(TypicalValuesMonthlyTimeSeriesFile typicalValuesMonthlyTimeSeriesFile) {
+        super(typicalValuesMonthlyTimeSeriesFile);
+    }
+
+    public TypicalValuesMonthlyTimeSeriesFile getTypicalValuesMonthlyTimeSeriesFile() {
+        return super.getObject();
+    }
+
+    public boolean isSetTypicalValuesMonthlyTimeSeriesFile() {
+        return super.isSetObject();
+    }
+
+    public void setTypicalValuesTimeSeriesFile(TypicalValuesMonthlyTimeSeriesFile typicalValuesTimeSeriesFile) {
+        super.setObject(typicalValuesTimeSeriesFile);
+    }
+
+    public void unsetTypicalValuesTimeSeries() {
+        super.unsetObject();
+    }
+
+    @Override
+    public Class<TypicalValuesMonthlyTimeSeriesFile> getAssociableClass() {
+        return TypicalValuesMonthlyTimeSeriesFile.class;
+    }
+
+    @Override
+    public Object copy(CopyBuilder copyBuilder) {
+        return copyTo(new TypicalValuesMonthlyTimeSeriesFileProperty(), copyBuilder);
+    }
+
+    @Override
+    public Object copyTo(Object target, CopyBuilder copyBuilder) {
+        TypicalValuesMonthlyTimeSeriesFileProperty copy = (target == null) ? new TypicalValuesMonthlyTimeSeriesFileProperty() : (TypicalValuesMonthlyTimeSeriesFileProperty) target;
+        return super.copyTo(copy, copyBuilder);
+    }
+}

src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesTimeSeriesFileProperty.java → src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesMonthlyTimeSeriesProperty.java

@@ -4,16 +4,16 @@ import org.citygml4j.builder.copy.CopyBuilder;
 import org.citygml4j.model.citygml.ade.binding.ADEModelObject;
 import org.citygml4j.model.gml.base.AssociationByRepOrRef;
 
-public class TypicalValuesTimeSeriesFileProperty extends AssociationByRepOrRef<TypicalValuesTimeSeriesFile> implements ADEModelObject {
+public class TypicalValuesMonthlyTimeSeriesProperty extends AssociationByRepOrRef<TypicalValuesMonthlyTimeSeries> implements ADEModelObject {
 
-    public TypicalValuesTimeSeriesFileProperty() {
+    public TypicalValuesMonthlyTimeSeriesProperty() {
     }
 
-    public TypicalValuesTimeSeriesFileProperty(TypicalValuesTimeSeriesFile typicalValuesTimeSeriesFile) {
-        super(typicalValuesTimeSeriesFile);
+    public TypicalValuesMonthlyTimeSeriesProperty(TypicalValuesMonthlyTimeSeries typicalValuesMonthlyTimeSeries) {
+        super(typicalValuesMonthlyTimeSeries);
     }
 
-    public TypicalValuesTimeSeriesFile getTypicalValuesTimeSeriesFile() {
+    public TypicalValuesMonthlyTimeSeries getTypicalValuesMonthlyTimeSeries() {
         return super.getObject();
     }
 
@@ -21,7 +21,7 @@ public class TypicalValuesTimeSeriesFileProperty extends AssociationByRepOrRef<T
         return super.isSetObject();
     }
 
-    public void setTypicalValuesTimeSeriesFile(TypicalValuesTimeSeriesFile typicalValuesTimeSeriesFile) {
+    public void setTypicalValuesTimeSeriesFile(TypicalValuesMonthlyTimeSeries typicalValuesTimeSeriesFile) {
         super.setObject(typicalValuesTimeSeriesFile);
     }
 
@@ -30,18 +30,18 @@ public class TypicalValuesTimeSeriesFileProperty extends AssociationByRepOrRef<T
     }
 
     @Override
-    public Class<TypicalValuesTimeSeriesFile> getAssociableClass() {
-        return TypicalValuesTimeSeriesFile.class;
+    public Class<TypicalValuesMonthlyTimeSeries> getAssociableClass() {
+        return TypicalValuesMonthlyTimeSeries.class;
     }
 
     @Override
     public Object copy(CopyBuilder copyBuilder) {
-        return copyTo(new TypicalValuesTimeSeriesFileProperty(), copyBuilder);
+        return copyTo(new TypicalValuesMonthlyTimeSeriesProperty(), copyBuilder);
     }
 
     @Override
     public Object copyTo(Object target, CopyBuilder copyBuilder) {
-        TypicalValuesTimeSeriesFileProperty copy = (target == null) ? new TypicalValuesTimeSeriesFileProperty() : (TypicalValuesTimeSeriesFileProperty) target;
+        TypicalValuesMonthlyTimeSeriesProperty copy = (target == null) ? new TypicalValuesMonthlyTimeSeriesProperty() : (TypicalValuesMonthlyTimeSeriesProperty) target;
         return super.copyTo(copy, copyBuilder);
     }
 }

src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesTimeSeries.java → src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesRegularTimeSeries.java

@@ -7,7 +7,7 @@ import org.citygml4j.model.gml.basicTypes.MeasureList;
 
 import java.time.LocalTime;
 
-public class TypicalValuesTimeSeries extends AbstractTimeSeries {
+public class TypicalValuesRegularTimeSeries extends AbstractTimeSeries {
 
     private TimeIntervalLength temporalExtent;
     private TimeIntervalLength timeInterval;
@@ -97,12 +97,12 @@ public class TypicalValuesTimeSeries extends AbstractTimeSeries {
 
     @Override
     public Object copy(CopyBuilder copyBuilder) {
-        return copyTo(new TypicalValuesTimeSeries(), copyBuilder);
+        return copyTo(new TypicalValuesRegularTimeSeries(), copyBuilder);
     }
 
     @Override
     public Object copyTo(Object target, CopyBuilder copyBuilder) {
-        TypicalValuesTimeSeries copy = (target == null) ? new TypicalValuesTimeSeries() : (TypicalValuesTimeSeries) target;
+        TypicalValuesRegularTimeSeries copy = (target == null) ? new TypicalValuesRegularTimeSeries() : (TypicalValuesRegularTimeSeries) target;
 
         if (isSetTemporalExtent())
             copy.setTemporalExtent((TimeIntervalLength) copyBuilder.copy(temporalExtent));

src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesTimeSeriesFile.java → src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesRegularTimeSeriesFile.java

@@ -7,12 +7,12 @@ import org.citygml4j.model.common.visitor.FeatureVisitor;
 import java.net.URI;
 import java.time.ZonedDateTime;
 
-public class TypicalValuesTimeSeriesFile extends AbstractTimeSeries {
+public class TypicalValuesRegularTimeSeriesFile extends AbstractTimeSeries {
 
     private ZonedDateTime startTime;
     private Integer startDay;
     private Integer startMonth;
-    private String uom;
+    private UnitOfMeasure uom;
     private URI fileURI;
     private TimeIntervalLength temporalExtent;
     private TimeIntervalLength timeInterval;
@@ -54,11 +54,11 @@ public class TypicalValuesTimeSeriesFile extends AbstractTimeSeries {
         this.startMonth = startMonth;
     }
 
-    public String getUom() {
+    public UnitOfMeasure getUom() {
         return uom;
     }
 
-    public void setUom(String uom) {
+    public void setUom(UnitOfMeasure uom) {
         this.uom = uom;
     }
 
@@ -135,12 +135,12 @@ public class TypicalValuesTimeSeriesFile extends AbstractTimeSeries {
 
     @Override
     public Object copy(CopyBuilder copyBuilder) {
-        return copyTo(new TypicalValuesTimeSeriesFile(), copyBuilder);
+        return copyTo(new TypicalValuesRegularTimeSeriesFile(), copyBuilder);
     }
 
     @Override
     public Object copyTo(Object target, CopyBuilder copyBuilder) {
-        TypicalValuesTimeSeriesFile copy = (target == null) ? new TypicalValuesTimeSeriesFile() : (TypicalValuesTimeSeriesFile) target;
+        TypicalValuesRegularTimeSeriesFile copy = (target == null) ? new TypicalValuesRegularTimeSeriesFile() : (TypicalValuesRegularTimeSeriesFile) target;
 
         if (isSetFileURI())
             copy.setFileURI(fileURI);

src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesRegularTimeSeriesFileProperty.java

+package org.citygml4j.ade.energy3.model.supportingClasses;
+
+import org.citygml4j.builder.copy.CopyBuilder;
+import org.citygml4j.model.citygml.ade.binding.ADEModelObject;
+import org.citygml4j.model.gml.base.AssociationByRepOrRef;
+
+public class TypicalValuesRegularTimeSeriesFileProperty extends AssociationByRepOrRef<TypicalValuesRegularTimeSeriesFile> implements ADEModelObject {
+
+    public TypicalValuesRegularTimeSeriesFileProperty() {
+    }
+
+    public TypicalValuesRegularTimeSeriesFileProperty(TypicalValuesRegularTimeSeriesFile typicalValuesRegularTimeSeriesFile) {
+        super(typicalValuesRegularTimeSeriesFile);
+    }
+
+    public TypicalValuesRegularTimeSeriesFile getTypicalValuesTimeSeriesFile() {
+        return super.getObject();
+    }
+
+    public boolean isSetTypicalValuesTimeSeriesFile() {
+        return super.isSetObject();
+    }
+
+    public void setTypicalValuesTimeSeriesFile(TypicalValuesRegularTimeSeriesFile typicalValuesRegularTimeSeriesFile) {
+        super.setObject(typicalValuesRegularTimeSeriesFile);
+    }
+
+    public void unsetTypicalValuesTimeSeries() {
+        super.unsetObject();
+    }
+
+    @Override
+    public Class<TypicalValuesRegularTimeSeriesFile> getAssociableClass() {
+        return TypicalValuesRegularTimeSeriesFile.class;
+    }
+
+    @Override
+    public Object copy(CopyBuilder copyBuilder) {
+        return copyTo(new TypicalValuesRegularTimeSeriesFileProperty(), copyBuilder);
+    }
+
+    @Override
+    public Object copyTo(Object target, CopyBuilder copyBuilder) {
+        TypicalValuesRegularTimeSeriesFileProperty copy = (target == null) ? new TypicalValuesRegularTimeSeriesFileProperty() : (TypicalValuesRegularTimeSeriesFileProperty) target;
+        return super.copyTo(copy, copyBuilder);
+    }
+}

src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesTimeSeriesProperty.java → src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesRegularTimeSeriesProperty.java

@@ -4,17 +4,17 @@ import org.citygml4j.builder.copy.CopyBuilder;
 import org.citygml4j.model.citygml.ade.binding.ADEModelObject;
 import org.citygml4j.model.gml.base.AssociationByRepOrRef;
 
-public class TypicalValuesTimeSeriesProperty extends AssociationByRepOrRef<TypicalValuesTimeSeries> implements ADEModelObject {
+public class TypicalValuesRegularTimeSeriesProperty extends AssociationByRepOrRef<TypicalValuesRegularTimeSeries> implements ADEModelObject {
 
-    public TypicalValuesTimeSeriesProperty() {
+    public TypicalValuesRegularTimeSeriesProperty() {
     }
 
-    public TypicalValuesTimeSeriesProperty(TypicalValuesTimeSeries typicalValuesTimeSeries) {
-        super(typicalValuesTimeSeries);
+    public TypicalValuesRegularTimeSeriesProperty(TypicalValuesRegularTimeSeries typicalValuesRegularTimeSeries) {
+        super(typicalValuesRegularTimeSeries);
     }
 
 
-    public TypicalValuesTimeSeries getTypicalValuesTimeSeries() {
+    public TypicalValuesRegularTimeSeries getTypicalValuesTimeSeries() {
         return super.getObject();
     }
 
@@ -22,8 +22,8 @@ public class TypicalValuesTimeSeriesProperty extends AssociationByRepOrRef<Typic
         return super.isSetObject();
     }
 
-    public void setTypicalValuesTimeSeries(TypicalValuesTimeSeries typicalValuesTimeSeries) {
-        super.setObject(typicalValuesTimeSeries);
+    public void setTypicalValuesTimeSeries(TypicalValuesRegularTimeSeries typicalValuesRegularTimeSeries) {
+        super.setObject(typicalValuesRegularTimeSeries);
     }
 
     public void unsetTypicalValuesTimeSeries() {
@@ -31,18 +31,18 @@ public class TypicalValuesTimeSeriesProperty extends AssociationByRepOrRef<Typic
     }
 
     @Override
-    public Class<TypicalValuesTimeSeries> getAssociableClass() {
-        return TypicalValuesTimeSeries.class;
+    public Class<TypicalValuesRegularTimeSeries> getAssociableClass() {
+        return TypicalValuesRegularTimeSeries.class;
     }
 
     @Override
     public Object copy(CopyBuilder copyBuilder) {
-        return copyTo(new TypicalValuesTimeSeriesProperty(), copyBuilder);
+        return copyTo(new TypicalValuesRegularTimeSeriesProperty(), copyBuilder);
     }
 
     @Override
     public Object copyTo(Object target, CopyBuilder copyBuilder) {
-        TypicalValuesTimeSeriesProperty copy = (target == null) ? new TypicalValuesTimeSeriesProperty() : (TypicalValuesTimeSeriesProperty) target;
+        TypicalValuesRegularTimeSeriesProperty copy = (target == null) ? new TypicalValuesRegularTimeSeriesProperty() : (TypicalValuesRegularTimeSeriesProperty) target;
         return super.copyTo(copy, copyBuilder);
     }
 }

src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/UnitOfMeasure.java

+package org.citygml4j.ade.energy3.model.supportingClasses;
+
+import org.citygml4j.builder.copy.CopyBuilder;
+import org.citygml4j.model.common.visitor.FeatureFunctor;
+import org.citygml4j.model.common.visitor.FeatureVisitor;
+import org.citygml4j.model.common.visitor.GMLFunctor;
+import org.citygml4j.model.common.visitor.GMLVisitor;
+import org.citygml4j.model.gml.feature.AbstractFeature;
+
+public class UnitOfMeasure extends AbstractFeature {
+
+    private String uom;
+    public String getUom() {
+        return uom;
+    }
+
+    public void setUom(String uom) {
+        this.uom = uom;
+    }
+
+    public boolean isSetUom() {
+        return this.uom != null;
+    }
+
+    @Override
+    public void accept(FeatureVisitor featureVisitor) {
+
+    }
+
+    @Override
+    public <T> T accept(FeatureFunctor<T> featureFunctor) {
+        return null;
+    }
+
+    @Override
+    public void accept(GMLVisitor gmlVisitor) {
+
+    }
+
+    @Override
+    public <T> T accept(GMLFunctor<T> gmlFunctor) {
+        return null;
+    }
+
+    @Override
+    public Object copy(CopyBuilder copyBuilder) {
+        return null;
+    }
+}

src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/UnitOfMeasureProperty.java

+package org.citygml4j.ade.energy3.model.supportingClasses;
+
+import org.citygml4j.builder.copy.CopyBuilder;
+import org.citygml4j.model.citygml.ade.binding.ADEModelObject;
+import org.citygml4j.model.gml.feature.FeatureProperty;
+
+public class UnitOfMeasureProperty extends FeatureProperty<UnitOfMeasure> implements ADEModelObject {
+
+    public UnitOfMeasureProperty() {}
+    public UnitOfMeasureProperty(UnitOfMeasure unitOfMeasure) { super(unitOfMeasure);}
+    public UnitOfMeasure getunitOfMeasure() {return super.getObject();}
+    public UnitOfMeasureProperty(String href) {super(href);}
+    public boolean isSetUnitOfMeasure() {return super.isSetObject();}
+    public void setUnitOfMeasure(UnitOfMeasure unitOfMeasure) {
+        super.setObject(unitOfMeasure);
+    }
+    public void unsetUnitOfMeasure() {super.unsetObject();}
+
+    @Override
+    public Class<UnitOfMeasure> getAssociableClass() {
+        return UnitOfMeasure.class;
+    }
+
+    @Override
+    public Object copy(CopyBuilder copyBuilder) {
+        return copyTo(new UnitOfMeasureProperty(), copyBuilder);
+    }
+
+    @Override
+    public Object copyTo(Object target, CopyBuilder copyBuilder) {
+        UnitOfMeasureProperty copy = (target == null) ? new UnitOfMeasureProperty() : (UnitOfMeasureProperty) target;
+        return super.copyTo(copy, copyBuilder);
+    }
+}