diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/TransportStopController_BACKUP_49229.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/TransportStopController_BACKUP_49229.java deleted file mode 100644 index a332712309..0000000000 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/TransportStopController_BACKUP_49229.java +++ /dev/null @@ -1,167 +0,0 @@ -package net.osmand.plus.mapcontextmenu.controllers; - -import net.osmand.data.LatLon; -import net.osmand.data.PointDescription; -import net.osmand.data.TransportRoute; -import net.osmand.data.TransportStop; -import net.osmand.plus.OsmandApplication; -import net.osmand.plus.R; -import net.osmand.plus.activities.MapActivity; -import net.osmand.plus.mapcontextmenu.MenuBuilder; -import net.osmand.plus.mapcontextmenu.MenuController; -import net.osmand.plus.resources.TransportIndexRepository; -import net.osmand.util.Algorithms; - -import java.util.ArrayList; -import java.util.List; - -public class TransportStopController extends MenuController { - - public enum TransportStopType { - BUS(R.drawable.mx_route_bus_ref, R.drawable.mx_route_bus_ref), - FERRY(R.drawable.mx_route_ferry_ref, R.drawable.mx_route_ferry_ref), - FUNICULAR(R.drawable.mx_route_funicular_ref, R.drawable.mx_route_funicular_ref), - LIGHT_RAIL(R.drawable.mx_route_light_rail_ref, R.drawable.mx_route_light_rail_ref), - MONORAIL(R.drawable.mx_route_monorail_ref, R.drawable.mx_route_monorail_ref), - RAILWAY(R.drawable.mx_route_railway_ref, R.drawable.mx_route_railway_ref), - SHARE_TAXI(R.drawable.mx_route_share_taxi_ref, R.drawable.mx_route_share_taxi_ref), - TRAIN(R.drawable.mx_route_train_ref, R.drawable.mx_route_train_ref), - TRAM(R.drawable.mx_route_tram_ref, R.drawable.mx_railway_tram_stop), - TROLLEYBUS(R.drawable.mx_route_trolleybus_ref, R.drawable.mx_route_trolleybus_ref), - SUBWAY(R.drawable.mx_subway_station, R.drawable.mx_subway_station); - - final int resId; - final int topResId; - - TransportStopType(int resId, int topResId) { - this.resId = resId; - this.topResId = topResId; - } - - public int getResourceId() { - return resId; - } - - public int getTopResourceId() { - return topResId; - } - - public boolean isTopType() { - return this == TRAM || this == SUBWAY; - } - - public static TransportStopType findType(String typeName) { - String tName = typeName.toUpperCase(); - for (TransportStopType t : values()) { - if (t.name().equals(tName)) { - return t; - } - } - return null; - } - - } - - private TransportStop transportStop; - private List routes = new ArrayList<>(); - private TransportStopType topType; - - public TransportStopController(OsmandApplication app, MapActivity mapActivity, - PointDescription pointDescription, TransportStop transportStop) { - super(new MenuBuilder(app), pointDescription, mapActivity); - this.transportStop = transportStop; - processTransportStop(); - } - - @Override - protected void setObject(Object object) { - if (object instanceof TransportStop) { - this.transportStop = (TransportStop) object; - processTransportStop(); - } - } - - @Override - protected int getSupportedMenuStatesPortrait() { - return MenuState.HEADER_ONLY | MenuState.HALF_SCREEN | MenuState.FULL_SCREEN; - } - - @Override - public int getLeftIconId() { - if (topType == null) { - return R.drawable.mx_public_transport; - } else { - return topType.getTopResourceId(); - } - } - - @Override - public boolean needStreetName() { - return Algorithms.isEmpty(getNameStr()); - } - - @Override - public boolean displayDistanceDirection() { - return true; - } - - @Override - public String getTypeStr() { - return getPointDescription().getTypeName(); - } - - @Override - public void addPlainMenuItems(String typeStr, PointDescription pointDescription, LatLon latLon) { -<<<<<<< HEAD - for (List l : routes) { - for (TransportStopRoute r : l) { - if (r.type == null) { - addPlainMenuItem(R.drawable.ic_action_polygom_dark, r.desc, false, false, null); - } else { - addPlainMenuItem(r.type.getResourceId(), r.desc, false, false, null); - } -======= - for (TransportStopRoute r : routes) { - if (r.type == null) { - addPlainMenuItem(R.drawable.ic_action_polygom_dark, r.desc, false, false); - } else { - addPlainMenuItem(r.type.getResourceId(), r.desc, false, false); ->>>>>>> 0855c6c36d1d10760efecc2dcc04c3840362ca87 - } - } - super.addPlainMenuItems(typeStr, pointDescription, latLon); - } - - private void processTransportStop() { - routes.clear(); - List reps = getMapActivity().getMyApplication() - .getResourceManager().searchTransportRepositories(transportStop.getLocation().getLatitude(), - transportStop.getLocation().getLongitude()); - - boolean useEnglishNames = getMapActivity().getMyApplication().getSettings().usingEnglishNames(); - - for (TransportIndexRepository t : reps) { - if (t.acceptTransportStop(transportStop)) { - List rts = t.getRouteForStop(transportStop); - if (rts != null) { - for (TransportRoute rs : rts) { - TransportStopType type = TransportStopType.findType(rs.getType()); - TransportStopRoute r = new TransportStopRoute(); - if (topType == null && type != null && type.isTopType()) { - topType = type; - } - r.desc = rs.getRef() + " " + (useEnglishNames ? rs.getName() : rs.getEnName(true)); - r.route = rs; - this.routes.add(r); - } - } - } - } - } - - private class TransportStopRoute { - public TransportStopType type; - public String desc; - public TransportRoute route; - } -} diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/TransportStopController_BASE_49229.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/TransportStopController_BASE_49229.java deleted file mode 100644 index 731cde125c..0000000000 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/TransportStopController_BASE_49229.java +++ /dev/null @@ -1,172 +0,0 @@ -package net.osmand.plus.mapcontextmenu.controllers; - -import net.osmand.data.LatLon; -import net.osmand.data.PointDescription; -import net.osmand.data.TransportStop; -import net.osmand.plus.OsmandApplication; -import net.osmand.plus.R; -import net.osmand.plus.activities.MapActivity; -import net.osmand.plus.mapcontextmenu.MenuBuilder; -import net.osmand.plus.mapcontextmenu.MenuController; -import net.osmand.plus.resources.TransportIndexRepository; -import net.osmand.util.Algorithms; - -import java.util.ArrayList; -import java.util.List; - -public class TransportStopController extends MenuController { - - public enum TransportStopType { - BUS(R.drawable.mx_route_bus_ref, R.drawable.mx_route_bus_ref), - FERRY(R.drawable.mx_route_ferry_ref, R.drawable.mx_route_ferry_ref), - FUNICULAR(R.drawable.mx_route_funicular_ref, R.drawable.mx_route_funicular_ref), - LIGHT_RAIL(R.drawable.mx_route_light_rail_ref, R.drawable.mx_route_light_rail_ref), - MONORAIL(R.drawable.mx_route_monorail_ref, R.drawable.mx_route_monorail_ref), - RAILWAY(R.drawable.mx_route_railway_ref, R.drawable.mx_route_railway_ref), - SHARE_TAXI(R.drawable.mx_route_share_taxi_ref, R.drawable.mx_route_share_taxi_ref), - TRAIN(R.drawable.mx_route_train_ref, R.drawable.mx_route_train_ref), - TRAM(R.drawable.mx_route_tram_ref, R.drawable.mx_railway_tram_stop), - TROLLEYBUS(R.drawable.mx_route_trolleybus_ref, R.drawable.mx_route_trolleybus_ref), - SUBWAY(R.drawable.mx_subway_station, R.drawable.mx_subway_station); - - final int resId; - final int topResId; - - TransportStopType(int resId, int topResId) { - this.resId = resId; - this.topResId = topResId; - } - - public int getResourceId() { - return resId; - } - - public int getTopResourceId() { - return topResId; - } - - public boolean isTopType() { - return this == TRAM || this == SUBWAY; - } - - public static TransportStopType findType(String typeName) { - String tName = typeName.toUpperCase(); - for (TransportStopType t : values()) { - if (t.name().equals(tName)) { - return t; - } - } - return null; - } - - } - - private TransportStop transportStop; - private List> routes = new ArrayList<>(); - private TransportStopType topType; - - public TransportStopController(OsmandApplication app, MapActivity mapActivity, - PointDescription pointDescription, TransportStop transportStop) { - super(new MenuBuilder(app), pointDescription, mapActivity); - this.transportStop = transportStop; - processTransportStop(); - } - - @Override - protected void setObject(Object object) { - if (object instanceof TransportStop) { - this.transportStop = (TransportStop) object; - processTransportStop(); - } - } - - @Override - protected int getSupportedMenuStatesPortrait() { - return MenuState.HEADER_ONLY | MenuState.HALF_SCREEN | MenuState.FULL_SCREEN; - } - - @Override - public int getLeftIconId() { - if (topType == null) { - return R.drawable.mx_public_transport; - } else { - return topType.getTopResourceId(); - } - } - - @Override - public boolean needStreetName() { - return Algorithms.isEmpty(getNameStr()); - } - - @Override - public boolean displayDistanceDirection() { - return true; - } - - @Override - public String getTypeStr() { - return getPointDescription().getTypeName(); - } - - @Override - public void addPlainMenuItems(String typeStr, PointDescription pointDescription, LatLon latLon) { - for (List l : routes) { - for (TransportStopRoute r : l) { - if (r.type == null) { - addPlainMenuItem(R.drawable.ic_action_polygom_dark, r.desc, false, false); - } else { - addPlainMenuItem(r.type.getResourceId(), r.desc, false, false); - } - } - } - super.addPlainMenuItems(typeStr, pointDescription, latLon); - } - - private void processTransportStop() { - routes.clear(); - List reps = getMapActivity().getMyApplication() - .getResourceManager().searchTransportRepositories(transportStop.getLocation().getLatitude(), - transportStop.getLocation().getLongitude()); - - boolean useEnglishNames = getMapActivity().getMyApplication().getSettings().usingEnglishNames(); - - for (TransportIndexRepository t : reps) { - if (t.acceptTransportStop(transportStop)) { - List l; - if (useEnglishNames) { - l = t.getRouteDescriptionsForStop(transportStop, "{1} {0} - {3}"); - } else { - l = t.getRouteDescriptionsForStop(transportStop, "{1} {0} - {2}"); - } - if (l != null) { - List routeList = new ArrayList<>(); - for (String s : l) { - int firstSpaceIndex = s.indexOf(' '); - if (firstSpaceIndex != -1) { - String typeName = s.substring(0, firstSpaceIndex); - TransportStopType type = TransportStopType.findType(typeName); - TransportStopRoute r = new TransportStopRoute(); - r.type = type; - if (type == null) { - r.desc = s; - } else { - r.desc = s.substring(firstSpaceIndex + 1); - } - routeList.add(r); - if (topType == null && type != null && type.isTopType()) { - topType = type; - } - } - } - routes.add(routeList); - } - } - } - } - - private class TransportStopRoute { - public TransportStopType type; - public String desc; - } -} diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/TransportStopController_LOCAL_49229.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/TransportStopController_LOCAL_49229.java deleted file mode 100644 index a4f80da7fa..0000000000 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/TransportStopController_LOCAL_49229.java +++ /dev/null @@ -1,172 +0,0 @@ -package net.osmand.plus.mapcontextmenu.controllers; - -import net.osmand.data.LatLon; -import net.osmand.data.PointDescription; -import net.osmand.data.TransportStop; -import net.osmand.plus.OsmandApplication; -import net.osmand.plus.R; -import net.osmand.plus.activities.MapActivity; -import net.osmand.plus.mapcontextmenu.MenuBuilder; -import net.osmand.plus.mapcontextmenu.MenuController; -import net.osmand.plus.resources.TransportIndexRepository; -import net.osmand.util.Algorithms; - -import java.util.ArrayList; -import java.util.List; - -public class TransportStopController extends MenuController { - - public enum TransportStopType { - BUS(R.drawable.mx_route_bus_ref, R.drawable.mx_route_bus_ref), - FERRY(R.drawable.mx_route_ferry_ref, R.drawable.mx_route_ferry_ref), - FUNICULAR(R.drawable.mx_route_funicular_ref, R.drawable.mx_route_funicular_ref), - LIGHT_RAIL(R.drawable.mx_route_light_rail_ref, R.drawable.mx_route_light_rail_ref), - MONORAIL(R.drawable.mx_route_monorail_ref, R.drawable.mx_route_monorail_ref), - RAILWAY(R.drawable.mx_route_railway_ref, R.drawable.mx_route_railway_ref), - SHARE_TAXI(R.drawable.mx_route_share_taxi_ref, R.drawable.mx_route_share_taxi_ref), - TRAIN(R.drawable.mx_route_train_ref, R.drawable.mx_route_train_ref), - TRAM(R.drawable.mx_route_tram_ref, R.drawable.mx_railway_tram_stop), - TROLLEYBUS(R.drawable.mx_route_trolleybus_ref, R.drawable.mx_route_trolleybus_ref), - SUBWAY(R.drawable.mx_subway_station, R.drawable.mx_subway_station); - - final int resId; - final int topResId; - - TransportStopType(int resId, int topResId) { - this.resId = resId; - this.topResId = topResId; - } - - public int getResourceId() { - return resId; - } - - public int getTopResourceId() { - return topResId; - } - - public boolean isTopType() { - return this == TRAM || this == SUBWAY; - } - - public static TransportStopType findType(String typeName) { - String tName = typeName.toUpperCase(); - for (TransportStopType t : values()) { - if (t.name().equals(tName)) { - return t; - } - } - return null; - } - - } - - private TransportStop transportStop; - private List> routes = new ArrayList<>(); - private TransportStopType topType; - - public TransportStopController(OsmandApplication app, MapActivity mapActivity, - PointDescription pointDescription, TransportStop transportStop) { - super(new MenuBuilder(app), pointDescription, mapActivity); - this.transportStop = transportStop; - processTransportStop(); - } - - @Override - protected void setObject(Object object) { - if (object instanceof TransportStop) { - this.transportStop = (TransportStop) object; - processTransportStop(); - } - } - - @Override - protected int getSupportedMenuStatesPortrait() { - return MenuState.HEADER_ONLY | MenuState.HALF_SCREEN | MenuState.FULL_SCREEN; - } - - @Override - public int getLeftIconId() { - if (topType == null) { - return R.drawable.mx_public_transport; - } else { - return topType.getTopResourceId(); - } - } - - @Override - public boolean needStreetName() { - return Algorithms.isEmpty(getNameStr()); - } - - @Override - public boolean displayDistanceDirection() { - return true; - } - - @Override - public String getTypeStr() { - return getPointDescription().getTypeName(); - } - - @Override - public void addPlainMenuItems(String typeStr, PointDescription pointDescription, LatLon latLon) { - for (List l : routes) { - for (TransportStopRoute r : l) { - if (r.type == null) { - addPlainMenuItem(R.drawable.ic_action_polygom_dark, r.desc, false, false, null); - } else { - addPlainMenuItem(r.type.getResourceId(), r.desc, false, false, null); - } - } - } - super.addPlainMenuItems(typeStr, pointDescription, latLon); - } - - private void processTransportStop() { - routes.clear(); - List reps = getMapActivity().getMyApplication() - .getResourceManager().searchTransportRepositories(transportStop.getLocation().getLatitude(), - transportStop.getLocation().getLongitude()); - - boolean useEnglishNames = getMapActivity().getMyApplication().getSettings().usingEnglishNames(); - - for (TransportIndexRepository t : reps) { - if (t.acceptTransportStop(transportStop)) { - List l; - if (useEnglishNames) { - l = t.getRouteDescriptionsForStop(transportStop, "{1} {0} - {3}"); - } else { - l = t.getRouteDescriptionsForStop(transportStop, "{1} {0} - {2}"); - } - if (l != null) { - List routeList = new ArrayList<>(); - for (String s : l) { - int firstSpaceIndex = s.indexOf(' '); - if (firstSpaceIndex != -1) { - String typeName = s.substring(0, firstSpaceIndex); - TransportStopType type = TransportStopType.findType(typeName); - TransportStopRoute r = new TransportStopRoute(); - r.type = type; - if (type == null) { - r.desc = s; - } else { - r.desc = s.substring(firstSpaceIndex + 1); - } - routeList.add(r); - if (topType == null && type != null && type.isTopType()) { - topType = type; - } - } - } - routes.add(routeList); - } - } - } - } - - private class TransportStopRoute { - public TransportStopType type; - public String desc; - } -} diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/TransportStopController_REMOTE_49229.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/TransportStopController_REMOTE_49229.java deleted file mode 100644 index f79287d248..0000000000 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/TransportStopController_REMOTE_49229.java +++ /dev/null @@ -1,157 +0,0 @@ -package net.osmand.plus.mapcontextmenu.controllers; - -import net.osmand.data.LatLon; -import net.osmand.data.PointDescription; -import net.osmand.data.TransportRoute; -import net.osmand.data.TransportStop; -import net.osmand.plus.OsmandApplication; -import net.osmand.plus.R; -import net.osmand.plus.activities.MapActivity; -import net.osmand.plus.mapcontextmenu.MenuBuilder; -import net.osmand.plus.mapcontextmenu.MenuController; -import net.osmand.plus.resources.TransportIndexRepository; -import net.osmand.util.Algorithms; - -import java.util.ArrayList; -import java.util.List; - -public class TransportStopController extends MenuController { - - public enum TransportStopType { - BUS(R.drawable.mx_route_bus_ref, R.drawable.mx_route_bus_ref), - FERRY(R.drawable.mx_route_ferry_ref, R.drawable.mx_route_ferry_ref), - FUNICULAR(R.drawable.mx_route_funicular_ref, R.drawable.mx_route_funicular_ref), - LIGHT_RAIL(R.drawable.mx_route_light_rail_ref, R.drawable.mx_route_light_rail_ref), - MONORAIL(R.drawable.mx_route_monorail_ref, R.drawable.mx_route_monorail_ref), - RAILWAY(R.drawable.mx_route_railway_ref, R.drawable.mx_route_railway_ref), - SHARE_TAXI(R.drawable.mx_route_share_taxi_ref, R.drawable.mx_route_share_taxi_ref), - TRAIN(R.drawable.mx_route_train_ref, R.drawable.mx_route_train_ref), - TRAM(R.drawable.mx_route_tram_ref, R.drawable.mx_railway_tram_stop), - TROLLEYBUS(R.drawable.mx_route_trolleybus_ref, R.drawable.mx_route_trolleybus_ref), - SUBWAY(R.drawable.mx_subway_station, R.drawable.mx_subway_station); - - final int resId; - final int topResId; - - TransportStopType(int resId, int topResId) { - this.resId = resId; - this.topResId = topResId; - } - - public int getResourceId() { - return resId; - } - - public int getTopResourceId() { - return topResId; - } - - public boolean isTopType() { - return this == TRAM || this == SUBWAY; - } - - public static TransportStopType findType(String typeName) { - String tName = typeName.toUpperCase(); - for (TransportStopType t : values()) { - if (t.name().equals(tName)) { - return t; - } - } - return null; - } - - } - - private TransportStop transportStop; - private List routes = new ArrayList<>(); - private TransportStopType topType; - - public TransportStopController(OsmandApplication app, MapActivity mapActivity, - PointDescription pointDescription, TransportStop transportStop) { - super(new MenuBuilder(app), pointDescription, mapActivity); - this.transportStop = transportStop; - processTransportStop(); - } - - @Override - protected void setObject(Object object) { - if (object instanceof TransportStop) { - this.transportStop = (TransportStop) object; - processTransportStop(); - } - } - - @Override - protected int getSupportedMenuStatesPortrait() { - return MenuState.HEADER_ONLY | MenuState.HALF_SCREEN | MenuState.FULL_SCREEN; - } - - @Override - public int getLeftIconId() { - if (topType == null) { - return R.drawable.mx_public_transport; - } else { - return topType.getTopResourceId(); - } - } - - @Override - public boolean needStreetName() { - return Algorithms.isEmpty(getNameStr()); - } - - @Override - public boolean displayDistanceDirection() { - return true; - } - - @Override - public String getTypeStr() { - return getPointDescription().getTypeName(); - } - - @Override - public void addPlainMenuItems(String typeStr, PointDescription pointDescription, LatLon latLon) { - for (TransportStopRoute r : routes) { - if (r.type == null) { - addPlainMenuItem(R.drawable.ic_action_polygom_dark, r.desc, false, false); - } else { - addPlainMenuItem(r.type.getResourceId(), r.desc, false, false); - } - } - super.addPlainMenuItems(typeStr, pointDescription, latLon); - } - - private void processTransportStop() { - routes.clear(); - List reps = getMapActivity().getMyApplication() - .getResourceManager().searchTransportRepositories(transportStop.getLocation().getLatitude(), - transportStop.getLocation().getLongitude()); - - boolean useEnglishNames = getMapActivity().getMyApplication().getSettings().usingEnglishNames(); - - for (TransportIndexRepository t : reps) { - if (t.acceptTransportStop(transportStop)) { - List rts = t.getRouteForStop(transportStop); - if (rts != null) { - for (TransportRoute rs : rts) { - TransportStopType type = TransportStopType.findType(rs.getType()); - TransportStopRoute r = new TransportStopRoute(); - if (topType == null && type != null && type.isTopType()) { - topType = type; - } - r.desc = rs.getRef() + " " + (useEnglishNames ? rs.getName() : rs.getEnName(true)); - r.route = rs; - this.routes.add(r); - } - } - } - } - } - - private class TransportStopRoute { - public TransportStopType type; - public String desc; - public TransportRoute route; - } -}