From fc3a932dc528a1ee8584484ab2e1353b431d83fb Mon Sep 17 00:00:00 2001 From: Rushi Date: Tue, 9 Dec 2025 18:05:42 +0100 Subject: [PATCH] fixes in TimeSeries imp-exp, importmanager and marshaller/unmarshaller --- .../8.5/executionHistory/executionHistory.bin | Bin 530614 -> 530614 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .gradle/buildOutputCleanup/outputFiles.bin | Bin 19649 -> 19685 bytes .gradle/file-system.probe | Bin 8 -> 8 bytes .idea/.gitignore | 8 - .idea/.name | 1 - .idea/compiler.xml | 15 -- .idea/gradle.xml | 18 -- .idea/jarRepositories.xml | 20 -- .idea/misc.xml | 5 - .idea/vcs.xml | 6 - .idea/workspace.xml | 191 ------------------ build.gradle | 4 +- .../ade/energy3/bind/EnergyADEMarshaller.java | 16 +- .../energy3/bind/EnergyADEUnmarshaller.java | 13 +- 16 files changed, 20 insertions(+), 277 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/.name delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/gradle.xml delete mode 100644 .idea/jarRepositories.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/workspace.xml diff --git a/.gradle/8.5/executionHistory/executionHistory.bin b/.gradle/8.5/executionHistory/executionHistory.bin index 0f403a148b54daf73922d22f2dc1f64adc8376eb..42e647c2eb4ebdb8d225bcc3d3364e059cc91195 100644 GIT binary patch delta 6426 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 N`mRLy$=zfBe*jQ>C3^q> delta 25214 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

)pqUO#&AkjHdzUSCbHb?A)CqOtn{ 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 HIPCpDi6$zj diff --git a/.gradle/8.5/executionHistory/executionHistory.lock b/.gradle/8.5/executionHistory/executionHistory.lock index 8f8344908639ab95c94e9a3545b9d6b8e972ebf3..d67eb034038443a5e9e2c5efde81558dad89c734 100644 GIT binary patch literal 17 UcmZR6EmlzQU~WVS0|cA`05zKg_y7O^ literal 17 UcmZR6EmlzQU~WVS0|ZP505xa?#Q*>R diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 6fb6f7676e792f75550bca0db0e97018179f6e03..0337b24d1c38120625b7ae55c9e9969d3a1ba45b 100644 GIT binary patch literal 17 VcmZSPc@mf=`TB7$0~j#Q001$r1h@bI literal 17 VcmZSPc@mf=`TB7$0~j#6001#s1Y`gJ diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index 6d2c76ed19474362a2b5542c2f592f1fb7d15b59..8d70b208235741d00d3ab6c71a70ce14a66b04ea 100644 GIT binary patch delta 81 zcmX>&lkw?H#tkMCj82nHB_{HB-D{}nSj)%&20jNj@0HlVEZ|VmrM{=3IT0#)d2_1F eZAM1Njfy|SHyYd!-0bMlz%qHihy3IN-mCz8&m2hr delta 40 ycmV+@0N4NJnE}C>0kAX}0YH;A7?HEy7^efXogC8v0THnw_!qG-2okeFNPq-G@(#)X diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index 401ce4a16ae129635ea9be95c5d4eb26374de5de..4629c7e90fc3cd6a4b1aa668e9b911b80e550ad4 100644 GIT binary patch literal 8 PcmZQzV4TgIx7-x~1^xm0 literal 8 PcmZQzV4S78s{S|t2WJAY diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 13566b8..0000000 --- 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 b6c2d31..0000000 --- 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 4a0ddff..0000000 --- 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 8b4669a..0000000 --- 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 fdc392f..0000000 --- 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 315e3a4..0000000 --- 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 35eb1dd..0000000 --- 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 25b5b92..0000000 --- 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 1c221db..4ee1ede 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 00b2b8a..97f25c1 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 c35ce84..06704b7 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); -- GitLab