StephanRichter/Web4Rail
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Started clean re-implementation of

Browse Source 
- reserving route
- preparing route
- locking route

New implementation now properly handles stop event from user.

Next things to implement:

- tracing train upon contact activation, taking care of:
    - causing contact
    - train's last position
    - route
    - plan.freeBehindTrain
- finish event, keeping brake processor in mind
This commit is contained in:
Stephan Richter
2021-03-13 20:15:51 +01:00
parent 9939d8d630
commit 2647b4c43d
20 changed files with 795 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.srsoftware</groupId>
<artifactId>web4rail</artifactId>
<version>1.3.62</version>
<version>1.3.65</version>
<name>Web4Rail</name>
<packaging>jar</packaging>
<description>Java Model Railway Control</description>

4
resources/css/style.css
View File

@@ -77,8 +77,8 @@ svg.Relay rect{
fill: white;
}
svg.allocated polygon,
svg.allocated rect:not(.sig_a):not(.sig_b){
svg.reserved polygon,
svg.reserved rect:not(.sig_a):not(.sig_b){
fill: yellow;
}

8
resources/logback.xml
View File

@@ -4,7 +4,7 @@
<appender name="STDOUT"
class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{5} - %msg%n
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{5}: %msg%n
</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
@@ -35,8 +35,8 @@
<logger name="de.srsoftware.web4rail.actions.Action" level="DEBUG" />
<logger name="de.srsoftware.web4rail.actions.ActionList" level="DEBUG" />
<logger name="de.srsoftware.web4rail.moving.Train" level="DEBUG" />
<logger name="de.srsoftware.web4rail.tiles.Contact" level="DEBUG" />
<logger name="de.srsoftware.web4rail.tiles.Block" level="DEBUG" />
<logger name="de.srsoftware.web4rail.threads.BrakeProcessor" level="DEBUG" />
<logger name="de.srsoftware.web4rail.tiles" level="DEBUG" />
<logger name="de.srsoftware.web4rail.tiles" level="DEBUG" />
<logger name="de.srsoftware.web4rail.threads.RouteManager" level="DEBUG" />
</configuration>

4
src/main/java/de/srsoftware/web4rail/BaseClass.java
View File

@@ -141,6 +141,10 @@ public abstract class BaseClass implements Constants{
return this;
}
public void invalidate() {
setMain(null);
}
public boolean invalidated() {
return isNull(main);
}

1
src/main/java/de/srsoftware/web4rail/Constants.java
View File

@@ -58,6 +58,7 @@ public interface Constants {
public static final String DEFAULT_SPEED_UNIT = "km/h";
public static final String DEFAULT_LENGTH_UNIT = "mm";
public static final String DISABLED = "disabled";
public static final String DIRECTION = "direction";
public static final String GITHUB_URL = "https://github.com/srsoftware-de/Web4Rail";
public static final String ID = "id";
public static final String NAME = "name";

109
src/main/java/de/srsoftware/web4rail/Route.java
View File

@@ -9,7 +9,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Stack;
import java.util.Vector;
import org.json.JSONArray;
@@ -43,7 +42,6 @@ import de.srsoftware.web4rail.tiles.Contact;
import de.srsoftware.web4rail.tiles.Shadow;
import de.srsoftware.web4rail.tiles.Signal;
import de.srsoftware.web4rail.tiles.Tile;
import de.srsoftware.web4rail.tiles.Tile.Status;
import de.srsoftware.web4rail.tiles.Turnout;
/**
* A route is a vector of tiles that leads from one block to another.
@@ -82,6 +80,7 @@ public class Route extends BaseClass {
private HashMap<String,Integer> brakeTimes = new HashMap<String, Integer>();
private ConditionList conditions;
private Vector<Contact> contacts;
private Context context;
private boolean disabled = false;
private Block endBlock = null;
public Direction endDirection;
@@ -195,10 +194,6 @@ public class Route extends BaseClass {
turnouts.put(t, s);
}
public boolean allocateFor(Train newTrain) {
return pathState(newTrain,Tile.Status.ALLOCATED);
}
/**
* checks, whether the route may be used in a given context
* @param context
@@ -316,17 +311,18 @@ public class Route extends BaseClass {
* Kontakt der Route aktivieren
* @param contact
* @param trainHead
* @return
*/
public void contact(Context context) {
Contact contact = context.contact();
if (triggeredContacts.contains(contact)) return; // don't trigger contact a second time
public Context contact(Contact contact) {
context.contact(contact);
if (triggeredContacts.contains(contact)) return context; // don't trigger contact a second time
triggeredContacts.add(contact);
LOG.debug("{} on {} activated {}.",context.train(),this,contact);
ActionList actions = triggeredActions.get(contact.trigger());
LOG.debug("Contact has id {} / trigger {} and is assigned with {}",contact.id(),contact.trigger(),isNull(actions)?t("nothing"):actions);
if (isNull(actions)) return;
//Context context = new Context(this).train(train).contact(contact);
actions.fire(context.route(this),"Route.Contact("+contact.addr()+")");
if (isNull(actions)) return context;
actions.fire(context,"Route.Contact("+contact.addr()+")");
return context;
}
public Vector<Contact> contacts() {
@@ -377,17 +373,20 @@ public class Route extends BaseClass {
public void finish(Train train) {
LOG.debug("{}.finish()",this);
train.endRoute(endBlock,endDirection);
train = null;
free();
train = null;
}
private void free() {
for (Tile tile : path) {
Train train = tile.train();
if (isSet(train) && train.onTrace(tile)) {
tile.setState(Status.OCCUPIED, train);
} else tile.free();
context.invalidate();
Train train = context.train();
for (int i=path.size(); i>0; i--) {
Tile tile = path.get(i-1);
if (isSet(train) && !train.onTrace(tile)) {
tile.free(train);
}
}
context = null;
}
private String generateName() {
@@ -414,9 +413,13 @@ public class Route extends BaseClass {
return disabled;
}
public boolean isFreeFor(Train newTrain) {
LOG.debug("{}.isFreeFor({})",this,newTrain);
return false;
public boolean isFreeFor(Context train) {
LOG.debug("{}.isFreeFor({})",this,train);
if (isNull(train.train())) return false;
for (Tile tile : path) {
if (!tile.isFreeFor(train)) return false;
}
return true;
}
/**
@@ -647,29 +650,24 @@ public class Route extends BaseClass {
return result;
}
private boolean pathState(Train newTrain, Status newState) {
Stack<Tile> visited = new Stack<>();
for (Tile t : path) {
if (t.setState(newState,newTrain)) {
visited.push(t);
} else {
while (!visited.isEmpty()) visited.pop().free();
public boolean prepareAndLock() {
LOG.debug("{}.prepareAndLock()",this);
Train train = context.train();
ActionList setupActions = triggeredActions.get(ROUTE_SETUP);
if (isSet(setupActions) && !setupActions.fire(context.route(this),this+".prepare()")) {
LOG.debug("Was not able to prepare route for {}.",train);
return false;
}
for (Tile tile : path) {
if (context.invalidated() || !tile.lockFor(context)) {
LOG.debug("Was not able to allocate route for {}.",context);
return false;
}
}
return true;
}
public boolean prepareFor(Train newTrain) {
// if (state == State.PREPARED || state == State.STARTED) return true;
LOG.debug("{}.prepare()",this);
ActionList setupActions = triggeredActions.get(ROUTE_SETUP);
if (isSet(setupActions) && !setupActions.fire(new Context(newTrain).route(this),this+".prepare()")) return false;
// state = State.PREPARED;
pathState(newTrain,Tile.Status.LOCKED);
return true;
}
private Tag previewScript() {
Tag script = new Tag("script").attr("type", "text/javascript");
for (Tile tile : path) {
@@ -736,11 +734,25 @@ public class Route extends BaseClass {
super.removeChild(child);
}
public boolean reserveFor(Context newContext) {
LOG.debug("{}.reserverFor({})",this,newContext);
if (isSet(context)) return false; // route already has context!
context = newContext;
for (Tile tile : path) {
if (newContext.invalidated() || !tile.reserveFor(newContext)) {
LOG.debug("Was not able to allocate route for {}.",newContext);
return false;
}
}
return true;
}
public boolean reset() {
LOG.debug("{}.reset()",this);
setSignals(Signal.RED);
Train train = context.train();
free();
// train = null;
train.drop(this);
return true;
}
@@ -783,21 +795,22 @@ public class Route extends BaseClass {
return this;
}
public boolean start(Train newTrain) {
// if (state == State.STARTED) return true;
public boolean start() {
LOG.debug("{}.start()",this);
if (isNull(newTrain)) return false; // can't set route's train to null
/* if (isSet(train)) {
if (newTrain != train) return false; // can't alter route's train
} else train = */newTrain.setRoute(this); // set new train
if (isNull(context) || context.invalidated()) return false;
Train train = context.train();
if (isNull(train)) return false; // can't set route's train to null
train.setRoute(this); // set new train
ActionList startActions = triggeredActions.get(ROUTE_START);
if (isSet(startActions)) {
Context context = new Context(newTrain).route(this);
if (!startActions.fire(context,this+".start("+newTrain.name()+")")) return false; // start actions failed
context.route(this);
String cause = this+".start("+train.name()+")";
if (!startActions.fire(context,cause)) return false; // start actions failed
}
// state = State.STARTED;
triggeredContacts.clear();
return true;
}

9
src/main/java/de/srsoftware/web4rail/actions/ActionList.java
View File

@@ -81,12 +81,11 @@ public class ActionList extends Action implements Iterable<Action>{
}
public boolean fire(Context context,Object cause) {
if (context.invalidated()) {
LOG.debug("Context has been invalidated, aborting {}",this);
return false;
}
for (Action action : actions) {
if (context.invalidated()) {
LOG.debug("Context has been invalidated, aborting {}",this);
return false;
}
LOG.debug("firing \"{}\"",action);
if (!action.fire(context,cause)) {
LOG.warn("{} failed",action);

2
src/main/java/de/srsoftware/web4rail/actions/CoupleTrain.java
View File

@@ -29,7 +29,7 @@ public class CoupleTrain extends Action {
if (isNull(train)) return false;
Block block = train.currentBlock();
if (isNull(block)) return false;
Train parkingTrain = block.parkedTrain(last);
Train parkingTrain = block.lastTrain();
if (isNull(parkingTrain)) return false;
train.coupleWith(parkingTrain,swap);
return true;

2
src/main/java/de/srsoftware/web4rail/conditions/BlockFree.java
View File

@@ -25,7 +25,7 @@ public class BlockFree extends Condition {
@Override
public boolean fulfilledBy(Context context) {
return block.canNeEnteredBy(null) != inverted;
return block.isFreeFor(null) != inverted;
}
@Override

2
src/main/java/de/srsoftware/web4rail/moving/Locomotive.java
View File

@@ -153,7 +153,7 @@ public class Locomotive extends Car implements Constants,Device{
if (isSet(train)) {
Block currentBlock = train.currentBlock();
if (isSet(currentBlock)) {
if (isNull(train.route())) {
if (!train.isStoppable()) {
params.put(ACTION, ACTION_START);
new Button(t("depart"),params).addTo(direction);
}

120
src/main/java/de/srsoftware/web4rail/moving/Train.java
View File

@@ -36,11 +36,11 @@ import de.srsoftware.web4rail.tags.Label;
import de.srsoftware.web4rail.tags.Select;
import de.srsoftware.web4rail.tags.Table;
import de.srsoftware.web4rail.tags.Window;
import de.srsoftware.web4rail.threads.RouteManager;
import de.srsoftware.web4rail.tiles.Block;
import de.srsoftware.web4rail.tiles.BlockContact;
import de.srsoftware.web4rail.tiles.Contact;
import de.srsoftware.web4rail.tiles.Tile;
import de.srsoftware.web4rail.tiles.Tile.Status;
/**
* @author Stephan Richter, SRSoftware 2020-2021 *
@@ -61,7 +61,6 @@ public class Train extends BaseClass implements Comparable<Train> {
private static final String ROUTE = "route";
private Route route;
private static final String DIRECTION = "direction";
private Direction direction;
private static final String PUSH_PULL = "pushPull";
@@ -91,7 +90,7 @@ public class Train extends BaseClass implements Comparable<Train> {
public int speed = 0;
private static final String SHUNTING = "shunting";
private boolean shunting = false;
private boolean autopilot = false;
private RouteManager routeManager = null;
public static Object action(HashMap<String, String> params, Plan plan) throws IOException {
String action = params.get(ACTION);
@@ -270,7 +269,7 @@ public class Train extends BaseClass implements Comparable<Train> {
if (isSet(currentBlock)) {
Tag ul = new Tag("ul");
if (isSet(currentBlock.train()) && currentBlock.train() != this) currentBlock.train().link().addTo(new Tag("li")).addTo(ul);
for (Train tr : currentBlock.parkedTrains()) {
for (Train tr : currentBlock.trains()) {
if (tr == this) continue;
Tag li = new Tag("li").addTo(ul);
tr.link().addTo(li);
@@ -299,12 +298,11 @@ public class Train extends BaseClass implements Comparable<Train> {
return properties();
}
public void contact(Contact contact) {
if (isSet(route)) {
Route lastRoute = route; // route field might be set to null during route.contact(...)!
route.contact(new Context(contact).train(this));
traceFrom(contact,lastRoute);
}
public Context contact(Contact contact) {
if (isNull(route)) return new Context(contact).train(this);
Context context = route.contact(contact);
traceFrom(context);
return context;
}
@@ -357,12 +355,11 @@ public class Train extends BaseClass implements Comparable<Train> {
return null;
}
public String directedName() {
public String directedName(Direction dir) {
String result = name();
String mark = ""; //isSet(autopilot) ? "ⓐ" : "";
if (isNull(direction)) return result;
switch (direction) {
if (isNull(dir)) return result;
switch (dir) {
case NORTH:
case WEST:
return '←'+mark+result;
@@ -370,7 +367,7 @@ public class Train extends BaseClass implements Comparable<Train> {
case EAST:
return result+mark+'→';
}
return result;
return mark+result;
}
public Direction direction() {
@@ -392,8 +389,16 @@ public class Train extends BaseClass implements Comparable<Train> {
return properties();
}
public boolean drop(Route oldRoute) {
if (isNull(route)) return true;
if (route != oldRoute) return false;
route = null;
return true;
}
public void dropTrace() {
while (!trace.isEmpty()) trace.removeFirst().free();
while (!trace.isEmpty()) trace.removeFirst().free(this);
}
public void endRoute(Block newBlock, Direction newDirection) {
@@ -438,7 +443,13 @@ public class Train extends BaseClass implements Comparable<Train> {
return shunting;
}
public boolean isStoppable() {
if (speed > 0) return true;
if (isSet(routeManager) && routeManager.isActive()) return true;
if (isSet(route)) return true;
return false;
}
public JSONObject json() {
JSONObject json = super.json();
json.put(PUSH_PULL, pushPull);
@@ -500,11 +511,11 @@ public class Train extends BaseClass implements Comparable<Train> {
if (json.has(TAGS)) json.getJSONArray(TAGS ).forEach(elem -> { tags.add(elem.toString()); });
if (json.has(TRACE)) json.getJSONArray(TRACE).forEach(elem -> {
Tile tile = plan.get(new Id(elem.toString()), false);
if (tile.setState(Status.OCCUPIED,this)) trace.add(tile);
if (tile.setTrain(this)) trace.add(tile);
});
if (json.has(BLOCK)) {// do not move this up! during set, other fields will be referenced!
currentBlock = (Block) plan.get(new Id(json.getString(BLOCK)), false);
currentBlock.setState(Status.OCCUPIED,this);
currentBlock.add(this, direction);
}
if (json.has(LOCOS)) { // for downward compatibility
for (Object id : json.getJSONArray(LOCOS)) add(BaseClass.get(new Id(""+id)));
@@ -654,10 +665,7 @@ public class Train extends BaseClass implements Comparable<Train> {
}
public String quitAutopilot() {
if (autopilot) {
autopilot = false;
return null;
}
if (isSet(routeManager)) routeManager.quit();
return t("Autopilot already was disabled!");
}
@@ -682,6 +690,7 @@ public class Train extends BaseClass implements Comparable<Train> {
//if (child == nextRoute) nextRoute = null; // TODO
if (child == currentBlock) currentBlock = null;
if (child == destination) destination = null;
if (child == routeManager) routeManager = null;
cars.remove(child);
trace.remove(child);
super.removeChild(child);
@@ -747,10 +756,10 @@ public class Train extends BaseClass implements Comparable<Train> {
public void set(Block newBlock) {
LOG.debug("{}.set({})",this,newBlock);
if (isSet(currentBlock)) currentBlock.free();
if (isSet(currentBlock)) currentBlock.free(this);
currentBlock = newBlock;
if (isSet(currentBlock)) {
currentBlock.setState(Status.OCCUPIED,this);
currentBlock.setTrain(this);
lastBlocks.add(newBlock);
if (lastBlocks.size()>32) lastBlocks.remove(0);
}
@@ -811,18 +820,6 @@ public class Train extends BaseClass implements Comparable<Train> {
cars.stream().filter(c -> c instanceof Locomotive).forEach(car -> ((Locomotive)car).setSpeed(speed));
plan.stream(t("Set {} to {} {}",this,speed,speedUnit));
}
public void setTrace(LinkedList<Tile> newTrace) {
LOG.debug("{}.setTrace({})",this,newTrace);
LOG.debug("old trace: {}",trace);
trace.removeAll(newTrace);
for (Tile tile : trace) tile.free();
trace = newTrace;
for (Tile tile : trace) tile.setState(Status.OCCUPIED,this);
LOG.debug("new trace of {}: {}",this,trace);
}
private Tag slower(int steps) {
setSpeed(speed-steps);
@@ -850,15 +847,18 @@ public class Train extends BaseClass implements Comparable<Train> {
if (remaining.cars.isEmpty()) return false;
remaining.direction = this.direction;
this.name = null;
currentBlock.add(remaining);
currentBlock.add(remaining,direction);
remaining.currentBlock = currentBlock;
plan.place(currentBlock);
return true;
}
public String start(boolean autopilot) {
return t("{}.start() not implemented",this);
public String start(boolean auto) {
if (isNull(routeManager)) routeManager = new RouteManager(this);
routeManager.setAuto(auto);
plan.stream(t("Started {}",this));
return null;
}
public static void startAll() {
@@ -871,6 +871,9 @@ public class Train extends BaseClass implements Comparable<Train> {
public Window stopNow() {
setSpeed(0);
quitAutopilot();
if (isSet(route)) {
route.reset();
}
return properties();
}
@@ -900,31 +903,9 @@ public class Train extends BaseClass implements Comparable<Train> {
return name();
}
public void traceFrom(Tile newHead,Route route) {
LOG.debug("{}.traceTrainFrom({})",this,newHead);
if (isNull(route)) return;
if (newHead instanceof BlockContact) newHead = (Tile) ((BlockContact)newHead).parent();
Tile traceHead = traceHead();
Integer remainingLength = null;
LinkedList<Tile> newTrace = new LinkedList<Tile>();
Vector<Tile> path = route.path();
for (int i=path.size(); i>0; i--) { // pfad rückwärts ablaufen
Tile tile = path.elementAt(i-1);
if (isNull(remainingLength)) {
if (tile == newHead) traceHead = newHead; // wenn wir zuerst newHead finden: newHead als neuen traceHead übernehmen
if (tile == traceHead) remainingLength = length(); // sobald wir auf den traceHead stoßen: Suche beenden
}
if (isSet(remainingLength)) {
if (remainingLength>=0) {
newTrace.add(tile);
remainingLength -= tile.length();
} else if (Route.freeBehindTrain) {
tile.free();
} else break;
}
}
setTrace(newTrace);
public void traceFrom(Context context) {
// TOSO: neu implementieren!
// Beachten: Route aus Context, plan.freeBehindTrain
}
public Tile traceHead() {
@@ -960,13 +941,8 @@ public class Train extends BaseClass implements Comparable<Train> {
}
return properties();
}
public boolean usesAutopilot() {
return autopilot ;
}
public boolean isStoppable() {
if (speed > 0) return true;
return false;
public boolean usesAutopilot() {
return isSet(routeManager) && routeManager.autoEnabled();
}
}

204
src/main/java/de/srsoftware/web4rail/threads/RouteManager.java Normal file
View File

@@ -0,0 +1,204 @@
package de.srsoftware.web4rail.threads;
import java.util.HashSet;
import java.util.List;
import java.util.Map.Entry;
import java.util.TreeMap;
import java.util.Vector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import de.srsoftware.web4rail.BaseClass;
import de.srsoftware.web4rail.Plan.Direction;
import de.srsoftware.web4rail.Route;
import de.srsoftware.web4rail.moving.Train;
import de.srsoftware.web4rail.tiles.Block;
public class RouteManager extends BaseClass implements Runnable {
enum State {
ENDED,IDLE,STARTED;
}
private static final Logger LOG = LoggerFactory.getLogger(RouteManager.class);
private static final int DEFAULT_PAUSE_TIME = 250; // ms
private State state = State.IDLE;
private boolean autopilot;
private Context context;
private int time = 0;
public RouteManager(Train train) {
context = new Context(train);
state = State.STARTED;
Thread thread = new Thread(this);
thread.setName(train.name());
thread.start();
}
private static TreeMap<Integer,List<Route>> availableRoutes(Context context,HashSet<Route> visitedRoutes){
String inset = "";
for (int i=0; i<visitedRoutes.size(); i++) inset+=" ";
LOG.debug("{}{}.availableRoutes({})",inset,RouteManager.class.getSimpleName(),context);
Block block = context.block();
Train train = context.train();
Direction startDirection = context.direction();
Route currentRoute = context.route();
TreeMap<Integer,List<Route>> availableRoutes = new TreeMap<Integer, List<Route>>();
boolean error = false;
if (isNull(block) && (error = true)) LOG.warn("{} → {}.availableRoutes called without context.block!",inset,Train.class.getSimpleName());
if (isNull(train) && (error = true)) LOG.warn("{}→ {}.availableRoutes called without context.train!", inset,Train.class.getSimpleName());
if (error) return availableRoutes;
Block destination = train.destination();
if (isSet(startDirection)) {
LOG.debug("{}- Looking for {}-bound routes from {}",inset,startDirection,block);
} else {
LOG.debug("{}- Looking for all routes from {}",inset,block);
}
if (isSet(destination) && visitedRoutes.isEmpty()) LOG.debug("{}- Destination: {}",inset,destination);
for (Route routeCandidate : block.routes(startDirection)) {
if (context.invalidated()) return availableRoutes;
if (visitedRoutes.contains(routeCandidate)) {
LOG.debug("{}→ Candidate {} would create loop, skipping",inset,routeCandidate.shortName());
continue;
}
if (!routeCandidate.allowed(context)) {
if (routeCandidate.endBlock() != destination) { // allowance may be overridden by destination
LOG.debug("{} not allowed for {}",routeCandidate,context);
continue; // Zug darf auf Grund einer nicht erfüllten Bedingung nicht auf die Route
}
LOG.debug("{} not allowed for {} – overridden by selected destination",routeCandidate,context);
}
int priority = 0;
if (isSet(startDirection) && routeCandidate.startDirection != startDirection) { // Route startet entgegen der aktuellen Fahrtrichtung des Zuges
if (!train.pushPull) continue; // Zug kann nicht wenden
if (!block.turnAllowed) continue; // Wenden im Block nicht gestattet
priority -= 5;
}
if (routeCandidate == currentRoute) priority-=10; // möglichst andere Route als zuvor wählen // TODO: den Routen einen "last-used" Zeitstempel hinzufügen, und diesen mit in die Priorisierung einbeziehen
if (isSet(destination)) {
if (routeCandidate.endBlock() == destination) { // route goes directly to destination
LOG.debug("{}→ Candidate {} directly leads to {}",inset,routeCandidate.shortName(),destination);
priority = 1_000_000;
} else {
LOG.debug("{}- Candidate: {}",inset,routeCandidate.shortName());
Context forwardContext = new Context(train).block(routeCandidate.endBlock()).route(null).direction(routeCandidate.endDirection);
visitedRoutes.add(routeCandidate);
TreeMap<Integer, List<Route>> forwardRoutes = availableRoutes(forwardContext,visitedRoutes);
visitedRoutes.remove(routeCandidate);
if (forwardRoutes.isEmpty()) continue; // the candidate does not lead to a block, from which routes to the destination exist
Entry<Integer, List<Route>> entry = forwardRoutes.lastEntry();
LOG.debug("{}→ The following routes have connections to {}:",inset,destination);
for (Route rt: entry.getValue()) LOG.debug("{} - {}",inset,rt.shortName());
priority += entry.getKey()-10;
}
}
List<Route> routeSet = availableRoutes.get(priority);
if (isNull(routeSet)) {
routeSet = new Vector<Route>();
availableRoutes.put(priority, routeSet);
}
routeSet.add(routeCandidate);
if (routeCandidate.endBlock() == destination) break; // direct connection to destination discovered, quit search
}
if (!availableRoutes.isEmpty()) LOG.debug("{}→ Routes from {}: {}",inset,block,availableRoutes.isEmpty()?"none":"");
for (Entry<Integer, List<Route>> entry : availableRoutes.entrySet()) {
LOG.debug("{} - Priority {}:",inset,entry.getKey());
for (Route r : entry.getValue()) LOG.debug("{} - {}",inset,r.shortName());
}
return availableRoutes;
}
public boolean autoEnabled() {
return autopilot && isActive();
}
public static Route chooseRoute(Context context) {
LOG.debug("{}.chooseRoute({})",RouteManager.class.getSimpleName(),context);
TreeMap<Integer, List<Route>> availableRoutes = availableRoutes(context,new HashSet<Route>());
while (!availableRoutes.isEmpty()) {
if (context.invalidated()) break;
LOG.debug("availableRoutes: {}",availableRoutes);
Entry<Integer, List<Route>> entry = availableRoutes.lastEntry();
List<Route> preferredRoutes = entry.getValue();
LOG.debug("preferredRoutes: {}",preferredRoutes);
Route selectedRoute = preferredRoutes.get(random.nextInt(preferredRoutes.size()));
if (selectedRoute.isFreeFor(context)) {
LOG.debug("Chose \"{}\" with priority {}.",selectedRoute,entry.getKey());
return selectedRoute;
}
LOG.debug("Selected route \"{}\" is not free for {}",selectedRoute,context);
preferredRoutes.remove(selectedRoute);
if (preferredRoutes.isEmpty()) availableRoutes.remove(availableRoutes.lastKey());
}
return null;
}
public boolean isActive() {
switch (state) {
case ENDED:
return false;
case IDLE:
return false;
default:
return true;
}
}
private void pause(){
if (time == 0) {
time = DEFAULT_PAUSE_TIME;
} else sleep(time);
}
public void quit() {
LOG.debug("{}.quit",this);
autopilot = false;
context.invalidate();
}
@Override
public void run() {
Train train = context.train();
try {
do {
pause();
if (context.invalidated()) return;
context.block(train.currentBlock()).direction(train.direction());
Route route = chooseRoute(context);
if (isNull(route)) continue;
context.route(route);
if (!route.reserveFor(context)) {
route.reset();
continue;
}
if (!route.prepareAndLock()) {
route.reset();
continue;
}
// Route reserved, prepared and locked:
if (!route.start()) {
route.reset();
continue;
}
} while (autopilot);
} finally {
// do not invalidate context here: may be used in delayed actions called from (successful) start
state = State.ENDED;
train.removeChild(this);
}
}
public void setAuto(boolean auto) {
LOG.debug("{}abled autopilot of {}",auto?"En":"Dis");
autopilot = auto;
}
}

250
src/main/java/de/srsoftware/web4rail/tiles/Block.java
View File

@@ -3,11 +3,13 @@ package de.srsoftware.web4rail.tiles;
import java.io.IOException;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Vector;
import java.util.stream.Collectors;
import org.json.JSONArray;
import org.json.JSONException;
@@ -20,6 +22,7 @@ import de.srsoftware.web4rail.BaseClass;
import de.srsoftware.web4rail.Connector;
import de.srsoftware.web4rail.Plan.Direction;
import de.srsoftware.web4rail.Range;
import de.srsoftware.web4rail.Route;
import de.srsoftware.web4rail.moving.Train;
import de.srsoftware.web4rail.tags.Button;
import de.srsoftware.web4rail.tags.Checkbox;
@@ -35,6 +38,53 @@ import de.srsoftware.web4rail.tags.Window;
*/
public abstract class Block extends StretchableTile{
protected static Logger LOG = LoggerFactory.getLogger(Block.class);
private class TrainList implements Iterable<Train>{
private LinkedList<Train> trains = new LinkedList<Train>();
private HashMap<Train, Direction> dirs = new HashMap<Train, Direction>();
public void add(Train train, Direction direction) {
trains.remove(train);
trains.addFirst(train);
if (isSet(direction)) dirs.put(train, direction);
}
public Direction directionOf(Train train) {
return dirs.get(train);
}
public Train first() {
return trains.isEmpty() ? null : trains.getFirst();
}
public boolean isEmpty() {
return trains.isEmpty();
}
@Override
public Iterator<Train> iterator() {
return trains.iterator();
}
public Train last() {
return trains.isEmpty() ? null : trains.getLast();
}
public List<Train> list() {
return new Vector<>(trains);
}
public boolean remove(BaseClass b) {
dirs.remove(b);
return trains.remove(b);
}
@Override
public String toString() {
return trains.toString();
}
}
private static final String ALLOW_TURN = "allowTurn";
private static final String NAME = "name";
private static final String NO_TAG = "[default]";
@@ -44,11 +94,12 @@ public abstract class Block extends StretchableTile{
private static final String RAISE = "raise";
public static final String ACTION_ADD_CONTACT = "add_contact";
private static final String PARKED_TRAINS = "parked_trains";
private static final String TRAINS = "parked_trains";
public String name = "Block";
public boolean turnAllowed = false;
private Vector<BlockContact> internalContacts = new Vector<BlockContact>();
private Vector<Train> parkedTrains = new Vector<Train>();
private TrainList trains = new TrainList();
public Block() {
super();
@@ -134,9 +185,9 @@ public abstract class Block extends StretchableTile{
private Vector<WaitTime> waitTimes = new Vector<WaitTime>();
public void add(Train parkedTrain) {
parkedTrain.register();
parkedTrains.add(parkedTrain);
public void add(Train train,Direction direction) {
train.register();
trains.add(train,direction);
}
@@ -147,22 +198,17 @@ public abstract class Block extends StretchableTile{
}
@Override
public boolean canNeEnteredBy(Train newTrain) {
if (!super.canNeEnteredBy(newTrain)) return false;
if (parkedTrains.isEmpty()) return true;
return isNull(newTrain) ? false : newTrain.isShunting(); // block contains train(s), thus it is only free for shunting train
}
@Override
protected HashSet<String> classes() {
HashSet<String> classes = super.classes();
if (!parkedTrains.isEmpty()) classes.add(Status.OCCUPIED.toString());
return classes;
public boolean isFreeFor(Context context) {
Train train = context.train();
if (is(Status.DISABLED)) return false;
if (trains.isEmpty()) return true;
if (trains.first() == train) return true;
return train.isShunting(); // block contains train(s), thus it is only free for shunting train
}
@Override
public Object click(boolean shift) throws IOException {
if (isSet(train) && !shift) return train.properties();
if (!trains.isEmpty() && !shift) return trains.first().properties();
return super.click(false);
}
@@ -211,6 +257,27 @@ public abstract class Block extends StretchableTile{
return this;
}
private void dropFirstTrain() {
Train train = trains.first();
if (isSet(train)) {
train.dropTrace();
train.set(null);
trains.remove(train);
}
}
@Override
public boolean free(Train train) {
LOG.debug("{}.free()");
Train firstTrain = trains.first();
if (isNull(firstTrain)) return true;
if (firstTrain != train) return false;
trains.remove(train);
status = trains.isEmpty() ? Status.FREE : Status.OCCUPIED;
plan.place(this);
return true;
}
private WaitTime getWaitTime(String tag) {
if (tag == null) return null;
for (WaitTime wt : waitTimes) {
@@ -252,9 +319,9 @@ public abstract class Block extends StretchableTile{
}
}
if (isSet(jContacts)) json.put(CONTACT, jContacts);
if (!parkedTrains.isEmpty()) {
if (!trains.isEmpty()) {
JSONArray ptids = new JSONArray();
for (Train parked : parkedTrains) {
for (Train parked : trains) {
if (isSet(parked)) ptids.put(parked.id().toString());
}
json.put(PARKED_TRAINS, ptids);
@@ -262,6 +329,11 @@ public abstract class Block extends StretchableTile{
return json;
}
public Train lastTrain() {
return trains.last();
}
/**
* If arguments are given, the first is taken as content, the second as tag type.
* If no content is supplied, name is set as content.
@@ -294,44 +366,61 @@ public abstract class Block extends StretchableTile{
} catch (JSONException e) {}
}
}
if (json.has(PARKED_TRAINS)) {
if (json.has(TRAINS)) {
JSONArray jTrains = json.getJSONArray(TRAINS);
for (Object o : jTrains) {
if (o instanceof JSONObject) {
JSONObject to = (JSONObject) o;
Train train = BaseClass.get(new Id(to.getString(ID)));
Direction direction = to.has(DIRECTION) ? Direction.valueOf(to.getString(DIRECTION)) : null;
if (isSet(train)) trains.add(train, direction);
}
}
}
if (json.has(PARKED_TRAINS)) { // legacy
JSONArray ptids = json.getJSONArray(PARKED_TRAINS);
for (Object id : ptids) {
Train train = BaseClass.get(new Id(id.toString()));
if (isSet(train)) parkedTrains.add(train);
if (isSet(train)) trains.add(train,null);
}
}
return super.load(json);
}
private Fieldset parkedTrainList() {
Fieldset fieldset = new Fieldset(t("parked trains"));
Tag list = new Tag("ul");
for (Train t : parkedTrains) {
if (isSet(t)) t.link("li", t).addTo(list);
@Override
public boolean lockFor(Context context) {
Train newTrain = context.train();
Route route = context.route();
LOG.debug("{}.lock({})",this,newTrain);
if (isNull(newTrain)) return false;
Train train = trains.first();
if (isSet(train) && train != newTrain) return false;
switch (status) {
case DISABLED:
return false;
case FREE:
case RESERVED:
status = Status.LOCKED;
Direction dir = trains.directionOf(train);
if (isSet(route) && this == route.endBlock()) dir = route.endDirection;
add(newTrain,dir);
plan.place(this);
break;
case OCCUPIED:
case LOCKED:
break; // do not downgrade
}
list.addTo(fieldset);
return fieldset;
return true;
}
public List<Train> parkedTrains(){
return parkedTrains;
}
public Train parkedTrain(boolean last) {
if (parkedTrains.isEmpty()) return null;
return last ? parkedTrains.lastElement() : parkedTrains.firstElement();
}
@Override
protected Window properties(List<Fieldset> preForm, FormInput formInputs, List<Fieldset> postForm,String...errors) {
formInputs.add(t("Name"),new Input(NAME, name));
formInputs.add("",new Checkbox(ALLOW_TURN,t("Turn allowed"),turnAllowed));
formInputs.add(t("Train"),Train.selector(train, null));
formInputs.add(t("Train"),Train.selector(trains.first(), null));
postForm.add(contactForm());
postForm.add(waitTimeForm());
if (!parkedTrains.isEmpty()) postForm.add(parkedTrainList());
if (!trains.isEmpty()) postForm.add(trainList());
return super.properties(preForm, formInputs, postForm,errors);
}
@@ -346,6 +435,32 @@ public abstract class Block extends StretchableTile{
}
return this;
}
@Override
public boolean reserveFor(Context context) {
Train newTrain = context.train();
Route route = context.route();
LOG.debug("{}.reserverFor({})",this,newTrain);
if (isNull(newTrain)) return false;
Train train = trains.first();
if (isSet(train) && train != newTrain) return false;
switch (status) {
case DISABLED:
return false;
case FREE:
status = Status.RESERVED;
Direction dir = trains.directionOf(train);
if (isSet(route) && this == route.endBlock()) dir = route.endDirection;
add(newTrain,dir);
plan.place(this);
break;
case OCCUPIED:
case LOCKED:
case RESERVED:
break; // do not downgrade
}
return true;
}
public BlockContact register(BlockContact contact) {
internalContacts.add(contact);
@@ -356,13 +471,17 @@ public abstract class Block extends StretchableTile{
public void removeChild(BaseClass child) {
super.removeChild(child);
internalContacts.remove(child);
if (parkedTrains.remove(child)) plan.place(this);
if (trains.remove(child)) plan.place(this);
}
public void removeContact(BlockContact blockContact) {
internalContacts.remove(blockContact);
}
public List<Route> routes(Direction direction) {
return routes().stream().filter(route -> route.startBlock() == Block.this).collect(Collectors.toList());
}
public abstract List<Connector> startPoints();
@Override
@@ -370,10 +489,7 @@ public abstract class Block extends StretchableTile{
if (isNull(replacements)) replacements = new HashMap<String, Object>();
replacements.put("%text%",name);
Vector<String> trainNames = new Vector<String>();
if (isSet(train)) trainNames.add(train.directedName());
for (Train t:parkedTrains) {
if (isSet(t)) trainNames.add(t.directedName());
}
for (Train train: trains) trainNames.add(train.directedName(trains.directionOf(train)));
if (!trainNames.isEmpty())replacements.put("%text%",String.join(" | ", trainNames));
Tag tag = super.tag(replacements);
tag.clazz(tag.get("class")+" Block");
@@ -390,23 +506,45 @@ public abstract class Block extends StretchableTile{
return name + " @ ("+x+","+y+")";
}
@Override
public Train train() {
return train(false);
}
public Train train(boolean last) {
return last ? trains.last() : trains.first();
}
private Fieldset trainList() {
Fieldset fieldset = new Fieldset(t("Trains"));
Tag list = new Tag("ul");
for (Train t : trains) {
if (isSet(t)) t.link("li", t).addTo(list);
}
list.addTo(fieldset);
return fieldset;
}
public List<Train> trains(){
return trains.list();
}
@Override
public Tile update(HashMap<String, String> params) {
if (params.containsKey(NAME)) name=params.get(NAME);
if (params.containsKey(Train.class.getSimpleName())) {
Id trainId = Id.from(params,Train.class.getSimpleName());
if (trainId.equals(0)) {
if (isSet(train)) {
train.dropTrace();
train.set(null);
}
train = null;
if (trainId.equals(0)) { // remove first train
dropFirstTrain();
} else {
Train newTrain = Train.get(trainId);
if (isSet(newTrain) && newTrain != train) {
newTrain.dropTrace();
if (connections(newTrain.direction()).isEmpty()) newTrain.heading(null);
newTrain.set(this);
Train train = Train.get(trainId);
if (isSet(train) && train != trains.first()) {
dropFirstTrain();
train.dropTrace();
if (connections(train.direction()).isEmpty()) train.heading(null);
train.set(this);
trains.add(train,train.direction());
}
}
}

3
src/main/java/de/srsoftware/web4rail/tiles/BlockContact.java
View File

@@ -34,8 +34,7 @@ public class BlockContact extends Contact {
@Override
public Train train() {
train = ((Block)parent()).train();
return train;
return ((Block)parent()).train();
}
@Override

14
src/main/java/de/srsoftware/web4rail/tiles/Bridge.java
View File

@@ -42,9 +42,9 @@ public abstract class Bridge extends Tile {
protected abstract Connector connector();
@Override
public void free() {
if (isSet(counterpart) && counterpart.train != null) counterpart.free();
super.free();
public boolean free(Train train) {
if (!super.free(train)) return false;
return isSet(counterpart) ? counterpart.free(train) : true;
}
@Override
@@ -68,10 +68,10 @@ public abstract class Bridge extends Tile {
}
@Override
public boolean setState(Status newState, Train newTrain) {
if (train == newTrain && is(newState)) return true;
if (!super.setState(newState,newTrain)) return false;
return isNull(counterpart) ? true : counterpart.setState(newState,newTrain);
public boolean setTrain(Train newTrain) {
if (train() == newTrain) return true;
if (!super.setTrain(newTrain)) return false;
return isNull(counterpart) ? true : counterpart.setTrain(newTrain);
}
@Override

8
src/main/java/de/srsoftware/web4rail/tiles/Contact.java
View File

@@ -18,6 +18,7 @@ import de.srsoftware.web4rail.Application;
import de.srsoftware.web4rail.BaseClass;
import de.srsoftware.web4rail.actions.Action;
import de.srsoftware.web4rail.actions.ActionList;
import de.srsoftware.web4rail.moving.Train;
import de.srsoftware.web4rail.tags.Fieldset;
import de.srsoftware.web4rail.tags.Input;
import de.srsoftware.web4rail.tags.Select;
@@ -84,11 +85,8 @@ public class Contact extends Tile{
LOG.debug("{} activated.",this);
state = true;
if (isSet(timer)) timer.abort();
Context context = new Context(this);
if (isSet(train())) {
train.contact(this);
context.train(train);
}
Train train = train();
Context context = isSet(train) ? train.contact(this) : new Context(this);
actions.fire(context,"Contact("+addr+")");
for (Listener listener : listeners) listener.fired("Contact("+addr+")");

451
src/main/java/de/srsoftware/web4rail/tiles/Tile.java
View File

@@ -38,109 +38,81 @@ import de.srsoftware.web4rail.tags.Window;
* @author Stephan Richter, SRSoftware
*
*/
public abstract class Tile extends BaseClass implements Comparable<Tile>{
public enum Status{
FREE("free"),
ALLOCATED("allocated"),
LOCKED("locked"),
OCCUPIED("occupied");
public abstract class Tile extends BaseClass implements Comparable<Tile> {
public enum Status {
DISABLED("disabled"), FREE("free"), RESERVED("reserved"), LOCKED("locked"), OCCUPIED("occupied");
private String tx;
Status(String s) {
tx = s;
}
@Override
public String toString() {
return tx;
}
}
protected static Logger LOG = LoggerFactory.getLogger(Tile.class);
protected static Logger LOG = LoggerFactory.getLogger(Tile.class);
private static int DEFAUT_LENGTH = 100; // 10cm
private static final String LENGTH = "length";
private static final String ONEW_WAY = "one_way";
private static final String POS = "pos";
private static final String TYPE = "type";
private static final String X = "x";
private static final String Y = "y";
private boolean disabled = false;
private boolean isTrack = true;
private int length = DEFAUT_LENGTH;
protected Direction oneWay = null;
private TreeSet<Route> routes = new TreeSet<>((r1,r2)->r1.toString().compareTo(r2.toString()));
private Status status = Status.FREE;
protected Train train = null;
public Integer x = null;
public Integer y = null;
private static final String LENGTH = "length";
private static final String ONEW_WAY = "one_way";
private static final String POS = "pos";
private static final String TYPE = "type";
private static final String X = "x";
private static final String Y = "y";
private boolean isTrack = true;
private int length = DEFAUT_LENGTH;
protected Direction oneWay = null;
private TreeSet<Route> routes = new TreeSet<>((r1, r2) -> r1.toString().compareTo(r2.toString()));
private Train train = null;
protected Status status = Status.FREE;
public Integer x = null;
public Integer y = null;
public void add(Route route) {
this.routes.add(route);
}
public boolean canNeEnteredBy(Train newTrain) {
LOG.debug("{}.canNeEnteredBy({})",this,newTrain);
if (disabled) {
LOG.debug("{} is disabled!",this);
return false;
}
if (isNull(train)) {
LOG.debug("→ free");
return true;
}
if (newTrain == train) { // during train.reserveNext, we may encounter, parts, that are already reserved by the respective train, but having another route. do not compare routes in that case!
LOG.debug("already reserved by {} → true",train);
return true;
}
if (isSet(newTrain) && newTrain.isShunting()) {
LOG.debug("occupied by {}. Allowed for shunting {}",train,newTrain);
return true;
}
LOG.debug("occupied by {} → false",train);
return false;
}
protected HashSet<String> classes(){
protected HashSet<String> classes() {
HashSet<String> classes = new HashSet<String>();
classes.add("tile");
classes.add(getClass().getSimpleName());
classes.add(getClass().getSimpleName());
if (!is(Status.FREE)) classes.add(status.toString());
if (disabled) classes.add(DISABLED);
return classes;
}
public Object click(boolean shift) throws IOException {
LOG.debug("{}.click()",getClass().getSimpleName());
LOG.debug("{}.click()", getClass().getSimpleName());
if (isSet(train) && shift) return train.properties();
return properties();
}
@Override
public int compareTo(Tile other) {
if (x == other.x) return y-other.y;
if (x == other.x) return y - other.y;
return x - other.x;
}
public JSONObject config() {
return new JSONObject();
}
public Map<Connector,Turnout.State> connections(Direction from){
public Map<Connector, Turnout.State> connections(Direction from) {
return new HashMap<>();
}
public void free() {
public boolean free(Train t) {
if (t != train) return false;
train = null;
status = Status.FREE;
plan.place(this);
return true;
}
public int height() {
return 1;
}
@@ -148,60 +120,89 @@ public abstract class Tile extends BaseClass implements Comparable<Tile>{
public Id id() {
return Tile.id(x, y);
}
public static Id id(int x, int y) {
return new Id(x+"-"+y);
return new Id(x + "-" + y);
}
private static void inflate(String clazz, JSONObject json, Plan plan) throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException, ClassNotFoundException, IOException {
clazz = Tile.class.getName().replace(".Tile", "."+clazz);
private static void inflate(String clazz, JSONObject json,
Plan plan) throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException, ClassNotFoundException, IOException {
clazz = Tile.class.getName().replace(".Tile", "." + clazz);
Tile tile = (Tile) Tile.class.getClassLoader().loadClass(clazz).getDeclaredConstructor().newInstance();
tile.load(json).register();
if (tile instanceof TileWithShadow) ((TileWithShadow)tile).placeShadows();
if (tile instanceof TileWithShadow) ((TileWithShadow) tile).placeShadows();
plan.place(tile);
}
public boolean is(Status...states) {
for (Status s: states) {
public boolean is(Status... states) {
for (Status s : states) {
if (status == s) return true;
}
return false;
}
public boolean isFreeFor(Context newTrain) {
LOG.debug("{}.isFreeFor({})", this, newTrain);
if (is(Status.DISABLED)) {
LOG.debug("{} is disabled!", this);
return false;
}
if (isNull(train)) {
LOG.debug("→ free");
return true;
}
if (newTrain.train() == train) { // during train.reserveNext, we may encounter, parts, that are already reserved
// by the respective train, but having another route. do not compare routes
// in that case!
LOG.debug("already reserved by {} → true", train);
return true;
}
if (isSet(newTrain.train()) && newTrain.train().isShunting()) {
LOG.debug("occupied by {}. Allowed for shunting {}", train, newTrain.train());
return true;
}
LOG.debug("occupied by {} → false", train);
return false;
}
public JSONObject json() {
JSONObject json = super.json();
json.put(TYPE, getClass().getSimpleName());
if (isSet(x) && isSet(y)) json.put(POS, new JSONObject(Map.of(X,x,Y,y)));
if (isSet(oneWay)) json.put(ONEW_WAY, oneWay);
if (disabled) json.put(DISABLED, true);
if (isSet(train)) json.put(REALM_TRAIN, train.id());
if (isSet(x) && isSet(y)) json.put(POS, new JSONObject(Map.of(X, x, Y, y)));
if (isSet(oneWay)) json.put(ONEW_WAY, oneWay);
if (is(Status.DISABLED)) json.put(DISABLED, true);
if (isSet(train)) json.put(REALM_TRAIN, train.id());
json.put(LENGTH, length);
return json;
}
public int length() {
return length;
}
public Tile length(int newLength) {
length = Math.max(0, newLength);
return this;
}
/**
* If arguments are given, the first is taken as content, the second as tag type.
* If no content is supplied, id() is set as content.
* If no type is supplied, "span" is preset.
* If arguments are given, the first is taken as content, the second as tag
* type. If no content is supplied, id() is set as content. If no type is
* supplied, "span" is preset.
*
* @param args
* @return
*/
public Tag link(String...args) {
String tx = args.length<1 ? id()+NBSP : args[0];
String type = args.length<2 ? "span" : args[1];
return super.link(type, (Object)tx, Map.of(ACTION,ACTION_CLICK));
public Tag link(String... args) {
String tx = args.length < 1 ? id() + NBSP : args[0];
String type = args.length < 2 ? "span" : args[1];
return super.link(type, (Object) tx, Map.of(ACTION, ACTION_CLICK));
}
public static void load(Object object, Plan plan) {
if (object instanceof JSONObject) {
JSONObject json = (JSONObject) object;
@@ -210,10 +211,12 @@ public abstract class Tile extends BaseClass implements Comparable<Tile>{
clazz = AlterDirection.class.getSimpleName();
}
try {
Tile.inflate(clazz,json,plan);
} catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException | ClassNotFoundException | IOException e) {
Tile.inflate(clazz, json, plan);
} catch (InstantiationException | IllegalAccessException | IllegalArgumentException
| InvocationTargetException | NoSuchMethodException | SecurityException | ClassNotFoundException
| IOException e) {
e.printStackTrace();
}
}
}
}
@@ -223,89 +226,92 @@ public abstract class Tile extends BaseClass implements Comparable<Tile>{
if (json.has(POS)) {
JSONObject pos = json.getJSONObject(POS);
x = pos.getInt(X);
y = pos.getInt(Y);
y = pos.getInt(Y);
}
if (json.has(DISABLED)) disabled = json.getBoolean(DISABLED);
if (json.has(LENGTH)) length = json.getInt(LENGTH);
if (json.has(ONEW_WAY)) oneWay = Direction.valueOf(json.getString(ONEW_WAY));
if (json.has(DISABLED) && json.getBoolean(DISABLED)) status = Status.DISABLED;
if (json.has(LENGTH)) length = json.getInt(LENGTH);
if (json.has(ONEW_WAY)) oneWay = Direction.valueOf(json.getString(ONEW_WAY));
return this;
}
public boolean move(int dx, int dy) {
int destX = x+(dx > 0 ? width() : dx);
int destY = y+(dy > 0 ? height() : dy);
int destX = x + (dx > 0 ? width() : dx);
int destY = y + (dy > 0 ? height() : dy);
if (destX < 0 || destY < 0) return false;
Tile tileAtDestination = plan.get(id(destX, destY),true);
Tile tileAtDestination = plan.get(id(destX, destY), true);
if (isSet(tileAtDestination) && !tileAtDestination.move(dx, dy)) return false;
plan.drop(this);
position(x+dx, y+dy);
plan.drop(this);
position(x + dx, y + dy);
plan.place(this);
return true;
}
protected void noTrack() {
isTrack = false;
isTrack = false;
}
public Tile position(int x, int y) {
this.x = x;
this.y = y;
return this;
}
public List<Direction> possibleDirections() {
return new Vector<Plan.Direction>();
}
@Override
protected Window properties(List<Fieldset> preForm, FormInput formInputs, List<Fieldset> postForm,String...errors) {
protected Window properties(List<Fieldset> preForm, FormInput formInputs, List<Fieldset> postForm,
String... errors) {
Fieldset fieldset = null;
if (isSet(train)) {
fieldset = new Fieldset(t("Train"));
train.link("span", t("Train")+":"+NBSP+train+NBSP).addTo(fieldset);
train.link("span", t("Train") + ":" + NBSP + train + NBSP).addTo(fieldset);
if (isSet(train.route())) {
train.button(t("stop"), Map.of(ACTION,ACTION_STOP)).addTo(fieldset);
train.button(t("stop"), Map.of(ACTION, ACTION_STOP)).addTo(fieldset);
} else {
train.button(t("depart"), Map.of(ACTION,ACTION_START)).addTo(fieldset);
train.button(t("depart"), Map.of(ACTION, ACTION_START)).addTo(fieldset);
}
if (train.usesAutopilot()) {
train.button(t("quit autopilot"), Map.of(ACTION,ACTION_QUIT)).addTo(fieldset);
train.button(t("quit autopilot"), Map.of(ACTION, ACTION_QUIT)).addTo(fieldset);
} else {
train.button(t("auto"), Map.of(ACTION,ACTION_AUTO)).addTo(fieldset);
train.button(t("auto"), Map.of(ACTION, ACTION_AUTO)).addTo(fieldset);
}
}
if (isSet(fieldset)) preForm.add(fieldset);
if (isTrack) {
formInputs.add(t("Length"),new Input(LENGTH,length).numeric().addTo(new Tag("span")).content(NBSP+lengthUnit));
Checkbox checkbox = new Checkbox(DISABLED, t("disabled"),disabled);
if (disabled) checkbox.clazz("disabled");
formInputs.add(t("State"),checkbox);
formInputs.add(t("Length"),
new Input(LENGTH, length).numeric().addTo(new Tag("span")).content(NBSP + lengthUnit));
Checkbox checkbox = new Checkbox(DISABLED, t("disabled"), is(Status.DISABLED));
if (is(Status.DISABLED)) checkbox.clazz("disabled");
formInputs.add(t("State"), checkbox);
}
List<Direction> pd = possibleDirections();
if (!pd.isEmpty()) {
Tag div = new Tag("div");
new Radio("oneway","none",t("No"),isNull(oneWay)).addTo(div);
for (Direction d:pd) {
new Radio("oneway",d.toString(),t(d.toString()),d == oneWay).addTo(div);
new Radio("oneway", "none", t("No"), isNull(oneWay)).addTo(div);
for (Direction d : pd) {
new Radio("oneway", d.toString(), t(d.toString()), d == oneWay).addTo(div);
}
formInputs.add(t("One way"),div);
formInputs.add(t("One way"), div);
}
if (!routes.isEmpty()) {
fieldset = new Fieldset(t("Routes")).id("props-routes");
Tag routeList = new Tag("ol");
boolean empty = true;
for (Route route : routes) {
if (route.isDisabled()) continue;
Tag li = route.link("span", route.name()+(route.isDisabled()?" ["+t("disabled")+"]" : "")+NBSP).addTo(new Tag("li").clazz("link"));
route.button(t("delete route"),Map.of(ACTION,ACTION_DROP)).addTo(li);
button(t("simplify name"), Map.of(ACTION,ACTION_AUTO,ROUTE,route.id().toString())).addTo(li);
Tag li = route
.link("span", route.name() + (route.isDisabled() ? " [" + t("disabled") + "]" : "") + NBSP)
.addTo(new Tag("li").clazz("link"));
route.button(t("delete route"), Map.of(ACTION, ACTION_DROP)).addTo(li);
button(t("simplify name"), Map.of(ACTION, ACTION_AUTO, ROUTE, route.id().toString())).addTo(li);
li.addTo(routeList);
empty = false;
}
@@ -314,14 +320,16 @@ public abstract class Tile extends BaseClass implements Comparable<Tile>{
routeList.addTo(fieldset);
postForm.add(fieldset);
}
routeList = new Tag("ol");
empty = true;
for (Route route : routes) {
if (!route.isDisabled()) continue;
Tag li = route.link("span", route.name()+(route.isDisabled()?" ["+t("disabled")+"]" : "")+NBSP).addTo(new Tag("li").clazz("link"));
route.button(t("delete route"),Map.of(ACTION,ACTION_DROP)).addTo(li);
button(t("simplify name"), Map.of(ACTION,ACTION_AUTO,ROUTE,route.id().toString())).addTo(li);
Tag li = route
.link("span", route.name() + (route.isDisabled() ? " [" + t("disabled") + "]" : "") + NBSP)
.addTo(new Tag("li").clazz("link"));
route.button(t("delete route"), Map.of(ACTION, ACTION_DROP)).addTo(li);
button(t("simplify name"), Map.of(ACTION, ACTION_AUTO, ROUTE, route.id().toString())).addTo(li);
li.addTo(routeList);
empty = false;
}
@@ -330,84 +338,90 @@ public abstract class Tile extends BaseClass implements Comparable<Tile>{
routeList.addTo(fieldset);
}
}
return super.properties(preForm, formInputs, postForm,errors);
return super.properties(preForm, formInputs, postForm, errors);
}
private static String replace(String line, Entry<String, Object> replacement) {
String key = replacement.getKey();
String key = replacement.getKey();
Object val = replacement.getValue();
int start = line.indexOf(key);
int len = key.length();
while (start>0) {
int end = line.indexOf("\"",start);
int end2 = line.indexOf("<",start);
if (end2>0 && (end<0 || end2<end)) end=end2;
while (start > 0) {
int end = line.indexOf("\"", start);
int end2 = line.indexOf("<", start);
if (end2 > 0 && (end < 0 || end2 < end)) end = end2;
String tag = line.substring(start, end);
if (tag.length()>len) val = Integer.parseInt(tag.substring(len)) + (int) val;
line = line.replace(tag, ""+val);
if (tag.length() > len) val = Integer.parseInt(tag.substring(len)) + (int) val;
line = line.replace(tag, "" + val);
start = line.indexOf(key);
}
return line;
}
public TreeSet<Route> routes() {
return routes;
}
public static void saveAll(String filename) throws IOException {
BufferedWriter file = new BufferedWriter(new FileWriter(filename));
for (Tile tile : BaseClass.listElements(Tile.class)) {
if (isNull(tile) || tile instanceof Shadow || tile instanceof BlockContact) continue;
file.append(tile.json()+"\n");
file.append(tile.json() + "\n");
}
file.close();
}
public boolean setState(Status newState,Train newTrain) {
public boolean setTrain(Train newTrain) {
if (isNull(newTrain)) return false;
if (isSet(train) && newTrain != train) return false; // already locked by other train
if (is(Status.OCCUPIED,newState)) return true; // do not downgrade occupied tiles, accept current state
train = newTrain;
status = newState;
plan.place(this);
if (isSet(train) && newTrain != train) return false;
switch (status) { // bisheriger Status
case DISABLED:
return false;
case FREE:
case RESERVED:
case LOCKED:
train = newTrain;
status = Status.OCCUPIED;
plan.place(this);
break;
case OCCUPIED:
break;
}
return true;
}
public Tag tag(Map<String,Object> replacements) throws IOException {
int width = 100*width();
int height = 100*height();
public Tag tag(Map<String, Object> replacements) throws IOException {
int width = 100 * width();
int height = 100 * height();
if (isNull(replacements)) replacements = new HashMap<String, Object>();
replacements.put("%width%",width);
replacements.put("%height%",height);
replacements.put("%width%", width);
replacements.put("%height%", height);
String style = "";
Tag svg = new Tag("svg")
.id(isSet(x) && isSet(y) ? id().toString() : getClass().getSimpleName())
.clazz(classes())
.size(100,100)
.attr("name", getClass().getSimpleName())
.attr("viewbox", "0 0 "+width+" "+height);
if (isSet(x)) style="left: "+(30*x)+"px; top: "+(30*y)+"px;";
if (width()>1) style+=" width: "+(30*width())+"px;";
if (height()>1) style+=" height: "+(30*height())+"px;";
Tag svg = new Tag("svg").id(isSet(x) && isSet(y) ? id().toString() : getClass().getSimpleName())
.clazz(classes()).size(100, 100).attr("name", getClass().getSimpleName())
.attr("viewbox", "0 0 " + width + " " + height);
if (isSet(x)) style = "left: " + (30 * x) + "px; top: " + (30 * y) + "px;";
if (width() > 1) style += " width: " + (30 * width()) + "px;";
if (height() > 1) style += " height: " + (30 * height()) + "px;";
if (!style.isEmpty()) svg.style(style);
File file = new File(System.getProperty("user.dir")+"/resources/svg/"+getClass().getSimpleName()+".svg");
File file = new File(System.getProperty("user.dir") + "/resources/svg/" + getClass().getSimpleName() + ".svg");
if (file.exists()) {
Scanner scanner = new Scanner(file, StandardCharsets.UTF_8);
StringBuffer sb = new StringBuffer();
while (scanner.hasNextLine()) {
String line = scanner.nextLine();
if (line.startsWith("<svg") || line.endsWith("svg>")) continue;
for (Entry<String, Object> replacement : replacements.entrySet()) line = replace(line,replacement);
sb.append(line+"\n");
for (Entry<String, Object> replacement : replacements.entrySet()) line = replace(line, replacement);
sb.append(line + "\n");
}
scanner.close();
svg.content(sb.toString());
if (isSet(oneWay)) {
switch (oneWay) {
switch (oneWay) {
case EAST:
new Tag("polygon").clazz("oneway").attr("points", "100,50 75,35 75,65").addTo(svg);
break;
@@ -426,54 +440,97 @@ public abstract class Tile extends BaseClass implements Comparable<Tile>{
String title = title();
if (isSet(title)) new Tag("title").content(title()).addTo(svg);
} else {
new Tag("title").content(t("No display defined for this tile ({})",getClass().getSimpleName())).addTo(svg);
new Tag("text")
.pos(35,70)
.content("?")
.addTo(svg);
new Tag("title").content(t("No display defined for this tile ({})", getClass().getSimpleName())).addTo(svg);
new Tag("text").pos(35, 70).content("?").addTo(svg);
}
return svg;
}
public String title() {
return getClass().getSimpleName() + " @ ("+x+", "+y+")";
return getClass().getSimpleName() + " @ (" + x + ", " + y + ")";
}
@Override
public String toString() {
return t("{}({},{})",getClass().getSimpleName(),x,y) ;
return t("{}({},{})", getClass().getSimpleName(), x, y);
}
public Train train() {
return train;
}
@Override
public BaseClass remove() {
while (!routes.isEmpty()) routes.first().remove();
return super.remove();
}
@Override
public void removeChild(BaseClass child) {
String childAsString = child.toString();
if (childAsString.length()>20) childAsString = childAsString.substring(0, 20)+"…";
LOG.debug("Removing {} from {}",childAsString,this);
if (childAsString.length() > 20) childAsString = childAsString.substring(0, 20) + "…";
LOG.debug("Removing {} from {}", childAsString, this);
if (child instanceof Route) routes.remove(child);
if (child == train) train = null;
super.removeChild(child);
plan.place(this);
}
public void setEnabled(boolean newState) {
disabled = !newState;
public boolean lockFor(Context context) {
Train newTrain = context.train();
LOG.debug("{}.lockFor({})",this,newTrain);
if (isNull(newTrain)) return false;
if (isSet(train) && train != newTrain) return false;
switch (status) {
case DISABLED:
return false;
case FREE:
case RESERVED:
status = Status.LOCKED;
plan.place(this);
break;
case OCCUPIED:
case LOCKED:
break; // do not downgrade
}
return true;
}
public boolean reserveFor(Context context) {
Train newTrain = context.train();
LOG.debug("{}.reserverFor({})",this,newTrain);
if (isNull(newTrain)) return false;
if (isSet(train) && train != newTrain) return false;
switch (status) {
case DISABLED:
return false;
case FREE:
status = Status.RESERVED;
train = newTrain;
plan.place(this);
break;
case OCCUPIED:
case LOCKED:
case RESERVED:
break; // do not downgrade
}
return true;
}
public void setEnabled(boolean enabled) {
if (!enabled) {
status = Status.DISABLED;
} else if (is(Status.DISABLED)) { // Status nur ändern, wenn er bisher DISABLED war
status = isNull(train) ? Status.FREE : Status.OCCUPIED;
}
plan.place(this);
}
public Tile update(HashMap<String, String> params) {
LOG.debug("{}.update({})",getClass().getSimpleName(),params);
LOG.debug("{}.update({})", getClass().getSimpleName(), params);
String oneWayDir = params.get("oneway");
if (isSet(oneWayDir)) {
try {
@@ -482,17 +539,15 @@ public abstract class Tile extends BaseClass implements Comparable<Tile>{
oneWay = null;
}
}
disabled = "on".equals(params.get(DISABLED));
if ("on".equals(params.get(DISABLED))) status = Status.DISABLED;
String len = params.get(LENGTH);
if (isSet(len)) length(Integer.parseInt(len));
super.update(params);
plan.place(this);
return this;
}
public int width() {
return 1;
}
}

2
src/main/java/de/srsoftware/web4rail/tiles/Turnout.java
View File

@@ -159,7 +159,7 @@ public abstract class Turnout extends Tile implements Device{
}
public Reply state(State newState) {
if (is(Status.LOCKED,Status.OCCUPIED) && newState != state) return new Reply(415, t("{} locked by {}!",this,train));
if (is(Status.LOCKED,Status.OCCUPIED) && newState != state) return new Reply(415, t("{} locked by {}!",this,train()));
if (address == 0) {
state = newState;
plan.place(this);

2
src/main/java/de/srsoftware/web4rail/tiles/TurnoutL.java
View File

@@ -4,6 +4,7 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import de.srsoftware.web4rail.moving.Train;
import de.srsoftware.web4rail.tags.Fieldset;
import de.srsoftware.web4rail.tags.Input;
import de.srsoftware.web4rail.tags.Window;
@@ -16,6 +17,7 @@ public abstract class TurnoutL extends Turnout {
public Object click(boolean shift) throws IOException {
Object o = super.click(shift);
if (!shift) {
Train train = train();
if (isSet(train)) {
plan.stream(t("{} is locked by {}!",this,train));
} else state(state == State.STRAIGHT ? State.LEFT : State.STRAIGHT);

2
src/main/java/de/srsoftware/web4rail/tiles/TurnoutR.java
View File

@@ -4,6 +4,7 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import de.srsoftware.web4rail.moving.Train;
import de.srsoftware.web4rail.tags.Fieldset;
import de.srsoftware.web4rail.tags.Input;
import de.srsoftware.web4rail.tags.Window;
@@ -16,6 +17,7 @@ public abstract class TurnoutR extends Turnout {
public Object click(boolean shift) throws IOException {
Object o = super.click(shift);
if (!shift) {
Train train = train();
if (isSet(train)) {
plan.stream(t("{} is locked by {}!",this,train));
} else state(state == State.STRAIGHT ? State.RIGHT : State.STRAIGHT);