Resolve merge artifacts

leonardehrenfried · Jan 28, 2025 · cc633fa · cc633fa
1 parent 1637f5a
commit cc633fa
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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;