From cc633fae31ecf7bee9be0faabc2f38e689c9e7f7 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried <mail@leonard.io>
Date: Tue, 28 Jan 2025 12:43:53 +0100
Subject: [PATCH] Resolve merge artifacts

---
 .../main/java/org/opentripplanner/osm/DefaultOsmProvider.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/application/src/main/java/org/opentripplanner/osm/DefaultOsmProvider.java b/application/src/main/java/org/opentripplanner/osm/DefaultOsmProvider.java
index 5e90057074c..159761f03d0 100644
--- a/application/src/main/java/org/opentripplanner/osm/DefaultOsmProvider.java
+++ b/application/src/main/java/org/opentripplanner/osm/DefaultOsmProvider.java
@@ -37,6 +37,7 @@ public class DefaultOsmProvider implements OsmProvider {
 
   private final OsmTagMapper osmTagMapper;
 
+  private final boolean includeSubwayEntrances;
   private final WayPropertySet wayPropertySet;
   private byte[] cachedBytes = null;
 
@@ -46,6 +47,7 @@ public DefaultOsmProvider(File file, boolean cacheDataInMem) {
       new FileDataSource(file, FileType.OSM),
       OsmTagMapperSource.DEFAULT,
       null,
+      false,
       cacheDataInMem,
       DataImportIssueStore.NOOP
     );
@@ -55,12 +57,14 @@ public DefaultOsmProvider(
     DataSource dataSource,
     OsmTagMapperSource tagMapperSource,
     ZoneId zoneId,
+    boolean includeSubwayEntrances,
     boolean cacheDataInMem,
     DataImportIssueStore issueStore
   ) {
     this.source = dataSource;
     this.zoneId = zoneId;
     this.osmTagMapper = tagMapperSource.getInstance();
+    this.includeSubwayEntrances = includeSubwayEntrances;
     this.wayPropertySet = new WayPropertySet(issueStore);
     osmTagMapper.populateProperties(wayPropertySet);
     this.cacheDataInMem = cacheDataInMem;