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

implemented one-way tracks

Browse Source
This commit is contained in:
Stephan Richter
2020-09-20 17:49:54 +02:00
parent cd022ce4a3
commit bcfa6e79aa
14 changed files with 136 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/de/srsoftware/web4rail/tiles/ContactH.java
View File

@@ -1,6 +1,7 @@
package de.srsoftware.web4rail.tiles;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import de.srsoftware.web4rail.Connector;
@@ -10,6 +11,7 @@ import de.srsoftware.web4rail.tiles.Turnout.State;
public class ContactH extends Contact {
@Override
public Map<Connector, State> connections(Direction from) {
if (oneWay == from) return new HashMap<>();
switch (from) {
case WEST:
return Map.of(new Connector(x+1,y,from),State.UNDEF);
@@ -19,4 +21,9 @@ public class ContactH extends Contact {
return new HashMap<>();
}
}
@Override
public List<Direction> possibleDirections() {
return List.of(Direction.EAST,Direction.WEST);
}
}

7
src/main/java/de/srsoftware/web4rail/tiles/ContactV.java
View File

@@ -1,6 +1,7 @@
package de.srsoftware.web4rail.tiles;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import de.srsoftware.web4rail.Connector;
@@ -11,6 +12,7 @@ public class ContactV extends Contact {
@Override
public Map<Connector, State> connections(Direction from) {
if (oneWay == from) return new HashMap<>();
switch (from) {
case NORTH:
return Map.of(new Connector(x,y+1,from),State.UNDEF);
@@ -20,4 +22,9 @@ public class ContactV extends Contact {
return new HashMap<>();
}
}
@Override
public List<Direction> possibleDirections() {
return List.of(Direction.NORTH,Direction.SOUTH);
}
}

7
src/main/java/de/srsoftware/web4rail/tiles/SignalE.java
View File

@@ -1,6 +1,7 @@
package de.srsoftware.web4rail.tiles;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import de.srsoftware.web4rail.Connector;
@@ -10,6 +11,7 @@ import de.srsoftware.web4rail.tiles.Turnout.State;
public class SignalE extends Signal{
@Override
public Map<Connector, State> connections(Direction from) {
if (oneWay == from) return new HashMap<>();
switch (from) {
case WEST:
return Map.of(new Connector(x+1,y,Direction.WEST),State.UNDEF);
@@ -24,4 +26,9 @@ public class SignalE extends Signal{
public boolean isAffectedFrom(Direction dir) {
return dir == Direction.EAST;
}
@Override
public List<Direction> possibleDirections() {
return List.of(Direction.EAST,Direction.WEST);
}
}

7
src/main/java/de/srsoftware/web4rail/tiles/SignalN.java
View File

@@ -1,6 +1,7 @@
package de.srsoftware.web4rail.tiles;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import de.srsoftware.web4rail.Connector;
@@ -11,6 +12,7 @@ public class SignalN extends Signal {
@Override
public Map<Connector, State> connections(Direction from) {
if (oneWay == from) return new HashMap<>();
switch (from) {
case NORTH:
return Map.of(new Connector(x,y+1,Direction.NORTH),State.UNDEF);
@@ -25,4 +27,9 @@ public class SignalN extends Signal {
public boolean isAffectedFrom(Direction dir) {
return dir == Direction.NORTH;
}
@Override
public List<Direction> possibleDirections() {
return List.of(Direction.NORTH,Direction.SOUTH);
}
}

7
src/main/java/de/srsoftware/web4rail/tiles/SignalS.java
View File

@@ -1,6 +1,7 @@
package de.srsoftware.web4rail.tiles;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import de.srsoftware.web4rail.Connector;
@@ -11,6 +12,7 @@ public class SignalS extends Signal{
@Override
public Map<Connector, State> connections(Direction from) {
if (oneWay == from) return new HashMap<>();
switch (from) {
case NORTH:
return Map.of(new Connector(x,y+1,Direction.NORTH),State.UNDEF);
@@ -25,4 +27,9 @@ public class SignalS extends Signal{
public boolean isAffectedFrom(Direction dir) {
return dir == Direction.SOUTH;
}
@Override
public List<Direction> possibleDirections() {
return List.of(Direction.NORTH,Direction.SOUTH);
}
}

7
src/main/java/de/srsoftware/web4rail/tiles/SignalW.java
View File

@@ -1,6 +1,7 @@
package de.srsoftware.web4rail.tiles;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import de.srsoftware.web4rail.Connector;
@@ -10,6 +11,7 @@ import de.srsoftware.web4rail.tiles.Turnout.State;
public class SignalW extends Signal{
@Override
public Map<Connector, State> connections(Direction from) {
if (oneWay == from) return new HashMap<>();
switch (from) {
case WEST:
return Map.of(new Connector(x+1,y,Direction.WEST),State.UNDEF);
@@ -24,4 +26,9 @@ public class SignalW extends Signal{
public boolean isAffectedFrom(Direction dir) {
return dir == Direction.WEST;
}
@Override
public List<Direction> possibleDirections() {
return List.of(Direction.EAST,Direction.WEST);
}
}

7
src/main/java/de/srsoftware/web4rail/tiles/StraightH.java
View File

@@ -1,6 +1,7 @@
package de.srsoftware.web4rail.tiles;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import de.srsoftware.web4rail.Connector;
@@ -11,6 +12,7 @@ public class StraightH extends StretchableTile{
@Override
public Map<Connector, State> connections(Direction from) {
if (oneWay == from) return new HashMap<>();
switch (from) {
case WEST:
return Map.of(new Connector(x+len(),y,Direction.WEST),State.UNDEF);
@@ -25,4 +27,9 @@ public class StraightH extends StretchableTile{
public int len() {
return length;
}
@Override
public List<Direction> possibleDirections() {
return List.of(Direction.EAST,Direction.WEST);
}
}

7
src/main/java/de/srsoftware/web4rail/tiles/StraightV.java
View File

@@ -1,6 +1,7 @@
package de.srsoftware.web4rail.tiles;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import de.srsoftware.web4rail.Connector;
@@ -11,6 +12,7 @@ public class StraightV extends StretchableTile{
@Override
public Map<Connector, State> connections(Direction from) {
if (oneWay == from) return new HashMap<>();
switch (from) {
case NORTH:
return Map.of(new Connector(x,y+height(),Direction.NORTH),State.UNDEF);
@@ -25,4 +27,9 @@ public class StraightV extends StretchableTile{
public int height() {
return length;
}
@Override
public List<Direction> possibleDirections() {
return List.of(Direction.NORTH,Direction.SOUTH);
}
}

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

@@ -5,9 +5,11 @@ import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Scanner;
import java.util.Vector;
import org.json.JSONObject;
import org.slf4j.Logger;
@@ -22,6 +24,7 @@ import de.srsoftware.web4rail.Plan.Direction;
import de.srsoftware.web4rail.Route;
import de.srsoftware.web4rail.Window;
import de.srsoftware.web4rail.tags.Form;
import de.srsoftware.web4rail.tags.Radio;
public abstract class Tile {
@@ -31,6 +34,7 @@ public abstract class Tile {
private HashSet<Route> routes = new HashSet<>();
protected Plan plan;
protected Route route;
protected Direction oneWay = null;
protected static Logger LOG = LoggerFactory.getLogger(Tile.class);
@@ -97,11 +101,25 @@ public abstract class Tile {
return this;
}
public List<Direction> possibleDirections() {
return new Vector<Plan.Direction>();
}
public Tag propForm() {
Form form = new Form();
new Tag("input").attr("type", "hidden").attr("name","action").attr("value", "update").addTo(form);
new Tag("input").attr("type", "hidden").attr("name","x").attr("value", x).addTo(form);
new Tag("input").attr("type", "hidden").attr("name","y").attr("value", y).addTo(form);
List<Direction> pd = possibleDirections();
if (!pd.isEmpty()) {
new Tag("h4").content(t("One way:")).addTo(form);
new Radio("oneway","none",t("No"),oneWay == null).addTo(form);
for (Direction d:pd) {
Radio radio = new Radio("oneway",d.toString(),t(d.toString()),d == oneWay);
radio.addTo(form);
}
}
return form;
}
@@ -115,6 +133,10 @@ public abstract class Tile {
window.content(t("This tile ({}) has no properties",getClass().getSimpleName()));
}
if (route != null) {
new Tag("p").content(t("Locked by {}",route)).addTo(window);
}
if (!routes.isEmpty()) {
new Tag("h4").content(t("Routes using this tile:")).addTo(window);
Tag routeList = new Tag("ul");
@@ -166,6 +188,7 @@ public abstract class Tile {
if (x>-1) style="left: "+(30*x)+"px; top: "+(30*y)+"px;";
if (len()>1) style+=" width: "+(30*len())+"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");
@@ -182,6 +205,17 @@ public abstract class Tile {
}
scanner.close();
svg.content(sb.toString());
if (oneWay != null) {
switch (oneWay) {
case EAST:
new Tag("polygon").clazz("oneway").attr("points", "100,50 75,35 75,65").addTo(svg);
break;
case WEST:
new Tag("polygon").clazz("oneway").attr("points", "0,50 25,35 25,65").addTo(svg);
}
}
} else {
new Tag("title").content(t("No display defined for this tile ({})",getClass().getSimpleName())).addTo(svg);
new Tag("text")
@@ -212,6 +246,14 @@ public abstract class Tile {
public Tile update(HashMap<String, String> params) {
LOG.debug("{}.update({})",getClass().getSimpleName(),params);
String oneWayDir = params.get("oneway");
if (oneWayDir != null) {
try {
oneWay = Direction.valueOf(oneWayDir);
} catch (Exception e) {
oneWay = null;
}
}
return this;
}