Skip to content

Improving translations, adding OSM with link tc conf, some err fix #245

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

Open
hubertgoeuropa wants to merge 14 commits into
base: develop
Choose a base branch
from
Open

Improving translations, adding OSM with link tc conf, some err fix #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
643fc3c
Improving translations, adding OSM with configuration, some mysql err…
hubertgoeuropa Jul 1, 2021
da83dd0
Improving translations, some mysql error fix
hubertgoeuropa Jul 1, 2021
ff5d6e7
Add vehicleName, vehicleSpeed[traccar], popup fix
hubertgoeuropa Jul 13, 2021
a4e91bd
temporary one-jar-boot path change
hubertgoeuropa Jul 20, 2021
8d7f686
temporary one-jar-boot path change
hubertgoeuropa Jul 20, 2021
3e6b8ea
add missing changes in VehicleState
hubertgoeuropa Jul 20, 2021
2b1fab4
add fixes for avl query and null exception in vehicle name
hubertgoeuropa Jul 20, 2021
48573ca
fix pzn
hubertgoeuropa Jul 21, 2021
f2b4c78
vehicleconfig update workaround
hubertgoeuropa Jul 21, 2021
9e50c1e
Add/Change labels, late / on time / early workaround
hubertgoeuropa Jul 23, 2021
f1944d1
check undefined in vehicle name
hubertgoeuropa Jul 23, 2021
db08860
add vehicle name in api
hubertgoeuropa Jul 23, 2021
57d602f
avl hours fixed
hubertgoeuropa Sep 9, 2021
4c89905
Fix translation, add osm link to bus position
hubertgoeuropa Oct 26, 2021
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
4 changes: 3 additions & 1 deletion transitclock/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@
<dependency>
<groupId>com.simontuffs</groupId>
<artifactId>one-jar-boot</artifactId>
<version>0.97.3</version>
<version>0.97</version>
<scope>system</scope>
<systemPath>/usr/local/transitclock/bin/one-jar-boot-0.97.jar</systemPath>
</dependency>

<!-- Database related, including c3p0 production quality connector. Note:
Expand Down
6 changes: 3 additions & 3 deletions transitclock/src/main/java/org/transitclock/core/TemporalDifference.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,11 +238,11 @@ public String toString() {

// Add early/ontime/late info
if (temporalDifferenceMsec > 0)
str += " (early)";
str += " (wcześniej)";
Copy link
Copy Markdown
Member

@scrudden scrudden Oct 27, 2021

Choose a reason for hiding this comment

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

Will this result in a Polish only string appearing somewhere?

else if (temporalDifferenceMsec == 0)
str += " (ontime)";
str += " (na czas)";
else
str += " (late)";
str += " (później)";

// Return the results
return str;
Expand Down
12 changes: 12 additions & 0 deletions transitclock/src/main/java/org/transitclock/core/VehicleState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
public class VehicleState {

private final String vehicleId;
private String vehicleName;
private Block block;
private BlockAssignmentMethod assignmentMethod;
// Will be set to block ID (even if used trip to determine assignment) or route ID
Expand Down Expand Up @@ -132,6 +133,11 @@ public void incrementTripCounter() {
public VehicleState(String vehicleId) {
this.vehicleId = vehicleId;
}

public VehicleState(String vehicleId, String vehicleName) {
this.vehicleId = vehicleId;
this.vehicleName = vehicleName;
}

/**
* Sets the block assignment for vehicle. Also, this is how it is specified
Expand Down Expand Up @@ -747,6 +753,10 @@ public Date getAssignmentTime() {
public String getVehicleId() {
return vehicleId;
}

public String getVehicleName() {
return vehicleId;
}

public boolean isPredictable() {
return predictable;
Expand Down Expand Up @@ -956,6 +966,7 @@ public float getHeading() {
public String toString() {
return "VehicleState ["
+ "vehicleId=" + vehicleId
+ "vehicleName=" + vehicleName
+ ", blockId=" + (block==null? null : block.getId())
+ ", assignmentId=" + assignmentId
+ ", assignmentMethod=" + assignmentMethod
Expand All @@ -976,6 +987,7 @@ public String toString() {
public String toStringVerbose() {
return "VehicleState ["
+ "vehicleId=" + vehicleId
+ "vehicleName=" + vehicleName
+ ", blockId=" + (block==null? null : block.getId())
+ ", assignmentId=" + assignmentId
+ ", assignmentMethod=" + assignmentMethod
Expand Down
Loading