Skip to content
GitLab
Commit dc37e927 authored by Rushikesh Padsala's avatar Rushikesh Padsala
Browse files

Merge branch 'beta7' into 'master' 

fixes in TimeSeries imp-exp, importmanager and marshaller/unmarshaller

See merge request !12
parents c23ab655 fc3a932d
Hide whitespace changes
Inline Side-by-side
.idea/.gitignore deleted 100644 → 0
View file @ c23ab655
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
.idea/.name deleted 100644 → 0
View file @ c23ab655
energy-ade2-citygml4j
\ No newline at end of file
.idea/compiler.xml deleted 100644 → 0
View file @ c23ab655
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<annotationProcessing>
<profile name="Gradle Imported" enabled="true">
<outputRelativeToContentRoot value="true" />
<processorPath useClasspath="false">
<entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.projectlombok/lombok/1.18.24/13a394eed5c4f9efb2a6d956e2086f1d81e857d9/lombok-1.18.24.jar" />
</processorPath>
<module name="energy-ade2-citygml4j.main" />
</profile>
</annotationProcessing>
<bytecodeTargetLevel target="17" />
</component>
</project>
\ No newline at end of file
.idea/gradle.xml deleted 100644 → 0
View file @ c23ab655
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="#JAVA_HOME" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/energy-ade-samples" />
</set>
</option>
</GradleProjectSettings>
</option>
</component>
</project>
\ No newline at end of file
.idea/jarRepositories.xml deleted 100644 → 0
View file @ c23ab655
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
<remote-repository>
<option name="id" value="MavenRepo" />
<option name="name" value="MavenRepo" />
<option name="url" value="https://repo.maven.apache.org/maven2/" />
</remote-repository>
</component>
</project>
\ No newline at end of file
.idea/misc.xml deleted 100644 → 0
View file @ c23ab655
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="liberica-17" project-jdk-type="JavaSDK" />
</project>
\ No newline at end of file
.idea/vcs.xml deleted 100644 → 0
View file @ c23ab655
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>
\ No newline at end of file
.idea/workspace.xml deleted 100644 → 0
View file @ c23ab655
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AutoImportSettings">
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="ff92de30-c0d0-40d7-af8c-e89c261974e1" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/cache.properties" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/cache.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="ExternalProjectsData">
<projectState path="$PROJECT_DIR$">
<ProjectState />
</projectState>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="ProjectColorInfo">{
&quot;associatedIndex&quot;: 3
}</component>
<component name="ProjectId" id="310y39KY4y4YmrHaldec43hsTzI" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">{
&quot;keyToString&quot;: {
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
&quot;git-widget-placeholder&quot;: &quot;master&quot;,
&quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
&quot;last_opened_file_path&quot;: &quot;D:/EnergyADE2/energy-ade-2-3dcitydb&quot;,
&quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
}
}</component>
<component name="RunManager">
<configuration default="true" type="DjangoTestsConfigurationType">
<module name="energy-ade-2-citygml4j" />
<option name="ENV_FILES" value="" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
<env name="PYTHONUNBUFFERED" value="1" />
</envs>
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="" />
<option name="IS_MODULE_SDK" value="false" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="TARGET" value="" />
<option name="SETTINGS_FILE" value="" />
<option name="CUSTOM_SETTINGS" value="false" />
<option name="USE_OPTIONS" value="false" />
<option name="OPTIONS" value="" />
<method v="2" />
</configuration>
<configuration default="true" type="JetRunConfigurationType">
<module name="energy-ade-2-citygml4j" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration default="true" type="KotlinStandaloneScriptRunConfigurationType">
<module name="energy-ade-2-citygml4j" />
<option name="filePath" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration default="true" type="PythonConfigurationType" factoryName="Python">
<module name="energy-ade-2-citygml4j" />
<option name="ENV_FILES" value="" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
<env name="PYTHONUNBUFFERED" value="1" />
</envs>
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="" />
<option name="IS_MODULE_SDK" value="false" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="SCRIPT_NAME" value="" />
<option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" />
<option name="MODULE_MODE" value="false" />
<option name="REDIRECT_INPUT" value="false" />
<option name="INPUT_FILE" value="" />
<method v="2" />
</configuration>
<configuration default="true" type="Python.FlaskServer">
<module name="energy-ade-2-citygml4j" />
<option name="ENV_FILES" value="" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="" />
<option name="IS_MODULE_SDK" value="false" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="launchJavascriptDebuger" value="false" />
<method v="2" />
</configuration>
<configuration default="true" type="Tox" factoryName="Tox">
<module name="energy-ade-2-citygml4j" />
<option name="ENV_FILES" value="" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="" />
<option name="IS_MODULE_SDK" value="false" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<method v="2" />
</configuration>
<configuration default="true" type="docs" factoryName="Docutils task">
<module name="energy-ade-2-citygml4j" />
<option name="ENV_FILES" value="" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="" />
<option name="IS_MODULE_SDK" value="false" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="docutils_input_file" value="" />
<option name="docutils_output_file" value="" />
<option name="docutils_params" value="" />
<option name="docutils_task" value="" />
<option name="docutils_open_in_browser" value="false" />
<method v="2" />
</configuration>
<configuration default="true" type="docs" factoryName="Sphinx task">
<module name="energy-ade-2-citygml4j" />
<option name="ENV_FILES" value="" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="" />
<option name="IS_MODULE_SDK" value="false" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="docutils_input_file" value="" />
<option name="docutils_output_file" value="" />
<option name="docutils_params" value="" />
<option name="docutils_task" value="" />
<option name="docutils_open_in_browser" value="false" />
<method v="2" />
</configuration>
</component>
<component name="SharedIndexes">
<attachedChunks>
<set>
<option value="bundled-jdk-9f38398b9061-18abd8497189-intellij.indexing.shared.core-IU-241.14494.240" />
<option value="bundled-js-predefined-1d06a55b98c1-74d2a5396914-JavaScript-IU-241.14494.240" />
</set>
</attachedChunks>
</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="ff92de30-c0d0-40d7-af8c-e89c261974e1" name="Changes" comment="" />
<created>1754675082964</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1754675082964</updated>
<workItem from="1754675084076" duration="36000" />
<workItem from="1754675317833" duration="9000" />
<workItem from="1754675368167" duration="52000" />
</task>
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
</project>
\ No newline at end of file
build.gradle
View file @ dc37e927
...@@ -18,8 +18,8 @@ java { ...@@ -18,8 +18,8 @@ java {
allprojects { allprojects {
group 'org.citygml4j.ade' group 'org.citygml4j.ade'
version 'beta7-0.2' version 'beta7-0.3'
description 'Energy ADE 3 (beta 7) extension for citygml4j - release 0.2' description 'Energy ADE 3 (beta 7) extension for citygml4j - release 0.3'
ext { ext {
citygml4jVersion = '2.13.1' citygml4jVersion = '2.13.1'
......
src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEMarshaller.java
View file @ dc37e927
...@@ -42,8 +42,8 @@ public class EnergyADEMarshaller implements ADEMarshaller { ...@@ -42,8 +42,8 @@ public class EnergyADEMarshaller implements ADEMarshaller {
try { try {
if (elementMapper == null) { if (elementMapper == null) {
elementMapper = TypeMapper.<JAXBElement<?>>create() elementMapper = TypeMapper.<JAXBElement<?>>create()
.with(RegularTimeSeriesFile.class, this::createRegularTimeSeriesFile) // .with(RegularTimeSeriesFile.class, this::createRegularTimeSeriesFile)
.with(TypicalValuesTimeSeriesFile.class, this::createTypicalValuesTimeSeriesFile) // .with(TypicalValuesTimeSeriesFile.class, this::createTypicalValuesTimeSeriesFile)
.with(BuildingTypeProperty.class, this::createBuildingTypeProperty) .with(BuildingTypeProperty.class, this::createBuildingTypeProperty)
.with(BuildingConstructionWeightProperty.class, this::createBuildingConstructionWeightProperty) .with(BuildingConstructionWeightProperty.class, this::createBuildingConstructionWeightProperty)
// .with(BuildingHeightAboveGroundProperty.class, this::createBuildingHeightAboveGroundProperty) // .with(BuildingHeightAboveGroundProperty.class, this::createBuildingHeightAboveGroundProperty)
...@@ -90,10 +90,10 @@ public class EnergyADEMarshaller implements ADEMarshaller { ...@@ -90,10 +90,10 @@ public class EnergyADEMarshaller implements ADEMarshaller {
try { try {
if (typeMapper == null) { if (typeMapper == null) {
typeMapper = TypeMapper.create() typeMapper = TypeMapper.create()
.with(RegularTimeSeries.class, this::marshalRegularTimeSeries) // .with(RegularTimeSeries.class, this::marshalRegularTimeSeries)
.with(WeatherData.class, this::marshalWeatherData) .with(WeatherData.class, this::marshalWeatherData)
.with(WeatherDataProperty.class, this::marshalWeatherDataProperty) .with(WeatherDataProperty.class, this::marshalWeatherDataProperty)
.with(RegularTimeSeriesFile.class, this::marshalRegularTimeSeriesFile) //.with(RegularTimeSeriesFile.class, this::marshalRegularTimeSeriesFile)
.with(AbstractScheduleProperty.class, this::marshalAbstractScheduleProperty) .with(AbstractScheduleProperty.class, this::marshalAbstractScheduleProperty)
.with(AbstractLibraryProperty.class, this::marshalAbstractLibraryProperty) .with(AbstractLibraryProperty.class, this::marshalAbstractLibraryProperty)
.with(DeviceOperation.class, this::marshalDeviceOperation) .with(DeviceOperation.class, this::marshalDeviceOperation)
...@@ -102,9 +102,9 @@ public class EnergyADEMarshaller implements ADEMarshaller { ...@@ -102,9 +102,9 @@ public class EnergyADEMarshaller implements ADEMarshaller {
.with(RegularTimeSeriesProperty.class, this::marshalRegularTimeSeriesProperty) .with(RegularTimeSeriesProperty.class, this::marshalRegularTimeSeriesProperty)
.with(TypicalValuesTimeSeriesFileProperty.class, this::marshalTypicalValuesTimeSeriesFileProperty) .with(TypicalValuesTimeSeriesFileProperty.class, this::marshalTypicalValuesTimeSeriesFileProperty)
.with(TypicalValuesTimeSeriesProperty.class, this::marshalTypicalValuesTimeSeriesProperty) .with(TypicalValuesTimeSeriesProperty.class, this::marshalTypicalValuesTimeSeriesProperty)
.with(TypicalValuesTimeSeries.class, this::marshalTypicalValuesTimeSeries) // .with(TypicalValuesTimeSeries.class, this::marshalTypicalValuesTimeSeries)
.with(TypicalValuesTimeSeriesFile.class, this::marshalTypicalValuesTimeSeriesFile) // .with(TypicalValuesTimeSeriesFile.class, this::marshalTypicalValuesTimeSeriesFile)
.with(SensorConnection.class, this::marshalSensorConnection) // .with(SensorConnection.class, this::marshalSensorConnection)
.with(SensorConnectionProperty.class, this::marshalSensorConnectionProperty) .with(SensorConnectionProperty.class, this::marshalSensorConnectionProperty)
.with(UrbanFunctionArea.class, this::marshalUrbanFunctionArea) .with(UrbanFunctionArea.class, this::marshalUrbanFunctionArea)
.with(AbstractResourceProperty.class, this::marshalAbstractResourceProperty) .with(AbstractResourceProperty.class, this::marshalAbstractResourceProperty)
...@@ -1013,6 +1013,8 @@ public class EnergyADEMarshaller implements ADEMarshaller { ...@@ -1013,6 +1013,8 @@ public class EnergyADEMarshaller implements ADEMarshaller {
uom.setUom(src.getUom()); uom.setUom(src.getUom());
dest.setUom(uom); dest.setUom(uom);
} }
if (src.isSetFileURI())
dest.setFileURI(src.getFileURI().toString());
if (src.isSetTemporalExtent()) if (src.isSetTemporalExtent())
dest.setTemporalExtent(marshalTimeIntervalLength(src.getTemporalExtent())); dest.setTemporalExtent(marshalTimeIntervalLength(src.getTemporalExtent()));
......
src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEUnmarshaller.java
View file @ dc37e927
...@@ -125,6 +125,8 @@ public class EnergyADEUnmarshaller implements ADEUnmarshaller { ...@@ -125,6 +125,8 @@ public class EnergyADEUnmarshaller implements ADEUnmarshaller {
return (unmarshalAbstractResourceProperty((AbstractResourcePropertyType) value)); return (unmarshalAbstractResourceProperty((AbstractResourcePropertyType) value));
case "weatherData": case "weatherData":
return unmarshalWeatherDataProperty((WeatherDataPropertyType)value); return unmarshalWeatherDataProperty((WeatherDataPropertyType)value);
case "WeatherData":
return unmarshalWeatherData((WeatherDataType) value);
case "referencePoint": case "referencePoint":
return new ReferencePointProperty(helper.getGMLUnmarshaller().unmarshalPointProperty((PointPropertyType) value)); return new ReferencePointProperty(helper.getGMLUnmarshaller().unmarshalPointProperty((PointPropertyType) value));
case "suitability": case "suitability":
...@@ -763,7 +765,7 @@ public class EnergyADEUnmarshaller implements ADEUnmarshaller { ...@@ -763,7 +765,7 @@ public class EnergyADEUnmarshaller implements ADEUnmarshaller {
return dest; return dest;
} }
catch (URISyntaxException e) { catch (URISyntaxException e) {
throw new RuntimeException("Error parsing URI", e); throw new RuntimeException("Error parsing URI", e);
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
throw new RuntimeException("Unsupported encoding", e); throw new RuntimeException("Unsupported encoding", e);
...@@ -786,7 +788,10 @@ public class EnergyADEUnmarshaller implements ADEUnmarshaller { ...@@ -786,7 +788,10 @@ public class EnergyADEUnmarshaller implements ADEUnmarshaller {
dest.setStartMonth(src.getStartMonth().intValue()); dest.setStartMonth(src.getStartMonth().intValue());
if (src.isSetUom() && src.getUom().isSetUom()) if (src.isSetUom() && src.getUom().isSetUom())
dest.setUom(src.getUom().getUom()); dest.setUom(src.getUom().getUom());
if (src.isSetFileURI()){
URI uri = URI.create(src.getFileURI());
dest.setFileURI(uri);
}
if (src.isSetTemporalExtent()) if (src.isSetTemporalExtent())
dest.setTemporalExtent(unmarshalTimeIntervalLength(src.getTemporalExtent())); dest.setTemporalExtent(unmarshalTimeIntervalLength(src.getTemporalExtent()));
...@@ -1452,8 +1457,8 @@ public class EnergyADEUnmarshaller implements ADEUnmarshaller { ...@@ -1452,8 +1457,8 @@ public class EnergyADEUnmarshaller implements ADEUnmarshaller {
} }
/* /*
* Convert WeatherStationType to WeatherStation. * Convert WeatherStationType to WeatherStation.
*/ */
private WeatherStation unmarshalWeatherStation(WeatherStationType src) throws MissingADESchemaException { private WeatherStation unmarshalWeatherStation(WeatherStationType src) throws MissingADESchemaException {
WeatherStation dest = new WeatherStation(); WeatherStation dest = new WeatherStation();
helper.getCore200Unmarshaller().unmarshalAbstractCityObject(src, dest); helper.getCore200Unmarshaller().unmarshalAbstractCityObject(src, dest);
......
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

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal