Skip to content

Commit 70e78e9

Browse files
author
zabuTNT
committed
fix default fareService
1 parent 9a2b6b7 commit 70e78e9

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"scripts": {
1919
"deploy": "mvn deploy:deploy-file -s openmove-settings.xml -DgroupId=org.opentripplanner -DartifactId=otp -Dversion=${npm_package_version}-SNAPSHOT -Dclassifier=shaded -Dpackaging=jar -Dfile=target/otp-${npm_package_version}-SNAPSHOT-shaded.jar -Durl=https://maven.pkg.github.com/openmove/OpenTripPlanner -DrepositoryId=otp",
2020
"build": "mvn clean package -DskipTests -s openmove-settings.xml",
21-
"debug": "java -Xmx5G -agentlib:jdwp=transport=dt_socket,address=127.0.0.1:32935,suspend=y,server=y -jar target/otp-${npm_package_version}-SNAPSHOT-shaded.jar --build ../otp/otp/trentino --inMemory "
21+
"debug": "java -Xmx5G -agentlib:jdwp=transport=dt_socket,address=127.0.0.1:32935,suspend=y,server=y -jar target/otp-${npm_package_version}-SNAPSHOT-shaded.jar --build ../otp/otp/debug/ --inMemory "
2222
},
2323
"homepage": "https://github.com/openmove/OpenTripPlanner#readme"
2424
}

src/main/java/org/opentripplanner/routing/impl/DefaultFareServiceImpl.java

+3
Original file line numberDiff line numberDiff line change
@@ -347,13 +347,16 @@ private FareAndId getBestFareAndId(FareType fareType, List<Ride> rides,
347347
continue;
348348
}
349349
float newFare = getFarePrice(attribute, fareType);
350+
String routingId = null;
351+
String identifier = ruleSet.getIdentifier(startZone, endZone, zones, routes, routingId);
350352
if (newFare < bestFare) {
351353
bestAttribute = attribute;
352354
bestFare = newFare;
353355
fareRule = new FareRule();
354356
fareRule.setDestinationId(endZone);
355357
fareRule.setOriginId(startZone);
356358
fareRule.setFare(attribute);
359+
fareRule.setIdentifier(identifier);
357360
}
358361
}
359362
}

0 commit comments

Comments
 (0)