From aa7a0d26226d55a0a0208e2e7ad9e464b302d042 Mon Sep 17 00:00:00 2001 From: u221638 Date: Wed, 11 Dec 2024 11:22:35 +0100 Subject: [PATCH 1/2] chore: added mock train journey for track equipment segments (#82) --- .../static_sfera_resources/jp/SFERA_JP_T1.xml | 142 ++++++++++++++++++ .../sp/SFERA_SP_9999_2.xml | 13 +- .../sp/SFERA_SP_9999_5.xml | 11 -- .../sp/SFERA_SP_T1_1.xml | 108 +++++++++++++ .../sp/SFERA_SP_T1_2.xml | 119 +++++++++++++++ .../sp/SFERA_SP_T1_3.xml | 101 +++++++++++++ .../sp/SFERA_SP_T1_4.xml | 111 ++++++++++++++ .../sp/SFERA_SP_T1_5.xml | 138 +++++++++++++++++ 8 files changed, 725 insertions(+), 18 deletions(-) create mode 100644 sfera-mock/src/main/resources/static_sfera_resources/jp/SFERA_JP_T1.xml create mode 100644 sfera-mock/src/main/resources/static_sfera_resources/sp/SFERA_SP_T1_1.xml create mode 100644 sfera-mock/src/main/resources/static_sfera_resources/sp/SFERA_SP_T1_2.xml create mode 100644 sfera-mock/src/main/resources/static_sfera_resources/sp/SFERA_SP_T1_3.xml create mode 100644 sfera-mock/src/main/resources/static_sfera_resources/sp/SFERA_SP_T1_4.xml create mode 100644 sfera-mock/src/main/resources/static_sfera_resources/sp/SFERA_SP_T1_5.xml diff --git a/sfera-mock/src/main/resources/static_sfera_resources/jp/SFERA_JP_T1.xml b/sfera-mock/src/main/resources/static_sfera_resources/jp/SFERA_JP_T1.xml new file mode 100644 index 00000000..cb3ee0d8 --- /dev/null +++ b/sfera-mock/src/main/resources/static_sfera_resources/jp/SFERA_JP_T1.xml @@ -0,0 +1,142 @@ + + + + + 1085 + T1 + 2024-12-11 + + + + + 0085 + + + + + + + + + + + + + + + + + + + + + + + + + 0085 + + + + + + + + + + + + + + + + + + + + + + + + + 0085 + + + + + + + + + + + + + + + + + + + + + + + + + 0085 + + + + + + + + + + + + + + + + + + + + + + + + + 0085 + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sfera-mock/src/main/resources/static_sfera_resources/sp/SFERA_SP_9999_2.xml b/sfera-mock/src/main/resources/static_sfera_resources/sp/SFERA_SP_9999_2.xml index 89760b81..96738c76 100644 --- a/sfera-mock/src/main/resources/static_sfera_resources/sp/SFERA_SP_9999_2.xml +++ b/sfera-mock/src/main/resources/static_sfera_resources/sp/SFERA_SP_9999_2.xml @@ -14,7 +14,6 @@ - entry @@ -37,7 +36,7 @@ + TAF_TAP_location_type="station"> CH 9992 @@ -45,10 +44,10 @@ - + - + @@ -56,15 +55,15 @@ - - - + + + diff --git a/sfera-mock/src/main/resources/static_sfera_resources/sp/SFERA_SP_9999_5.xml b/sfera-mock/src/main/resources/static_sfera_resources/sp/SFERA_SP_9999_5.xml index fc705d2a..eeace121 100644 --- a/sfera-mock/src/main/resources/static_sfera_resources/sp/SFERA_SP_9999_5.xml +++ b/sfera-mock/src/main/resources/static_sfera_resources/sp/SFERA_SP_9999_5.xml @@ -49,14 +49,6 @@ - - - - - - - - @@ -66,9 +58,6 @@ - - - diff --git a/sfera-mock/src/main/resources/static_sfera_resources/sp/SFERA_SP_T1_1.xml b/sfera-mock/src/main/resources/static_sfera_resources/sp/SFERA_SP_T1_1.xml new file mode 100644 index 00000000..5fd3c31f --- /dev/null +++ b/sfera-mock/src/main/resources/static_sfera_resources/sp/SFERA_SP_T1_1.xml @@ -0,0 +1,108 @@ + + + + 0085 + + + + + + CH + 3002 + + + + + + + CH + 3003 + + + + + + + CH + 3004 + + + + + + + CH + 3005 + + + + + + + + CH + 3002 + + + + + + + CH + 3003 + + + + + + + CH + 3004 + + + + + + + CH + 3005 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sfera-mock/src/main/resources/static_sfera_resources/sp/SFERA_SP_T1_2.xml b/sfera-mock/src/main/resources/static_sfera_resources/sp/SFERA_SP_T1_2.xml new file mode 100644 index 00000000..c1a0b525 --- /dev/null +++ b/sfera-mock/src/main/resources/static_sfera_resources/sp/SFERA_SP_T1_2.xml @@ -0,0 +1,119 @@ + + + + 0085 + + + + + + CH + 3006 + + + + + + + CH + 3007 + + + + + + + CH + 3008 + + + + + + + CH + 3009 + + + + + + + + CH + 3006 + + + + + + + CH + 3007 + + + + + + + CH + 3008 + + + + + + + CH + 3009 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sfera-mock/src/main/resources/static_sfera_resources/sp/SFERA_SP_T1_3.xml b/sfera-mock/src/main/resources/static_sfera_resources/sp/SFERA_SP_T1_3.xml new file mode 100644 index 00000000..88b85ebe --- /dev/null +++ b/sfera-mock/src/main/resources/static_sfera_resources/sp/SFERA_SP_T1_3.xml @@ -0,0 +1,101 @@ + + + + 0085 + + + + + + CH + 3010 + + + + + + + CH + 3011 + + + + + + + CH + 3012 + + + + + + + CH + 3013 + + + + + + + CH + 3010 + + + + + + + CH + 3011 + + + + + + + CH + 3012 + + + + + + + CH + 3013 + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sfera-mock/src/main/resources/static_sfera_resources/sp/SFERA_SP_T1_4.xml b/sfera-mock/src/main/resources/static_sfera_resources/sp/SFERA_SP_T1_4.xml new file mode 100644 index 00000000..f719eef5 --- /dev/null +++ b/sfera-mock/src/main/resources/static_sfera_resources/sp/SFERA_SP_T1_4.xml @@ -0,0 +1,111 @@ + + + + 0085 + + + + + + CH + 3014 + + + + + + + CH + 3015 + + + + + + + CH + 3016 + + + + + + + CH + 3017 + + + + + + + CH + 3014 + + + + + + + CH + 3015 + + + + + + + CH + 3016 + + + + + + + CH + 3017 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sfera-mock/src/main/resources/static_sfera_resources/sp/SFERA_SP_T1_5.xml b/sfera-mock/src/main/resources/static_sfera_resources/sp/SFERA_SP_T1_5.xml new file mode 100644 index 00000000..09f35262 --- /dev/null +++ b/sfera-mock/src/main/resources/static_sfera_resources/sp/SFERA_SP_T1_5.xml @@ -0,0 +1,138 @@ + + + + 0085 + + + + + + CH + 3018 + + + + + + + CH + 3019 + + + + + + + CH + 3020 + + + + + + + CH + 3021 + + + + + + + CH + 3022 + + + + + + + CH + 3018 + + + + + + + CH + 3019 + + + + + + + CH + 3020 + + + + + + + CH + 3021 + + + + + + + CH + 3022 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 385626b78b2d51c660d4e3056bf650ae524159f6 Mon Sep 17 00:00:00 2001 From: u221638 Date: Wed, 11 Dec 2024 14:04:19 +0100 Subject: [PATCH 2/2] chore: fixed train number matching --- .../sferamock/messages/services/JourneyProfileRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sfera-mock/src/main/java/ch/sbb/sferamock/messages/services/JourneyProfileRepository.java b/sfera-mock/src/main/java/ch/sbb/sferamock/messages/services/JourneyProfileRepository.java index 2e5e1627..0914b285 100644 --- a/sfera-mock/src/main/java/ch/sbb/sferamock/messages/services/JourneyProfileRepository.java +++ b/sfera-mock/src/main/java/ch/sbb/sferamock/messages/services/JourneyProfileRepository.java @@ -21,7 +21,7 @@ public class JourneyProfileRepository implements ApplicationRunner { private static final String XML_RESOURCES_CLASSPATH = "classpath:static_sfera_resources/jp/*.xml"; - private static final String XML_REGEX = "SFERA_JP_(\\d+)\\.xml"; + private static final String XML_REGEX = "SFERA_JP_(.+)\\.xml"; private final XmlHelper xmlHelper; Map journeyProfiles = new HashMap<>();