Skip to content

Commit 41f8c36

Browse files
committed
Remove duplicate OsmEntityType class.
1 parent c190618 commit 41f8c36

4 files changed

Lines changed: 5 additions & 25 deletions

File tree

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
package org.opentripplanner.graph_builder.module.osm;
22

3+
import org.opentripplanner.street.model.vertex.OsmEntityType;
4+
35
record OsmElevatorKey(long nodeId, OsmEntityType osmEntityType, long entityId) {}

application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmEntityType.java

Lines changed: 0 additions & 7 deletions
This file was deleted.

application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmEntityTypeMapper.java

Lines changed: 0 additions & 12 deletions
This file was deleted.

application/src/main/java/org/opentripplanner/graph_builder/module/osm/VertexGenerator.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.opentripplanner.street.model.vertex.IntersectionVertex;
2828
import org.opentripplanner.street.model.vertex.OsmBoardingLocationVertex;
2929
import org.opentripplanner.street.model.vertex.OsmElevatorVertex;
30+
import org.opentripplanner.street.model.vertex.OsmEntityType;
3031
import org.opentripplanner.street.model.vertex.OsmVertex;
3132
import org.opentripplanner.street.model.vertex.VertexFactory;
3233
import org.opentripplanner.transit.model.basic.Accessibility;
@@ -205,7 +206,7 @@ private IntersectionVertex getSplitVertexOnBarrier(OsmNode nodeOnBarrier, OsmEnt
205206
var vertex = vertexFactory.osmOnLinearBarrier(
206207
nodeOnBarrier.getCoordinate(),
207208
nodeOnBarrier.getId(),
208-
OsmEntityTypeMapper.map(getOsmEntityType(entity)),
209+
getOsmEntityType(entity),
209210
entity.getId()
210211
);
211212
vertices.put(entity, vertex);
@@ -330,11 +331,7 @@ private OsmElevatorVertex getElevatorVertex(OsmNode node, OsmEntity entity) {
330331
OsmEntityType osmEntityType = getOsmEntityType(entity);
331332
OsmElevatorKey osmElevatorKey = new OsmElevatorKey(node.getId(), osmEntityType, entity.getId());
332333
if (!elevatorVertices.containsKey(osmElevatorKey)) {
333-
OsmElevatorVertex vertex = vertexFactory.osmElevator(
334-
node,
335-
OsmEntityTypeMapper.map(osmEntityType),
336-
entity.getId()
337-
);
334+
OsmElevatorVertex vertex = vertexFactory.osmElevator(node, osmEntityType, entity.getId());
338335
elevatorVertices.put(osmElevatorKey, vertex);
339336
// An OsmElevatorVertex requires one level to be defined.
340337
elevatorNodeLevels.put(osmElevatorKey, osmdb.findSingleLevelForEntity(entity));

0 commit comments

Comments
 (0)