Skip to content

Commit

Permalink
Added sigmet phenomenon type (#120)
Browse files Browse the repository at this point in the history
  • Loading branch information
@kasarit
kasarit authored Nov 14, 2023
1 parent 74d1674 commit 5e42366
Show file tree
Hide file tree
Showing 11 changed files with 1,782 additions and 1,812 deletions.
1,674 changes: 845 additions & 829 deletions src/main/java/fi/fmi/avi/model/AviationCodeListUser.java
View file

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions src/main/java/fi/fmi/avi/model/sigmet/SIGMET.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
import java.util.Optional;

public interface SIGMET extends SIGMETAIRMET {

SigmetPhenomenonType getPhenomenonType();

Optional<AeronauticalSignificantWeatherPhenomenon> getPhenomenon();

Optional<Reference> getCancelledReference();
Expand Down
544 changes: 267 additions & 277 deletions src/main/java/fi/fmi/avi/model/sigmet/immutable/SIGMETImpl.java
View file

Large diffs are not rendered by default.

258 changes: 122 additions & 136 deletions src/test/java/fi/fmi/avi/converter/json/JSONSigmetConverterTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,136 +1,122 @@
package fi.fmi.avi.converter.json;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;

import java.io.InputStream;
import java.time.ZonedDateTime;
import java.util.Collections;
import java.util.Objects;

import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.support.AnnotationConfigContextLoader;
import org.unitils.thirdparty.org.apache.commons.io.IOUtils;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;

import fi.fmi.avi.converter.AviMessageConverter;
import fi.fmi.avi.converter.ConversionHints;
import fi.fmi.avi.converter.ConversionResult;
import fi.fmi.avi.converter.json.conf.JSONConverter;
import fi.fmi.avi.model.Airspace;
import fi.fmi.avi.model.AviationCodeListUser;
import fi.fmi.avi.model.AviationWeatherMessage;
import fi.fmi.avi.model.Geometry;
import fi.fmi.avi.model.PartialOrCompleteTimeInstant;
import fi.fmi.avi.model.PartialOrCompleteTimePeriod;
import fi.fmi.avi.model.UnitPropertyGroup;
import fi.fmi.avi.model.immutable.AirspaceImpl;
import fi.fmi.avi.model.immutable.NumericMeasureImpl;
import fi.fmi.avi.model.immutable.PhenomenonGeometryImpl;
import fi.fmi.avi.model.immutable.PhenomenonGeometryWithHeightImpl;
import fi.fmi.avi.model.immutable.TacOrGeoGeometryImpl;
import fi.fmi.avi.model.immutable.UnitPropertyGroupImpl;
import fi.fmi.avi.model.sigmet.SIGMET;
import fi.fmi.avi.model.sigmet.SigmetAnalysisType;
import fi.fmi.avi.model.sigmet.SigmetIntensityChange;
import fi.fmi.avi.model.sigmet.immutable.SIGMETImpl;

@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes = JSONSigmetTestConfiguration.class, loader = AnnotationConfigContextLoader.class)
public class JSONSigmetConverterTest {

@Autowired
private AviMessageConverter converter;

public void testSIGMETParsing() throws Exception {
final InputStream is = JSONSigmetConverterTest.class.getResourceAsStream("sigmet1.json");
Objects.requireNonNull(is);
final String input = IOUtils.toString(is, "UTF-8");
is.close();
final ConversionResult<SIGMET> result = converter.convertMessage(input,
JSONConverter.JSON_STRING_TO_SIGMET_POJO, ConversionHints.EMPTY);
assertSame(ConversionResult.Status.SUCCESS, result.getStatus());
}

@Test
public void testSIGMETSerialization() throws Exception {
final ObjectMapper om = new ObjectMapper();
om.registerModule(new Jdk8Module());
om.registerModule(new JavaTimeModule());

final InputStream is = JSONSigmetConverterTest.class.getResourceAsStream("sigmet1.json");
Objects.requireNonNull(is);
final String reference = IOUtils.toString(is, "UTF-8");
is.close();

final SIGMETImpl.Builder builder = SIGMETImpl.builder();

final UnitPropertyGroup mwo = new UnitPropertyGroupImpl.Builder().setPropertyGroup("De Bilt", "EHDB", "MWO")
.build();
final UnitPropertyGroup fir = new UnitPropertyGroupImpl.Builder()
.setPropertyGroup("AMSTERDAM FIR", "EHAA", "FIR").build();

final Airspace airspace = new AirspaceImpl.Builder().setDesignator("EHAA").setType(Airspace.AirspaceType.FIR)
.setName("AMSTERDAM").build();

final String geomString = "{ \"type\": \"Polygon\", \"exteriorRingPositions\":[5.0,52.0,6.0,53.0,4.0,54.0,5.0,52.0]}";
final Geometry geom = om.readValue(geomString, Geometry.class);
final String fpaGeomString = "{ \"type\": \"Polygon\", \"exteriorRingPositions\":[5.0,53.0,6.0,54.0,4.0,55.0,5.0,53.0]}";
final Geometry fpaGeom = om.readValue(fpaGeomString, Geometry.class);

final PartialOrCompleteTimeInstant.Builder issueTimeBuilder = PartialOrCompleteTimeInstant.builder();
issueTimeBuilder.setCompleteTime(ZonedDateTime.parse("2017-08-27T11:30:00Z"));
final PartialOrCompleteTimePeriod.Builder validPeriod = PartialOrCompleteTimePeriod.builder();
validPeriod.setStartTime(PartialOrCompleteTimeInstant.of(ZonedDateTime.parse("2017-08-27T11:30:00Z")));
validPeriod.setEndTime(PartialOrCompleteTimeInstant.of(ZonedDateTime.parse("2017-08-27T18:00:00Z")));

final PhenomenonGeometryWithHeightImpl.Builder geomBuilder = PhenomenonGeometryWithHeightImpl.builder();
geomBuilder.setApproximateLocation(false);
geomBuilder.setGeometry(TacOrGeoGeometryImpl.of(geom));
geomBuilder.setTime(PartialOrCompleteTimeInstant.of(ZonedDateTime.parse("2017-08-27T12:00:00Z")));
geomBuilder.setLowerLimit(NumericMeasureImpl.of(10, "FL"));
geomBuilder.setUpperLimit(NumericMeasureImpl.of(35, "FL"));
geomBuilder.setIntensityChange(SigmetIntensityChange.NO_CHANGE);
geomBuilder.setAnalysisType(SigmetAnalysisType.OBSERVATION);

final PhenomenonGeometryImpl.Builder fpGeomBuilder = PhenomenonGeometryImpl.builder();
fpGeomBuilder.setApproximateLocation(false);
fpGeomBuilder.setGeometry(TacOrGeoGeometryImpl.of(fpaGeom));
fpGeomBuilder.setTime(PartialOrCompleteTimeInstant.of(ZonedDateTime.parse("2017-08-27T18:00:00Z")));

builder.setReportStatus(AviationWeatherMessage.ReportStatus.NORMAL)
.setCancelMessage(false)
.setMeteorologicalWatchOffice(mwo)
.setIssuingAirTrafficServicesUnit(fir)
.setAirspace(airspace)
.setIssueTime(issueTimeBuilder.build())
.setTranslated(true)
.setPermissibleUsage(AviationCodeListUser.PermissibleUsage.NON_OPERATIONAL)
.setPermissibleUsageReason(AviationCodeListUser.PermissibleUsageReason.EXERCISE)
.setSequenceNumber("1")

.setValidityPeriod(validPeriod.build())
.setPhenomenon(AviationCodeListUser.AeronauticalSignificantWeatherPhenomenon.EMBD_TS)
.setAnalysisGeometries(Collections.singletonList(geomBuilder.build()))
.setForecastGeometries(Collections.singletonList(fpGeomBuilder.build()));

final SIGMET sigmet = builder.build();
final ConversionResult<String> result = converter.convertMessage(sigmet,
JSONConverter.SIGMET_POJO_TO_JSON_STRING, ConversionHints.EMPTY);
assertSame(ConversionResult.Status.SUCCESS, result.getStatus());
assertTrue(result.getConvertedMessage().isPresent());

final JsonNode refRoot = om.readTree(reference);
final JsonNode convertedRoot = om.readTree(result.getConvertedMessage().get());
assertEquals("constructed and parsed tree not equal", refRoot, convertedRoot);
}
}
package fi.fmi.avi.converter.json;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import fi.fmi.avi.converter.AviMessageConverter;
import fi.fmi.avi.converter.ConversionHints;
import fi.fmi.avi.converter.ConversionResult;
import fi.fmi.avi.converter.json.conf.JSONConverter;
import fi.fmi.avi.model.*;
import fi.fmi.avi.model.immutable.*;
import fi.fmi.avi.model.sigmet.SIGMET;
import fi.fmi.avi.model.sigmet.SigmetAnalysisType;
import fi.fmi.avi.model.sigmet.SigmetIntensityChange;
import fi.fmi.avi.model.sigmet.immutable.SIGMETImpl;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.support.AnnotationConfigContextLoader;
import org.unitils.thirdparty.org.apache.commons.io.IOUtils;

import java.io.InputStream;
import java.time.ZonedDateTime;
import java.util.Collections;
import java.util.Objects;

import static org.junit.Assert.*;

@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes = JSONSigmetTestConfiguration.class, loader = AnnotationConfigContextLoader.class)
public class JSONSigmetConverterTest {

@Autowired
private AviMessageConverter converter;

public void testSIGMETParsing() throws Exception {
final InputStream is = JSONSigmetConverterTest.class.getResourceAsStream("sigmet1.json");
Objects.requireNonNull(is);
final String input = IOUtils.toString(is, "UTF-8");
is.close();
final ConversionResult<SIGMET> result = converter.convertMessage(input,
JSONConverter.JSON_STRING_TO_SIGMET_POJO, ConversionHints.EMPTY);
assertSame(ConversionResult.Status.SUCCESS, result.getStatus());
}

@Test
public void testSIGMETSerialization() throws Exception {
final ObjectMapper om = new ObjectMapper();
om.registerModule(new Jdk8Module());
om.registerModule(new JavaTimeModule());

final InputStream is = JSONSigmetConverterTest.class.getResourceAsStream("sigmet1.json");
Objects.requireNonNull(is);
final String reference = IOUtils.toString(is, "UTF-8");
is.close();

final SIGMETImpl.Builder builder = SIGMETImpl.builder();

final UnitPropertyGroup mwo = new UnitPropertyGroupImpl.Builder().setPropertyGroup("De Bilt", "EHDB", "MWO")
.build();
final UnitPropertyGroup fir = new UnitPropertyGroupImpl.Builder()
.setPropertyGroup("AMSTERDAM FIR", "EHAA", "FIR").build();

final Airspace airspace = new AirspaceImpl.Builder().setDesignator("EHAA").setType(Airspace.AirspaceType.FIR)
.setName("AMSTERDAM").build();

final String geomString = "{ \"type\": \"Polygon\", \"exteriorRingPositions\":[5.0,52.0,6.0,53.0,4.0,54.0,5.0,52.0]}";
final Geometry geom = om.readValue(geomString, Geometry.class);
final String fpaGeomString = "{ \"type\": \"Polygon\", \"exteriorRingPositions\":[5.0,53.0,6.0,54.0,4.0,55.0,5.0,53.0]}";
final Geometry fpaGeom = om.readValue(fpaGeomString, Geometry.class);

final PartialOrCompleteTimeInstant.Builder issueTimeBuilder = PartialOrCompleteTimeInstant.builder();
issueTimeBuilder.setCompleteTime(ZonedDateTime.parse("2017-08-27T11:30:00Z"));
final PartialOrCompleteTimePeriod.Builder validPeriod = PartialOrCompleteTimePeriod.builder();
validPeriod.setStartTime(PartialOrCompleteTimeInstant.of(ZonedDateTime.parse("2017-08-27T11:30:00Z")));
validPeriod.setEndTime(PartialOrCompleteTimeInstant.of(ZonedDateTime.parse("2017-08-27T18:00:00Z")));

final PhenomenonGeometryWithHeightImpl.Builder geomBuilder = PhenomenonGeometryWithHeightImpl.builder();
geomBuilder.setApproximateLocation(false);
geomBuilder.setGeometry(TacOrGeoGeometryImpl.of(geom));
geomBuilder.setTime(PartialOrCompleteTimeInstant.of(ZonedDateTime.parse("2017-08-27T12:00:00Z")));
geomBuilder.setLowerLimit(NumericMeasureImpl.of(10, "FL"));
geomBuilder.setUpperLimit(NumericMeasureImpl.of(35, "FL"));
geomBuilder.setIntensityChange(SigmetIntensityChange.NO_CHANGE);
geomBuilder.setAnalysisType(SigmetAnalysisType.OBSERVATION);

final PhenomenonGeometryImpl.Builder fpGeomBuilder = PhenomenonGeometryImpl.builder();
fpGeomBuilder.setApproximateLocation(false);
fpGeomBuilder.setGeometry(TacOrGeoGeometryImpl.of(fpaGeom));
fpGeomBuilder.setTime(PartialOrCompleteTimeInstant.of(ZonedDateTime.parse("2017-08-27T18:00:00Z")));

builder.setReportStatus(AviationWeatherMessage.ReportStatus.NORMAL)
.setCancelMessage(false)
.setMeteorologicalWatchOffice(mwo)
.setIssuingAirTrafficServicesUnit(fir)
.setAirspace(airspace)
.setIssueTime(issueTimeBuilder.build())
.setTranslated(true)
.setPermissibleUsage(AviationCodeListUser.PermissibleUsage.NON_OPERATIONAL)
.setPermissibleUsageReason(AviationCodeListUser.PermissibleUsageReason.EXERCISE)
.setSequenceNumber("1")

.setValidityPeriod(validPeriod.build())
.setPhenomenonType(AviationCodeListUser.SigmetPhenomenonType.SIGMET)
.setPhenomenon(AviationCodeListUser.AeronauticalSignificantWeatherPhenomenon.EMBD_TS)
.setAnalysisGeometries(Collections.singletonList(geomBuilder.build()))
.setForecastGeometries(Collections.singletonList(fpGeomBuilder.build()));

final SIGMET sigmet = builder.build();
final ConversionResult<String> result = converter.convertMessage(sigmet,
JSONConverter.SIGMET_POJO_TO_JSON_STRING, ConversionHints.EMPTY);
assertSame(ConversionResult.Status.SUCCESS, result.getStatus());
assertTrue(result.getConvertedMessage().isPresent());

final JsonNode refRoot = om.readTree(reference);
final JsonNode convertedRoot = om.readTree(result.getConvertedMessage().get());
assertEquals("constructed and parsed tree not equal", refRoot, convertedRoot);
}
}
Loading

0 comments on commit 5e42366

Please sign in to comment.