Skip to content

Digiroad #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jannebe merged 2 commits into from
Dec 8, 2025
Merged

Digiroad #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcdc8c2
Update hasura
jannebe Dec 8, 2025
cf0f738
Fix link sources digiroad_r -> digiroad_r_mml
jannebe Dec 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/docker-compose.custom.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ services:

jore4-hasura:
# pin compatible version of jore4 data model
image: "hsldevcom/jore4-hasura:hsl-main--20231218-8a28ef5f4b22b6351312788be4e674144f2bb0a2"
image: "crjore4prod001.azurecr.io/jore4-hsl-hasura:main-2025-12-08-40a4f283c88076a5865ec1eab5713917f09bb3c5"
networks:
jore4:
6 changes: 6 additions & 0 deletions src/main/generated-sources/jooq/fi/hsl/jore/jore4/jooq/route/tables/Line.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions ...erated-sources/jooq/fi/hsl/jore/jore4/jooq/service_pattern/tables/ScheduledStopPoint.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/main/java/fi/hsl/jore/importer/feature/mapmatching/service/MockMapMatchingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class MockMapMatchingService implements IMapMatchingService {

public static final String INFRASTRUCTURE_LINK_EXT_ID = "133202";
public static final boolean INFRASTRUCTURE_LINK_IS_TRAVERSAL_FORWARDS = true;
public static final String INFRASTRUCTURE_LINK_SOURCE = "digiroad_r";
public static final String INFRASTRUCTURE_LINK_SOURCE = "digiroad_r_mml";

private static final String MAP_MATCHING_OK_RESPONSE_CODE = "Ok";

Expand Down
8 changes: 4 additions & 4 deletions src/test/java/fi/hsl/jore/importer/feature/batch/route/MapMatchingProcessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ class WhenOneRoutePointIsFound {
{
"mapMatchingInfrastructureLinkId": 209830,
"externalLinkRef": {
"infrastructureSource": "digiroad_r",
"infrastructureSource": "digiroad_r_mml",
"externalLinkId": "445117"
},
"isTraversalForwards": true,
Expand All @@ -131,7 +131,7 @@ class WhenOneRoutePointIsFound {
{
"mapMatchingInfrastructureLinkId": 232425,
"externalLinkRef": {
"infrastructureSource": "digiroad_r",
"infrastructureSource": "digiroad_r_mml",
"externalLinkId": "442423"
},
"isTraversalForwards": true,
Expand All @@ -155,12 +155,12 @@ class WhenOneRoutePointIsFound {
}
""";

private static final String EXPECTED_FIRST_INFRASTRUCTURE_LINK_SOURCE = "digiroad_r";
private static final String EXPECTED_FIRST_INFRASTRUCTURE_LINK_SOURCE = "digiroad_r_mml";
private static final String EXPECTED_FIRST_INFRASTRUCTURE_LINK_EXT_ID = "445117";
private static final int EXPECTED_FIRST_INFRASTRUCTURE_LINK_SEQUENCE = 0;
private static final boolean EXPECTED_FIRST_INFRASTRUCTURE_LINK_IS_TRAVERSAL_FORWARDS = true;

private static final String EXPECTED_SECOND_INFRASTRUCTURE_LINK_SOURCE = "digiroad_r";
private static final String EXPECTED_SECOND_INFRASTRUCTURE_LINK_SOURCE = "digiroad_r_mml";
private static final String EXPECTED_SECOND_INFRASTRUCTURE_LINK_EXT_ID = "442423";
private static final int EXPECTED_SECOND_INFRASTRUCTURE_LINK_SEQUENCE = 1;
private static final boolean EXPECTED_SECOND_INFRASTRUCTURE_LINK_IS_TRAVERSAL_FORWARDS = true;
Expand Down
16 changes: 8 additions & 8 deletions src/test/java/fi/hsl/jore/importer/feature/digiroad/service/DigiroadStopFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ void shouldThrowException() {
class WhenDigiroadStopIdIsEmpty {

private static final String CSV_LINE =
";133202;168626;backward;\"{\"\"type\"\": \"\"Point\"\", \"\"coordinates\"\": [24.696376131, 60.207149801]}\";Ullanmäki;Ullasbacken;digiroad_r";
";133202;168626;backward;\"{\"\"type\"\": \"\"Point\"\", \"\"coordinates\"\": [24.696376131, 60.207149801]}\";Ullanmäki;Ullasbacken;digiroad_r_mml";

@Test
@DisplayName("Should throw an exception")
Expand All @@ -63,7 +63,7 @@ void shouldThrowException() {
class WhenDigiroadLinkIdIsEmpty {

private static final String CSV_LINE =
"111;;168626;backward;\"{\"\"type\"\": \"\"Point\"\", \"\"coordinates\"\": [24.696376131, 60.207149801]}\";Ullanmäki;Ullasbacken;digiroad_r";
"111;;168626;backward;\"{\"\"type\"\": \"\"Point\"\", \"\"coordinates\"\": [24.696376131, 60.207149801]}\";Ullanmäki;Ullasbacken;digiroad_r_mml";

@Test
@DisplayName("Should throw an exception")
Expand All @@ -78,7 +78,7 @@ void shouldThrowException() {
class WhenNationalIdIsEmpty {

private static final String CSV_LINE =
"111;133202;;backward;\"{\"\"type\"\": \"\"Point\"\", \"\"coordinates\"\": [24.696376131, 60.207149801]}\";Ullanmäki;Ullasbacken;digiroad_r";
"111;133202;;backward;\"{\"\"type\"\": \"\"Point\"\", \"\"coordinates\"\": [24.696376131, 60.207149801]}\";Ullanmäki;Ullasbacken;digiroad_r_mml";

@Test
@DisplayName("Should throw an exception")
Expand All @@ -93,7 +93,7 @@ void shouldThrowException() {
class WhenNationalIdIsContainsNonNumericalCharacters {

private static final String CSV_LINE =
"111;133202;12d3;backward;\"{\"\"type\"\": \"\"Point\"\", \"\"coordinates\"\": [24.696376131, 60.207149801]}\";Ullanmäki;Ullasbacken;digiroad_r";
"111;133202;12d3;backward;\"{\"\"type\"\": \"\"Point\"\", \"\"coordinates\"\": [24.696376131, 60.207149801]}\";Ullanmäki;Ullasbacken;digiroad_r_mml";

@Test
@DisplayName("Should throw an exception")
Expand All @@ -108,7 +108,7 @@ void shouldThrowException() {
class WhenStopDirectionIsInvalid {

private static final String CSV_LINE =
"111;133202;168626;invalid;\"{\"\"type\"\": \"\"Point\"\", \"\"coordinates\"\": [24.696376131, 60.207149801]}\";Ullanmäki;Ullasbacken;digiroad_r";
"111;133202;168626;invalid;\"{\"\"type\"\": \"\"Point\"\", \"\"coordinates\"\": [24.696376131, 60.207149801]}\";Ullanmäki;Ullasbacken;digiroad_r_mml";

@Test
@DisplayName("Should throw an exception")
Expand All @@ -123,7 +123,7 @@ void shouldThrowException() {
class WhenStopLocationIsInvalid {

private static final String CSV_LINE =
"111;133202;168626;backward;\"{\"\"type\"\": \"\"Point\"\", \"\"coordinates\"\": [24.696376131, 60.207149801])\";Ullanmäki;Ullasbacken;digiroad_r";
"111;133202;168626;backward;\"{\"\"type\"\": \"\"Point\"\", \"\"coordinates\"\": [24.696376131, 60.207149801])\";Ullanmäki;Ullasbacken;digiroad_r_mml";

@Test
@DisplayName("Should throw an exception")
Expand Down Expand Up @@ -152,7 +152,7 @@ class WhenCSVLineIsValid {
class WhenAllValuesAreGiven {

private static final String CSV_LINE =
"111;133202;168626;backward;\"{\"\"type\"\": \"\"Point\"\", \"\"coordinates\"\": [24.696376131, 60.207149801]}\";Ullanmäki;Ullasbacken;digiroad_r";
"111;133202;168626;backward;\"{\"\"type\"\": \"\"Point\"\", \"\"coordinates\"\": [24.696376131, 60.207149801]}\";Ullanmäki;Ullasbacken;digiroad_r_mml";

@Test
@DisplayName("Should return an optional which contains the parsed stop")
Expand Down Expand Up @@ -233,7 +233,7 @@ void shouldReturnStopWhichHasCorrectSwedishName() {
class WhenNamesAreEmptyStrings {

private static final String CSV_LINE =
"111;133202;168626;backward;\"{\"\"type\"\": \"\"Point\"\", \"\"coordinates\"\": [24.696376131, 60.207149801]}\";;;digiroad_r";
"111;133202;168626;backward;\"{\"\"type\"\": \"\"Point\"\", \"\"coordinates\"\": [24.696376131, 60.207149801]}\";;;digiroad_r_mml";

@Test
@DisplayName("Should return an optional which contains the parsed stop")
Expand Down
2 changes: 1 addition & 1 deletion .../java/fi/hsl/jore/importer/feature/jore4/repository/Jore4RouteGeometryRepositoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class WhenOneRouteGeometryIsGivenAsArgument {
private static final String INFRASTRUCTURE_LINK_EXT_ID = "133202";
private static final boolean INFRASTRUCTURE_LINK_IS_TRAVERSAL_FORWARDS = true;
private static final int INFRASTRUCTURE_LINK_SEQUENCE = 0;
private static final String INFRASTRUCTURE_LINK_SOURCE = "digiroad_r";
private static final String INFRASTRUCTURE_LINK_SOURCE = "digiroad_r_mml";

private Jore4RouteGeometry input;

Expand Down
8 changes: 4 additions & 4 deletions src/test/java/fi/hsl/jore/importer/feature/mapmatching/service/MapMatchingServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ class WhenMatchWasFound {
{
"mapMatchingInfrastructureLinkId": 209830,
"externalLinkRef": {
"infrastructureSource": "digiroad_r",
"infrastructureSource": "digiroad_r_mml",
"externalLinkId": "445117"
},
"isTraversalForwards": true,
Expand All @@ -244,7 +244,7 @@ class WhenMatchWasFound {
{
"mapMatchingInfrastructureLinkId": 232425,
"externalLinkRef": {
"infrastructureSource": "digiroad_r",
"infrastructureSource": "digiroad_r_mml",
"externalLinkId": "442423"
},
"isTraversalForwards": true,
Expand Down Expand Up @@ -284,7 +284,7 @@ class WhenMatchWasFound {
private static final double EXPECTED_ROUTE_WEIGHT = 286.7201809450182;

private static final long EXPECTED_INFRASTRUCTURE_LINK_ONE_ID = 209830;
private static final String EXPECTED_INFRASTRUCTURE_LINK_ONE_SOURCE = "digiroad_r";
private static final String EXPECTED_INFRASTRUCTURE_LINK_ONE_SOURCE = "digiroad_r_mml";
private static final String EXPECTED_INFRASTRUCTURE_LINK_ONE_EXT_ID = "445117";
private static final boolean EXPECTED_INFRASTRUCTURE_LINK_ONE_TRAVERSAL_FORWARDS = true;
private static final double EXPECTED_INFRASTRUCTURE_LINK_ONE_COORDINATE_ONE_LNG = 24.92743115932746;
Expand All @@ -297,7 +297,7 @@ class WhenMatchWasFound {
private static final String EXPECTED_INFRASTRUCTURE_LINK_ONE_SWEDISH_NAME = "Kalevagatan 1";

private static final long EXPECTED_INFRASTRUCTURE_LINK_TWO_ID = 232425;
private static final String EXPECTED_INFRASTRUCTURE_LINK_TWO_SOURCE = "digiroad_r";
private static final String EXPECTED_INFRASTRUCTURE_LINK_TWO_SOURCE = "digiroad_r_mml";
private static final String EXPECTED_INFRASTRUCTURE_LINK_TWO_EXT_ID = "442423";
private static final boolean EXPECTED_INFRASTRUCTURE_LINK_TWO_TRAVERSAL_FORWARDS = true;
private static final double EXPECTED_INFRASTRUCTURE_LINK_TWO_COORDINATE_ONE_LNG = 24.92919590585085;
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/csv/digiroad_stops.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
111;133202;1234567890;backward;"{""type"": ""Point"", ""coordinates"": [24.696376131, 60.207149801]}";Ullanmäki;Ullasbacken;digiroad_r
111;133202;1234567890;backward;"{""type"": ""Point"", ""coordinates"": [24.696376131, 60.207149801]}";Ullanmäki;Ullasbacken;digiroad_r_mml
2 changes: 1 addition & 1 deletion src/test/resources/sql/jore4/populate_infrastructure_links.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ VALUES (
ST_MakeLine(ST_SetSRID(ST_MakePoint(24.457948, 60.088725, 0), 4326), ST_SetSRID(ST_MakePoint(24.468175, 60.15286, 0), 4326)),
1000,
'133202',
'digiroad_r'
'digiroad_r_mml'
);

INSERT INTO infrastructure_network.vehicle_submode_on_infrastructure_link (
Expand Down
Loading