Skip to content

Commit

Permalink
Local networks was renamed to commuter
Browse files Browse the repository at this point in the history
Local networks was renamed to commuter
Added Spanish language
  • Loading branch information
bwr57 committed Aug 18, 2016
1 parent 52f1fbd commit 5a6e798
Show file tree
Hide file tree
Showing 14 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Text/en.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Network
Operator
Network level
City transport
Local
Commuter
Regional
Long distance
High speed
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified build/data/en.lang
Binary file not shown.
Binary file added build/data/es.lang
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified data/en.lang
Binary file not shown.
Binary file added data/es.lang
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ public void parseTags(StopArea stopArea, OsmPrimitive member)
stopArea.network = getTagValue(member, OSMTags.NETWORK_TAG);
if(stopArea.service == null)
stopArea.service = getTagValue(member, OSMTags.SERVICE_TAG);
if(OSMTags.LOCAL_NETWORK_TAG_VALUE.equals(stopArea.service))
stopArea.service = OSMTags.COMMUTER_NETWORK_TAG_VALUE;
if(compareTag(member, OSMTags.BUS_TAG, OSMTags.YES_TAG_VALUE))
stopArea.isBus = true;
if(compareTag(member, OSMTags.TROLLEYBUS_TAG, OSMTags.YES_TAG_VALUE))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ public class CustomizePublicTransportStopDialog implements ActionListener, ItemL
private static final String STOP_CUSTOMIZING_DIALOG_CAPTION = "Stop customizing";
public static final String LONG_DISTANCE_NETWORK_CAPTION = "Long distance";
public static final String REGIONAL_NETWORK_CAPTION = "Regional";
public static final String LOCAL_NETWORK_CAPTION = "Local";
public static final String COMMUTER_NETWORK_CAPTION = "Commuter";
public static final String CITY_NETWORK_CAPTION = "City transport";
public static final String HIGH_SPEED_NETWORK_CAPTION = "High speed";

private String[] serviceCaptionStrings = { CITY_NETWORK_CAPTION, LOCAL_NETWORK_CAPTION, REGIONAL_NETWORK_CAPTION, LONG_DISTANCE_NETWORK_CAPTION, HIGH_SPEED_NETWORK_CAPTION };
private String[] serviceStrings = { OSMTags.CITY_NETWORK_TAG_VALUE, OSMTags.LOCAL_NETWORK_TAG_VALUE,
private String[] serviceCaptionStrings = { CITY_NETWORK_CAPTION, COMMUTER_NETWORK_CAPTION, REGIONAL_NETWORK_CAPTION, LONG_DISTANCE_NETWORK_CAPTION, HIGH_SPEED_NETWORK_CAPTION };
private String[] serviceStrings = { OSMTags.CITY_NETWORK_TAG_VALUE, OSMTags.COMMUTER_NETWORK_TAG_VALUE,
OSMTags.REGIONAL_NETWORK_TAG_VALUE, OSMTags.LONG_DISTANCE_NETWORK_TAG_VALUE, OSMTags.HIGH_SPEED_NETWORK_TAG_VALUE };

private JDialog jDialog = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ public class OSMTags
public static final String SERVICE_TAG = "service";

public static final String CITY_NETWORK_TAG_VALUE = "city";
public static final String COMMUTER_NETWORK_TAG_VALUE = "commuter";
public static final String LOCAL_NETWORK_TAG_VALUE = "local";
public static final String REGIONAL_NETWORK_TAG_VALUE = "regional";
public static final String LONG_DISTANCE_NETWORK_TAG_VALUE = "long_distance";
Expand Down

0 comments on commit 5a6e798

Please sign in to comment.