diff --git a/.gradle/8.5/executionHistory/executionHistory.bin b/.gradle/8.5/executionHistory/executionHistory.bin index 0f403a148b54daf73922d22f2dc1f64adc8376eb..42e647c2eb4ebdb8d225bcc3d3364e059cc91195 100644 Binary files a/.gradle/8.5/executionHistory/executionHistory.bin and b/.gradle/8.5/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.5/executionHistory/executionHistory.lock b/.gradle/8.5/executionHistory/executionHistory.lock index 8f8344908639ab95c94e9a3545b9d6b8e972ebf3..d67eb034038443a5e9e2c5efde81558dad89c734 100644 Binary files a/.gradle/8.5/executionHistory/executionHistory.lock and b/.gradle/8.5/executionHistory/executionHistory.lock differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 6fb6f7676e792f75550bca0db0e97018179f6e03..0337b24d1c38120625b7ae55c9e9969d3a1ba45b 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index 6d2c76ed19474362a2b5542c2f592f1fb7d15b59..8d70b208235741d00d3ab6c71a70ce14a66b04ea 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index 401ce4a16ae129635ea9be95c5d4eb26374de5de..4629c7e90fc3cd6a4b1aa668e9b911b80e550ad4 100644 Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 13566b81b018ad684f3a35fee301741b2734c8f4..0000000000000000000000000000000000000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index b6c2d315546d2c490d32bed09ff4654ef2375fc0..0000000000000000000000000000000000000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -energy-ade2-citygml4j \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 4a0ddff26734ba64e3a56c6c3ec0f06b4b8bfc1e..0000000000000000000000000000000000000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 8b4669a717ee426299285bbd8ae78c1492f9b185..0000000000000000000000000000000000000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index fdc392fe877c32ab51d532fa67f65ff2e75e9061..0000000000000000000000000000000000000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 315e3a464028383216dead6bf75531624d179cc4..0000000000000000000000000000000000000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1ddfbbc029bcab630581847471d7f238ec53..0000000000000000000000000000000000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 25b5b920af36f5f2abf8106f477a9f3d18b10e35..0000000000000000000000000000000000000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,191 +0,0 @@ - - - - - - - - - - - - - - - - - - - { - "associatedIndex": 3 -} - - - - - { - "keyToString": { - "RunOnceActivity.ShowReadmeOnStart": "true", - "git-widget-placeholder": "master", - "kotlin-language-version-configured": "true", - "last_opened_file_path": "D:/EnergyADE2/energy-ade-2-3dcitydb", - "nodejs_package_manager_path": "npm", - "vue.rearranger.settings.migration": "true" - } -} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1754675082964 - - - - - - \ No newline at end of file diff --git a/build.gradle b/build.gradle index 1c221db6c6550e457d089edff0a513e85f7e9c1b..4ee1ede3dcef952395798c990db27120cb25caff 100644 --- a/build.gradle +++ b/build.gradle @@ -18,8 +18,8 @@ java { allprojects { group 'org.citygml4j.ade' - version 'beta7-0.2' - description 'Energy ADE 3 (beta 7) extension for citygml4j - release 0.2' + version 'beta7-0.3' + description 'Energy ADE 3 (beta 7) extension for citygml4j - release 0.3' ext { citygml4jVersion = '2.13.1' diff --git a/src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEMarshaller.java b/src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEMarshaller.java index 00b2b8ad4a02c6354a065d5e6f8abb76c4c912d5..97f25c17b50a4442f8a6c3d2d88abbfb3832ebae 100644 --- a/src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEMarshaller.java +++ b/src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEMarshaller.java @@ -42,8 +42,8 @@ public class EnergyADEMarshaller implements ADEMarshaller { try { if (elementMapper == null) { elementMapper = TypeMapper.>create() - .with(RegularTimeSeriesFile.class, this::createRegularTimeSeriesFile) - .with(TypicalValuesTimeSeriesFile.class, this::createTypicalValuesTimeSeriesFile) + // .with(RegularTimeSeriesFile.class, this::createRegularTimeSeriesFile) + // .with(TypicalValuesTimeSeriesFile.class, this::createTypicalValuesTimeSeriesFile) .with(BuildingTypeProperty.class, this::createBuildingTypeProperty) .with(BuildingConstructionWeightProperty.class, this::createBuildingConstructionWeightProperty) // .with(BuildingHeightAboveGroundProperty.class, this::createBuildingHeightAboveGroundProperty) @@ -90,10 +90,10 @@ public class EnergyADEMarshaller implements ADEMarshaller { try { if (typeMapper == null) { typeMapper = TypeMapper.create() - .with(RegularTimeSeries.class, this::marshalRegularTimeSeries) + // .with(RegularTimeSeries.class, this::marshalRegularTimeSeries) .with(WeatherData.class, this::marshalWeatherData) .with(WeatherDataProperty.class, this::marshalWeatherDataProperty) - .with(RegularTimeSeriesFile.class, this::marshalRegularTimeSeriesFile) + //.with(RegularTimeSeriesFile.class, this::marshalRegularTimeSeriesFile) .with(AbstractScheduleProperty.class, this::marshalAbstractScheduleProperty) .with(AbstractLibraryProperty.class, this::marshalAbstractLibraryProperty) .with(DeviceOperation.class, this::marshalDeviceOperation) @@ -102,9 +102,9 @@ public class EnergyADEMarshaller implements ADEMarshaller { .with(RegularTimeSeriesProperty.class, this::marshalRegularTimeSeriesProperty) .with(TypicalValuesTimeSeriesFileProperty.class, this::marshalTypicalValuesTimeSeriesFileProperty) .with(TypicalValuesTimeSeriesProperty.class, this::marshalTypicalValuesTimeSeriesProperty) - .with(TypicalValuesTimeSeries.class, this::marshalTypicalValuesTimeSeries) - .with(TypicalValuesTimeSeriesFile.class, this::marshalTypicalValuesTimeSeriesFile) - .with(SensorConnection.class, this::marshalSensorConnection) + // .with(TypicalValuesTimeSeries.class, this::marshalTypicalValuesTimeSeries) + // .with(TypicalValuesTimeSeriesFile.class, this::marshalTypicalValuesTimeSeriesFile) + // .with(SensorConnection.class, this::marshalSensorConnection) .with(SensorConnectionProperty.class, this::marshalSensorConnectionProperty) .with(UrbanFunctionArea.class, this::marshalUrbanFunctionArea) .with(AbstractResourceProperty.class, this::marshalAbstractResourceProperty) @@ -1013,6 +1013,8 @@ public class EnergyADEMarshaller implements ADEMarshaller { uom.setUom(src.getUom()); dest.setUom(uom); } + if (src.isSetFileURI()) + dest.setFileURI(src.getFileURI().toString()); if (src.isSetTemporalExtent()) dest.setTemporalExtent(marshalTimeIntervalLength(src.getTemporalExtent())); diff --git a/src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEUnmarshaller.java b/src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEUnmarshaller.java index c35ce84033f89aa074c7208175eb8c38c583c898..06704b777006f562528f1740ee3ed1ea642d78bc 100644 --- a/src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEUnmarshaller.java +++ b/src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEUnmarshaller.java @@ -125,6 +125,8 @@ public class EnergyADEUnmarshaller implements ADEUnmarshaller { return (unmarshalAbstractResourceProperty((AbstractResourcePropertyType) value)); case "weatherData": return unmarshalWeatherDataProperty((WeatherDataPropertyType)value); + case "WeatherData": + return unmarshalWeatherData((WeatherDataType) value); case "referencePoint": return new ReferencePointProperty(helper.getGMLUnmarshaller().unmarshalPointProperty((PointPropertyType) value)); case "suitability": @@ -763,7 +765,7 @@ public class EnergyADEUnmarshaller implements ADEUnmarshaller { return dest; } - catch (URISyntaxException e) { + catch (URISyntaxException e) { throw new RuntimeException("Error parsing URI", e); } catch (UnsupportedEncodingException e) { throw new RuntimeException("Unsupported encoding", e); @@ -786,7 +788,10 @@ public class EnergyADEUnmarshaller implements ADEUnmarshaller { dest.setStartMonth(src.getStartMonth().intValue()); if (src.isSetUom() && src.getUom().isSetUom()) dest.setUom(src.getUom().getUom()); - + if (src.isSetFileURI()){ + URI uri = URI.create(src.getFileURI()); + dest.setFileURI(uri); + } if (src.isSetTemporalExtent()) dest.setTemporalExtent(unmarshalTimeIntervalLength(src.getTemporalExtent())); @@ -1452,8 +1457,8 @@ public class EnergyADEUnmarshaller implements ADEUnmarshaller { } /* - * Convert WeatherStationType to WeatherStation. - */ + * Convert WeatherStationType to WeatherStation. + */ private WeatherStation unmarshalWeatherStation(WeatherStationType src) throws MissingADESchemaException { WeatherStation dest = new WeatherStation(); helper.getCore200Unmarshaller().unmarshalAbstractCityObject(src, dest);