Commit 86319fad authored by PrabithaPrabhakaran's avatar PrabithaPrabhakaran
Browse files

remove include from settings.gradle, add todo comments

parent 4f21303e
.gradle .gradle/
build/ build/
!gradle/wrapper/gradle-wrapper.jar !gradle/wrapper/gradle-wrapper.jar
!**/src/main/**/build/ !**/src/main/**/build/
......
rootProject.name = 'energy-ade-3-citygml4j' rootProject.name = 'energy-ade-3-citygml4j'
include 'energy-ade-samples' //include 'energy-ade-samples'
...@@ -2590,8 +2590,8 @@ public class EnergyADEMarshaller implements ADEMarshaller { ...@@ -2590,8 +2590,8 @@ public class EnergyADEMarshaller implements ADEMarshaller {
} }
if (src.isTimeDependentValues()) if (src.isTimeDependentValues())
dest.setTimeDependentValues(marshalAbstractTimeSeriesProperty(src.getTimeDependentValues())); dest.setTimeDependentValues(marshalAbstractTimeSeriesProperty(src.getTimeDependentValues()));
// if (src.isSetPosition()) if (src.isSetPosition())
// dest.setPosition(src.getPosition()); dest.setPosition(helper.getGMLMarshaller().marshalPointProperty(src.getPosition()));
return dest; return dest;
} }
......
...@@ -143,6 +143,14 @@ public class EnergyADEUnmarshaller implements ADEUnmarshaller { ...@@ -143,6 +143,14 @@ public class EnergyADEUnmarshaller implements ADEUnmarshaller {
return new ReferencePointProperty(helper.getGMLUnmarshaller().unmarshalPointProperty((PointPropertyType) value)); return new ReferencePointProperty(helper.getGMLUnmarshaller().unmarshalPointProperty((PointPropertyType) value));
case "suitability": case "suitability":
return new SuitabilityProperty((SuitabilityPropertyType) value); return new SuitabilityProperty((SuitabilityPropertyType) value);
/* To-Do Debug the 'value'. check if identifier, validTo, validFrom are automatically unmarshalled.
*/
// case "validFrom":
// return new IdentifierType(value);
// case "identifier":
// return new IdentifierType((SuitabilityPropertyType) value);
// case "validTo":
// return new IdentifierType((SuitabilityPropertyType) value);
// case "externalReference": // case "externalReference":
// return new ExternalReferenceProperty((ExternalReferenceProperty)value); // return new ExternalReferenceProperty((ExternalReferenceProperty)value);
} }
...@@ -170,6 +178,8 @@ public class EnergyADEUnmarshaller implements ADEUnmarshaller { ...@@ -170,6 +178,8 @@ public class EnergyADEUnmarshaller implements ADEUnmarshaller {
if (src.isSetTimeDependentValues()) { if (src.isSetTimeDependentValues()) {
dest.setTimeDependentValues(unmarshalAbstractTimeSeriesProperty(src.getTimeDependentValues())); dest.setTimeDependentValues(unmarshalAbstractTimeSeriesProperty(src.getTimeDependentValues()));
} }
if (src.isSetPosition())
dest.setPosition(helper.getGMLUnmarshaller().unmarshalPointProperty(src.getPosition()));
return dest; return dest;
} }
......
...@@ -14,7 +14,7 @@ import javax.xml.datatype.XMLGregorianCalendar; ...@@ -14,7 +14,7 @@ import javax.xml.datatype.XMLGregorianCalendar;
public class AbstractFeatureWithLifeSpan extends AbstractFeature implements ADEModelObject { public class AbstractFeatureWithLifeSpan extends AbstractFeature implements ADEModelObject {
private Code identifier; private Code identifier;
private XMLGregorianCalendar validFrom; private XMLGregorianCalendar validFrom; // chamge to zonedate time
private XMLGregorianCalendar validTo; private XMLGregorianCalendar validTo;
public boolean isIdentifier(){ public boolean isIdentifier(){
......
...@@ -9,6 +9,7 @@ import org.citygml4j.model.common.visitor.GMLVisitor; ...@@ -9,6 +9,7 @@ import org.citygml4j.model.common.visitor.GMLVisitor;
import org.citygml4j.model.gml.basicTypes.Code; import org.citygml4j.model.gml.basicTypes.Code;
import org.citygml4j.model.gml.basicTypes.Measure; import org.citygml4j.model.gml.basicTypes.Measure;
import org.citygml4j.model.gml.feature.AbstractFeature; import org.citygml4j.model.gml.feature.AbstractFeature;
import org.citygml4j.model.gml.geometry.primitives.Point;
import org.citygml4j.model.gml.geometry.primitives.PointProperty; import org.citygml4j.model.gml.geometry.primitives.PointProperty;
public class SensorData extends AbstractADEFeature implements ADEModelObject { public class SensorData extends AbstractADEFeature implements ADEModelObject {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment