mirror of
https://gitlab.com/oeffi/public-transport-enabler.git
synced 2025-07-15 00:50:31 +00:00
use shapes in Berlin and Karlsruhe
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@891 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com
parent
0c5e091bec
commit
1f02884075
2 changed files with 94 additions and 92 deletions
|
|
@ -45,6 +45,7 @@ import de.schildbach.pte.dto.ResultHeader;
|
|||
import de.schildbach.pte.dto.StationDepartures;
|
||||
import de.schildbach.pte.dto.Stop;
|
||||
import de.schildbach.pte.dto.Style;
|
||||
import de.schildbach.pte.dto.Style.Shape;
|
||||
import de.schildbach.pte.exception.SessionExpiredException;
|
||||
import de.schildbach.pte.exception.UnexpectedRedirectException;
|
||||
import de.schildbach.pte.geo.Berlin;
|
||||
|
|
@ -947,40 +948,40 @@ public final class BvgProvider extends AbstractHafasProvider
|
|||
LINES.put("SS85", new Style(Style.WHITE, Style.rgb(85, 184, 49)));
|
||||
LINES.put("SS9", new Style(Style.rgb(148, 36, 64), Style.WHITE));
|
||||
|
||||
LINES.put("UU1", new Style(Style.rgb(84, 131, 47), Style.WHITE));
|
||||
LINES.put("UU2", new Style(Style.rgb(215, 25, 16), Style.WHITE));
|
||||
LINES.put("UU3", new Style(Style.rgb(47, 152, 154), Style.WHITE));
|
||||
LINES.put("UU4", new Style(Style.rgb(255, 233, 42), Style.BLACK));
|
||||
LINES.put("UU5", new Style(Style.rgb(91, 31, 16), Style.WHITE));
|
||||
LINES.put("UU55", new Style(Style.rgb(91, 31, 16), Style.WHITE));
|
||||
LINES.put("UU6", new Style(Style.rgb(127, 57, 115), Style.WHITE));
|
||||
LINES.put("UU7", new Style(Style.rgb(0, 153, 204), Style.WHITE));
|
||||
LINES.put("UU8", new Style(Style.rgb(24, 25, 83), Style.WHITE));
|
||||
LINES.put("UU9", new Style(Style.rgb(255, 90, 34), Style.WHITE));
|
||||
LINES.put("UU1", new Style(Shape.RECT, Style.rgb(84, 131, 47), Style.WHITE));
|
||||
LINES.put("UU2", new Style(Shape.RECT, Style.rgb(215, 25, 16), Style.WHITE));
|
||||
LINES.put("UU3", new Style(Shape.RECT, Style.rgb(47, 152, 154), Style.WHITE));
|
||||
LINES.put("UU4", new Style(Shape.RECT, Style.rgb(255, 233, 42), Style.BLACK));
|
||||
LINES.put("UU5", new Style(Shape.RECT, Style.rgb(91, 31, 16), Style.WHITE));
|
||||
LINES.put("UU55", new Style(Shape.RECT, Style.rgb(91, 31, 16), Style.WHITE));
|
||||
LINES.put("UU6", new Style(Shape.RECT, Style.rgb(127, 57, 115), Style.WHITE));
|
||||
LINES.put("UU7", new Style(Shape.RECT, Style.rgb(0, 153, 204), Style.WHITE));
|
||||
LINES.put("UU8", new Style(Shape.RECT, Style.rgb(24, 25, 83), Style.WHITE));
|
||||
LINES.put("UU9", new Style(Shape.RECT, Style.rgb(255, 90, 34), Style.WHITE));
|
||||
|
||||
LINES.put("TM1", new Style(Style.parseColor("#eb8614"), Style.WHITE));
|
||||
LINES.put("TM2", new Style(Style.parseColor("#68c52f"), Style.WHITE));
|
||||
LINES.put("TM4", new Style(Style.parseColor("#cf1b22"), Style.WHITE));
|
||||
LINES.put("TM5", new Style(Style.parseColor("#bf8037"), Style.WHITE));
|
||||
LINES.put("TM6", new Style(Style.parseColor("#1e5ca2"), Style.WHITE));
|
||||
LINES.put("TM8", new Style(Style.parseColor("#f46717"), Style.WHITE));
|
||||
LINES.put("TM10", new Style(Style.parseColor("#108449"), Style.WHITE));
|
||||
LINES.put("TM13", new Style(Style.parseColor("#36ab94"), Style.WHITE));
|
||||
LINES.put("TM17", new Style(Style.parseColor("#a23f30"), Style.WHITE));
|
||||
LINES.put("TM1", new Style(Shape.RECT, Style.parseColor("#eb8614"), Style.WHITE));
|
||||
LINES.put("TM2", new Style(Shape.RECT, Style.parseColor("#68c52f"), Style.WHITE));
|
||||
LINES.put("TM4", new Style(Shape.RECT, Style.parseColor("#cf1b22"), Style.WHITE));
|
||||
LINES.put("TM5", new Style(Shape.RECT, Style.parseColor("#bf8037"), Style.WHITE));
|
||||
LINES.put("TM6", new Style(Shape.RECT, Style.parseColor("#1e5ca2"), Style.WHITE));
|
||||
LINES.put("TM8", new Style(Shape.RECT, Style.parseColor("#f46717"), Style.WHITE));
|
||||
LINES.put("TM10", new Style(Shape.RECT, Style.parseColor("#108449"), Style.WHITE));
|
||||
LINES.put("TM13", new Style(Shape.RECT, Style.parseColor("#36ab94"), Style.WHITE));
|
||||
LINES.put("TM17", new Style(Shape.RECT, Style.parseColor("#a23f30"), Style.WHITE));
|
||||
|
||||
LINES.put("T12", new Style(Style.parseColor("#7d64b2"), Style.WHITE));
|
||||
LINES.put("T16", new Style(Style.parseColor("#1e5ca2"), Style.WHITE));
|
||||
LINES.put("T18", new Style(Style.parseColor("#f46717"), Style.WHITE));
|
||||
LINES.put("T21", new Style(Style.parseColor("#7d64b2"), Style.WHITE));
|
||||
LINES.put("T27", new Style(Style.parseColor("#a23f30"), Style.WHITE));
|
||||
LINES.put("T37", new Style(Style.parseColor("#a23f30"), Style.WHITE));
|
||||
LINES.put("T50", new Style(Style.parseColor("#36ab94"), Style.WHITE));
|
||||
LINES.put("T60", new Style(Style.parseColor("#108449"), Style.WHITE));
|
||||
LINES.put("T61", new Style(Style.parseColor("#108449"), Style.WHITE));
|
||||
LINES.put("T62", new Style(Style.parseColor("#125030"), Style.WHITE));
|
||||
LINES.put("T63", new Style(Style.parseColor("#36ab94"), Style.WHITE));
|
||||
LINES.put("T67", new Style(Style.parseColor("#108449"), Style.WHITE));
|
||||
LINES.put("T68", new Style(Style.parseColor("#108449"), Style.WHITE));
|
||||
LINES.put("T12", new Style(Shape.RECT, Style.parseColor("#7d64b2"), Style.WHITE));
|
||||
LINES.put("T16", new Style(Shape.RECT, Style.parseColor("#1e5ca2"), Style.WHITE));
|
||||
LINES.put("T18", new Style(Shape.RECT, Style.parseColor("#f46717"), Style.WHITE));
|
||||
LINES.put("T21", new Style(Shape.RECT, Style.parseColor("#7d64b2"), Style.WHITE));
|
||||
LINES.put("T27", new Style(Shape.RECT, Style.parseColor("#a23f30"), Style.WHITE));
|
||||
LINES.put("T37", new Style(Shape.RECT, Style.parseColor("#a23f30"), Style.WHITE));
|
||||
LINES.put("T50", new Style(Shape.RECT, Style.parseColor("#36ab94"), Style.WHITE));
|
||||
LINES.put("T60", new Style(Shape.RECT, Style.parseColor("#108449"), Style.WHITE));
|
||||
LINES.put("T61", new Style(Shape.RECT, Style.parseColor("#108449"), Style.WHITE));
|
||||
LINES.put("T62", new Style(Shape.RECT, Style.parseColor("#125030"), Style.WHITE));
|
||||
LINES.put("T63", new Style(Shape.RECT, Style.parseColor("#36ab94"), Style.WHITE));
|
||||
LINES.put("T67", new Style(Shape.RECT, Style.parseColor("#108449"), Style.WHITE));
|
||||
LINES.put("T68", new Style(Shape.RECT, Style.parseColor("#108449"), Style.WHITE));
|
||||
|
||||
LINES.put("FF1", new Style(Style.BLUE, Style.WHITE)); // Potsdam
|
||||
LINES.put("FF10", new Style(Style.BLUE, Style.WHITE));
|
||||
|
|
@ -991,51 +992,51 @@ public final class BvgProvider extends AbstractHafasProvider
|
|||
LINES.put("FF24", new Style(Style.BLUE, Style.WHITE));
|
||||
|
||||
// Regional lines Brandenburg:
|
||||
LINES.put("RRE1", new Style(Style.parseColor("#EE1C23"), Style.WHITE));
|
||||
LINES.put("RRE2", new Style(Style.parseColor("#FFD403"), Style.BLACK));
|
||||
LINES.put("RRE3", new Style(Style.parseColor("#F57921"), Style.WHITE));
|
||||
LINES.put("RRE4", new Style(Style.parseColor("#952D4F"), Style.WHITE));
|
||||
LINES.put("RRE5", new Style(Style.parseColor("#0072BC"), Style.WHITE));
|
||||
LINES.put("RRE6", new Style(Style.parseColor("#DB6EAB"), Style.WHITE));
|
||||
LINES.put("RRE7", new Style(Style.parseColor("#00854A"), Style.WHITE));
|
||||
LINES.put("RRE10", new Style(Style.parseColor("#A7653F"), Style.WHITE));
|
||||
LINES.put("RRE11", new Style(Style.parseColor("#059EDB"), Style.WHITE));
|
||||
LINES.put("RRE11", new Style(Style.parseColor("#EE1C23"), Style.WHITE));
|
||||
LINES.put("RRE15", new Style(Style.parseColor("#FFD403"), Style.BLACK));
|
||||
LINES.put("RRE18", new Style(Style.parseColor("#00A65E"), Style.WHITE));
|
||||
LINES.put("RRB10", new Style(Style.parseColor("#60BB46"), Style.WHITE));
|
||||
LINES.put("RRB12", new Style(Style.parseColor("#A3238E"), Style.WHITE));
|
||||
LINES.put("RRB13", new Style(Style.parseColor("#F68B1F"), Style.WHITE));
|
||||
LINES.put("RRB13", new Style(Style.parseColor("#00A65E"), Style.WHITE));
|
||||
LINES.put("RRB14", new Style(Style.parseColor("#A3238E"), Style.WHITE));
|
||||
LINES.put("RRB20", new Style(Style.parseColor("#00854A"), Style.WHITE));
|
||||
LINES.put("RRB21", new Style(Style.parseColor("#5E6DB3"), Style.WHITE));
|
||||
LINES.put("RRB22", new Style(Style.parseColor("#0087CB"), Style.WHITE));
|
||||
LINES.put("ROE25", new Style(Style.parseColor("#0087CB"), Style.WHITE));
|
||||
LINES.put("RNE26", new Style(Style.parseColor("#00A896"), Style.WHITE));
|
||||
LINES.put("RNE27", new Style(Style.parseColor("#EE1C23"), Style.WHITE));
|
||||
LINES.put("RRB30", new Style(Style.parseColor("#00A65E"), Style.WHITE));
|
||||
LINES.put("RRB31", new Style(Style.parseColor("#60BB46"), Style.WHITE));
|
||||
LINES.put("RMR33", new Style(Style.parseColor("#EE1C23"), Style.WHITE));
|
||||
LINES.put("ROE35", new Style(Style.parseColor("#5E6DB3"), Style.WHITE));
|
||||
LINES.put("ROE36", new Style(Style.parseColor("#A7653F"), Style.WHITE));
|
||||
LINES.put("RRB43", new Style(Style.parseColor("#5E6DB3"), Style.WHITE));
|
||||
LINES.put("RRB45", new Style(Style.parseColor("#FFD403"), Style.BLACK));
|
||||
LINES.put("ROE46", new Style(Style.parseColor("#DB6EAB"), Style.WHITE));
|
||||
LINES.put("RMR51", new Style(Style.parseColor("#DB6EAB"), Style.WHITE));
|
||||
LINES.put("RRB51", new Style(Style.parseColor("#DB6EAB"), Style.WHITE));
|
||||
LINES.put("RRB54", new Style(Style.parseColor("#FFD403"), Style.BLACK));
|
||||
LINES.put("RRB55", new Style(Style.parseColor("#F57921"), Style.WHITE));
|
||||
LINES.put("ROE60", new Style(Style.parseColor("#60BB46"), Style.WHITE));
|
||||
LINES.put("ROE63", new Style(Style.parseColor("#FFD403"), Style.BLACK));
|
||||
LINES.put("ROE65", new Style(Style.parseColor("#0072BC"), Style.WHITE));
|
||||
LINES.put("RRB66", new Style(Style.parseColor("#60BB46"), Style.WHITE));
|
||||
LINES.put("RPE70", new Style(Style.parseColor("#FFD403"), Style.BLACK));
|
||||
LINES.put("RPE73", new Style(Style.parseColor("#00A896"), Style.WHITE));
|
||||
LINES.put("RPE74", new Style(Style.parseColor("#0072BC"), Style.WHITE));
|
||||
LINES.put("T89", new Style(Style.parseColor("#EE1C23"), Style.WHITE));
|
||||
LINES.put("RRB91", new Style(Style.parseColor("#A7653F"), Style.WHITE));
|
||||
LINES.put("RRB93", new Style(Style.parseColor("#A7653F"), Style.WHITE));
|
||||
LINES.put("RRE1", new Style(Shape.RECT, Style.parseColor("#EE1C23"), Style.WHITE));
|
||||
LINES.put("RRE2", new Style(Shape.RECT, Style.parseColor("#FFD403"), Style.BLACK));
|
||||
LINES.put("RRE3", new Style(Shape.RECT, Style.parseColor("#F57921"), Style.WHITE));
|
||||
LINES.put("RRE4", new Style(Shape.RECT, Style.parseColor("#952D4F"), Style.WHITE));
|
||||
LINES.put("RRE5", new Style(Shape.RECT, Style.parseColor("#0072BC"), Style.WHITE));
|
||||
LINES.put("RRE6", new Style(Shape.RECT, Style.parseColor("#DB6EAB"), Style.WHITE));
|
||||
LINES.put("RRE7", new Style(Shape.RECT, Style.parseColor("#00854A"), Style.WHITE));
|
||||
LINES.put("RRE10", new Style(Shape.RECT, Style.parseColor("#A7653F"), Style.WHITE));
|
||||
LINES.put("RRE11", new Style(Shape.RECT, Style.parseColor("#059EDB"), Style.WHITE));
|
||||
LINES.put("RRE11", new Style(Shape.RECT, Style.parseColor("#EE1C23"), Style.WHITE));
|
||||
LINES.put("RRE15", new Style(Shape.RECT, Style.parseColor("#FFD403"), Style.BLACK));
|
||||
LINES.put("RRE18", new Style(Shape.RECT, Style.parseColor("#00A65E"), Style.WHITE));
|
||||
LINES.put("RRB10", new Style(Shape.RECT, Style.parseColor("#60BB46"), Style.WHITE));
|
||||
LINES.put("RRB12", new Style(Shape.RECT, Style.parseColor("#A3238E"), Style.WHITE));
|
||||
LINES.put("RRB13", new Style(Shape.RECT, Style.parseColor("#F68B1F"), Style.WHITE));
|
||||
LINES.put("RRB13", new Style(Shape.RECT, Style.parseColor("#00A65E"), Style.WHITE));
|
||||
LINES.put("RRB14", new Style(Shape.RECT, Style.parseColor("#A3238E"), Style.WHITE));
|
||||
LINES.put("RRB20", new Style(Shape.RECT, Style.parseColor("#00854A"), Style.WHITE));
|
||||
LINES.put("RRB21", new Style(Shape.RECT, Style.parseColor("#5E6DB3"), Style.WHITE));
|
||||
LINES.put("RRB22", new Style(Shape.RECT, Style.parseColor("#0087CB"), Style.WHITE));
|
||||
LINES.put("ROE25", new Style(Shape.RECT, Style.parseColor("#0087CB"), Style.WHITE));
|
||||
LINES.put("RNE26", new Style(Shape.RECT, Style.parseColor("#00A896"), Style.WHITE));
|
||||
LINES.put("RNE27", new Style(Shape.RECT, Style.parseColor("#EE1C23"), Style.WHITE));
|
||||
LINES.put("RRB30", new Style(Shape.RECT, Style.parseColor("#00A65E"), Style.WHITE));
|
||||
LINES.put("RRB31", new Style(Shape.RECT, Style.parseColor("#60BB46"), Style.WHITE));
|
||||
LINES.put("RMR33", new Style(Shape.RECT, Style.parseColor("#EE1C23"), Style.WHITE));
|
||||
LINES.put("ROE35", new Style(Shape.RECT, Style.parseColor("#5E6DB3"), Style.WHITE));
|
||||
LINES.put("ROE36", new Style(Shape.RECT, Style.parseColor("#A7653F"), Style.WHITE));
|
||||
LINES.put("RRB43", new Style(Shape.RECT, Style.parseColor("#5E6DB3"), Style.WHITE));
|
||||
LINES.put("RRB45", new Style(Shape.RECT, Style.parseColor("#FFD403"), Style.BLACK));
|
||||
LINES.put("ROE46", new Style(Shape.RECT, Style.parseColor("#DB6EAB"), Style.WHITE));
|
||||
LINES.put("RMR51", new Style(Shape.RECT, Style.parseColor("#DB6EAB"), Style.WHITE));
|
||||
LINES.put("RRB51", new Style(Shape.RECT, Style.parseColor("#DB6EAB"), Style.WHITE));
|
||||
LINES.put("RRB54", new Style(Shape.RECT, Style.parseColor("#FFD403"), Style.BLACK));
|
||||
LINES.put("RRB55", new Style(Shape.RECT, Style.parseColor("#F57921"), Style.WHITE));
|
||||
LINES.put("ROE60", new Style(Shape.RECT, Style.parseColor("#60BB46"), Style.WHITE));
|
||||
LINES.put("ROE63", new Style(Shape.RECT, Style.parseColor("#FFD403"), Style.BLACK));
|
||||
LINES.put("ROE65", new Style(Shape.RECT, Style.parseColor("#0072BC"), Style.WHITE));
|
||||
LINES.put("RRB66", new Style(Shape.RECT, Style.parseColor("#60BB46"), Style.WHITE));
|
||||
LINES.put("RPE70", new Style(Shape.RECT, Style.parseColor("#FFD403"), Style.BLACK));
|
||||
LINES.put("RPE73", new Style(Shape.RECT, Style.parseColor("#00A896"), Style.WHITE));
|
||||
LINES.put("RPE74", new Style(Shape.RECT, Style.parseColor("#0072BC"), Style.WHITE));
|
||||
LINES.put("T89", new Style(Shape.RECT, Style.parseColor("#EE1C23"), Style.WHITE));
|
||||
LINES.put("RRB91", new Style(Shape.RECT, Style.parseColor("#A7653F"), Style.WHITE));
|
||||
LINES.put("RRB93", new Style(Shape.RECT, Style.parseColor("#A7653F"), Style.WHITE));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ import java.util.Map;
|
|||
import de.schildbach.pte.dto.Location;
|
||||
import de.schildbach.pte.dto.LocationType;
|
||||
import de.schildbach.pte.dto.Style;
|
||||
import de.schildbach.pte.dto.Style.Shape;
|
||||
|
||||
/**
|
||||
* @author Andreas Schildbach
|
||||
|
|
@ -97,15 +98,15 @@ public class KvvProvider extends AbstractEfaProvider
|
|||
LINES.put("SS9", new Style(Style.parseColor("#fab49b"), Style.BLACK));
|
||||
|
||||
// Tram
|
||||
LINES.put("T1", new Style(Style.parseColor("#ed1c24"), Style.WHITE));
|
||||
LINES.put("T2", new Style(Style.parseColor("#0071bc"), Style.WHITE));
|
||||
LINES.put("T2E", new Style(Style.parseColor("#0071bc"), Style.WHITE));
|
||||
LINES.put("T3", new Style(Style.parseColor("#947139"), Style.WHITE));
|
||||
LINES.put("T4", new Style(Style.parseColor("#ffcb04"), Style.BLACK));
|
||||
LINES.put("T5", new Style(Style.parseColor("#00c0f3"), Style.WHITE));
|
||||
LINES.put("T6", new Style(Style.parseColor("#80c342"), Style.WHITE));
|
||||
LINES.put("T7", new Style(Style.parseColor("#58595b"), Style.WHITE));
|
||||
LINES.put("T8", new Style(Style.parseColor("#f7931d"), Style.BLACK));
|
||||
LINES.put("T1", new Style(Shape.RECT, Style.parseColor("#ed1c24"), Style.WHITE));
|
||||
LINES.put("T2", new Style(Shape.RECT, Style.parseColor("#0071bc"), Style.WHITE));
|
||||
LINES.put("T2E", new Style(Shape.RECT, Style.parseColor("#0071bc"), Style.WHITE));
|
||||
LINES.put("T3", new Style(Shape.RECT, Style.parseColor("#947139"), Style.WHITE));
|
||||
LINES.put("T4", new Style(Shape.RECT, Style.parseColor("#ffcb04"), Style.BLACK));
|
||||
LINES.put("T5", new Style(Shape.RECT, Style.parseColor("#00c0f3"), Style.WHITE));
|
||||
LINES.put("T6", new Style(Shape.RECT, Style.parseColor("#80c342"), Style.WHITE));
|
||||
LINES.put("T7", new Style(Shape.RECT, Style.parseColor("#58595b"), Style.WHITE));
|
||||
LINES.put("T8", new Style(Shape.RECT, Style.parseColor("#f7931d"), Style.BLACK));
|
||||
|
||||
// Nightliner
|
||||
LINES.put("BNL3", new Style(Style.parseColor("#947139"), Style.WHITE));
|
||||
|
|
@ -114,12 +115,12 @@ public class KvvProvider extends AbstractEfaProvider
|
|||
LINES.put("BNL6", new Style(Style.parseColor("#80c342"), Style.WHITE));
|
||||
|
||||
// Anruf-Linien-Taxi
|
||||
LINES.put("BALT6", new Style(Style.BLACK, Style.YELLOW));
|
||||
LINES.put("BALT11", new Style(Style.BLACK, Style.YELLOW));
|
||||
LINES.put("BALT12", new Style(Style.BLACK, Style.YELLOW));
|
||||
LINES.put("BALT13", new Style(Style.BLACK, Style.YELLOW));
|
||||
LINES.put("BALT14", new Style(Style.BLACK, Style.YELLOW));
|
||||
LINES.put("BALT16", new Style(Style.BLACK, Style.YELLOW));
|
||||
LINES.put("BALT6", new Style(Shape.RECT, Style.BLACK, Style.YELLOW));
|
||||
LINES.put("BALT11", new Style(Shape.RECT, Style.BLACK, Style.YELLOW));
|
||||
LINES.put("BALT12", new Style(Shape.RECT, Style.BLACK, Style.YELLOW));
|
||||
LINES.put("BALT13", new Style(Shape.RECT, Style.BLACK, Style.YELLOW));
|
||||
LINES.put("BALT14", new Style(Shape.RECT, Style.BLACK, Style.YELLOW));
|
||||
LINES.put("BALT16", new Style(Shape.RECT, Style.BLACK, Style.YELLOW));
|
||||
|
||||
// TODO Bus, but needs shape for disambiguation
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue