diff --git a/CHANGELOG.md b/CHANGELOG.md index 05e3a2c7..a816d36b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## [0.3.3](https://github.com/marvk/vatprism/compare/v0.3.2...v0.3.3) - 2022-02-13 + +### Fixed + +- Fixed an issue where filters wouldn't show planes with specific statuses ([#92](https://github.com/marvk/vatprism/issues/92)) + +### Security + +- Update to Log4j (2.17.0 -> 2.17.1) + ## [0.3.2](https://github.com/marvk/vatprism/compare/v0.3.1...v0.3.2) - 2022-01-30 ### Fixed @@ -85,4 +95,4 @@ ## [0.1.0](https://github.com/marvk/vatprism/releases/tag/v0.1.0) - 2021-09-13 -Initial release \ No newline at end of file +Initial release diff --git a/pom.xml b/pom.xml index c81343b8..35652b62 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ - 0.3.2 + 0.3.3 1 net.marvk.fs.vatsim.map.Application @@ -65,7 +65,7 @@ 1.9.0-SNAPSHOT 5.0.1 12.2.0 - 2.17.0 + 2.17.1 25.1 1.2.0 5.8.1 @@ -456,4 +456,4 @@ - \ No newline at end of file + diff --git a/src/main/java/net/marvk/fs/vatsim/map/data/CallsignParser.java b/src/main/java/net/marvk/fs/vatsim/map/data/CallsignParser.java index c23a8acb..5d6e7faf 100644 --- a/src/main/java/net/marvk/fs/vatsim/map/data/CallsignParser.java +++ b/src/main/java/net/marvk/fs/vatsim/map/data/CallsignParser.java @@ -43,6 +43,7 @@ public Result parse(final VatsimController controller) { return Result.EMPTY; } +// final String callsign = "LON_N_CTR"; final String callsign = controller.getCallsign(); final String cid = controller.getCid(); @@ -73,6 +74,10 @@ public Result parse(final VatsimController controller) { return Result.EMPTY; } +// System.out.println("identifier = " + identifier); +// System.out.println("infix = " + infix); +// System.out.println("controllerType = " + controllerType); + Airport airport = null; UpperInformationRegion uir = null; FirResult fir = FirResult.EMPTY; @@ -105,13 +110,18 @@ public Result parse(final VatsimController controller) { } } - return new Result( + final Result result = new Result( controllerType, airport, fir.flightInformationRegionBoundary, fir.flightInformationRegion, uir ); + +// System.out.println(result); + + + return result; } private FirResult getFir(final VatsimController controller, final String identifier, final String infix, final ControllerType controllerType) { diff --git a/src/main/java/net/marvk/fs/vatsim/map/data/FlightInformationRegionRepository.java b/src/main/java/net/marvk/fs/vatsim/map/data/FlightInformationRegionRepository.java index f5718c2e..e934afec 100644 --- a/src/main/java/net/marvk/fs/vatsim/map/data/FlightInformationRegionRepository.java +++ b/src/main/java/net/marvk/fs/vatsim/map/data/FlightInformationRegionRepository.java @@ -82,6 +82,7 @@ private static List byPrefix(final List equalsIgnoreCaseAndDividers(queryExtractor.apply(e).get(), identifier)) .collect(Collectors.toList()); - return new FlightInformationRegionRepository.QueryResult(byPrefixPosition); + final QueryResult queryResult = new QueryResult(byPrefixPosition); + if (queryResult.result.size() > 1) { + System.out.println(identifier); + queryResult.result.forEach(System.out::println); + System.out.println(queryResult.result.size()); + } + + return queryResult; } private static boolean equalsIgnoreCaseAndDividers(final String nullableString, final String string) { +// if (nullableString.contains("LON")) { +// System.out.println(nullableString); +// } + if (nullableString == null) { return false; }