Skip to content

Netex: check and use gml:pos tag if Latitude and Longitude doesn't exists #5697

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

Closed
cambio-deca wants to merge 3 commits into from
Closed

Netex: check and use gml:pos tag if Latitude and Longitude doesn't exists #5697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b29a69
feat: check and use gml position tag if lat and lng not exists
Feb 20, 2024
5b7e05c
test: test coordinate mapper with gml:pos
Feb 20, 2024
7601060
test: check incomplete gml position
Feb 20, 2024
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
14 changes: 12 additions & 2 deletions src/main/java/org/opentripplanner/netex/mapping/WgsCoordinateMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.opentripplanner.netex.mapping;

import java.util.List;
import javax.annotation.Nullable;
import org.opentripplanner.framework.geometry.WgsCoordinate;
import org.rutebanken.netex.model.LocationStructure;
Expand All @@ -21,10 +22,19 @@ static WgsCoordinate mapToDomain(SimplePoint_VersionStructure point) {
}
Copy link
Contributor

@vpaturet vpaturet Feb 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Javadoc for the mapToDomain method is obsolete, this PR gives a good opportunity to update it.

  • You can explain here that we need to convert from the LON/LAT convention in GML to the LAT/LON convention in WGS since this is a usual source of bug/confusion.
  • You can also describe here the fallback logic you implemented.

Copy link
Author

@cambio-deca cambio-deca Feb 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@giuseppesaraceno can you update the doc?

LocationStructure loc = point.getLocation();

// This should not happen
if (loc.getLongitude() == null || loc.getLatitude() == null) {
throw new IllegalArgumentException("Coordinate is not valid: " + loc);
if (loc.getPos() == null) {
throw new IllegalArgumentException("Coordinate is not valid: " + loc);
}

List<Double> coordinates = loc.getPos().getValue();
if (coordinates.size() != 2) {
throw new IllegalArgumentException("Coordinate is not valid: " + loc);
}

return new WgsCoordinate(coordinates.get(1), coordinates.get(0));
}

// Location is safe to process
return new WgsCoordinate(loc.getLatitude().doubleValue(), loc.getLongitude().doubleValue());
}
Expand Down
28 changes: 28 additions & 0 deletions src/test/java/org/opentripplanner/netex/mapping/WgsCoordinateMapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import static org.junit.jupiter.api.Assertions.assertThrows;

import java.math.BigDecimal;
import net.opengis.gml._3.DirectPositionType;
import org.junit.jupiter.api.Test;
import org.opentripplanner.framework.geometry.WgsCoordinate;
import org.rutebanken.netex.model.LocationStructure;
Expand Down Expand Up @@ -63,4 +64,31 @@ public void handleCoordinatesWithMissingLongitude() {
.withLocation(new LocationStructure().withLatitude(LATITUDE));
assertThrows(IllegalArgumentException.class, () -> WgsCoordinateMapper.mapToDomain(p));
}

@Test
public void handleCoordinateWithGmlPosition() {
LocationStructure locationStructure = new LocationStructure()
.withPos(new DirectPositionType().withValue(LONGITUDE_VALUE, LATITUDE_VALUE));

SimplePoint_VersionStructure point = new SimplePoint_VersionStructure()
.withLocation(locationStructure);

// When map coordinates
WgsCoordinate c = WgsCoordinateMapper.mapToDomain(point);

// Then verify coordinate
assertEquals(LONGITUDE_VALUE, c.longitude(), DELTA);
assertEquals(LATITUDE_VALUE, c.latitude(), DELTA);
}

@Test
public void handleCoordinateWithIncompleteGmlPosition() {
LocationStructure locationStructure = new LocationStructure()
.withPos(new DirectPositionType().withValue(LONGITUDE_VALUE));

SimplePoint_VersionStructure point = new SimplePoint_VersionStructure()
.withLocation(locationStructure);

assertThrows(IllegalArgumentException.class, () -> WgsCoordinateMapper.mapToDomain(point));
}
}