diff --git a/OsmAnd/res/drawable-hdpi/list_warnings_pedestrian_us.png b/OsmAnd/res/drawable-hdpi/list_warnings_pedestrian_us.png index d629470200..6ee52e5cf7 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_warnings_pedestrian_us.png and b/OsmAnd/res/drawable-hdpi/list_warnings_pedestrian_us.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_warnings_railways_us.png b/OsmAnd/res/drawable-hdpi/list_warnings_railways_us.png index cb5b90243e..8d791ad509 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_warnings_railways_us.png and b/OsmAnd/res/drawable-hdpi/list_warnings_railways_us.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_warnings_traffic_calming_us.png b/OsmAnd/res/drawable-hdpi/list_warnings_traffic_calming_us.png new file mode 100644 index 0000000000..40666af09f Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/list_warnings_traffic_calming_us.png differ diff --git a/OsmAnd/res/drawable-large/list_warnings_pedestrian_us.png b/OsmAnd/res/drawable-large/list_warnings_pedestrian_us.png index d629470200..6ee52e5cf7 100644 Binary files a/OsmAnd/res/drawable-large/list_warnings_pedestrian_us.png and b/OsmAnd/res/drawable-large/list_warnings_pedestrian_us.png differ diff --git a/OsmAnd/res/drawable-large/list_warnings_railways_us.png b/OsmAnd/res/drawable-large/list_warnings_railways_us.png index cb5b90243e..8d791ad509 100644 Binary files a/OsmAnd/res/drawable-large/list_warnings_railways_us.png and b/OsmAnd/res/drawable-large/list_warnings_railways_us.png differ diff --git a/OsmAnd/res/drawable-large/list_warnings_traffic_calming_us.png b/OsmAnd/res/drawable-large/list_warnings_traffic_calming_us.png new file mode 100644 index 0000000000..40666af09f Binary files /dev/null and b/OsmAnd/res/drawable-large/list_warnings_traffic_calming_us.png differ diff --git a/OsmAnd/res/drawable-large/warnings_pedestrian_us.png b/OsmAnd/res/drawable-large/warnings_pedestrian_us.png index 91568bdcce..1ce587ac61 100644 Binary files a/OsmAnd/res/drawable-large/warnings_pedestrian_us.png and b/OsmAnd/res/drawable-large/warnings_pedestrian_us.png differ diff --git a/OsmAnd/res/drawable-large/warnings_railways_us.png b/OsmAnd/res/drawable-large/warnings_railways_us.png index ec8bde7e52..322f62d826 100644 Binary files a/OsmAnd/res/drawable-large/warnings_railways_us.png and b/OsmAnd/res/drawable-large/warnings_railways_us.png differ diff --git a/OsmAnd/res/drawable-large/warnings_traffic_calming_us.png b/OsmAnd/res/drawable-large/warnings_traffic_calming_us.png new file mode 100644 index 0000000000..74c7019bce Binary files /dev/null and b/OsmAnd/res/drawable-large/warnings_traffic_calming_us.png differ diff --git a/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java b/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java index 9b4b17e169..0e7d21cd83 100644 --- a/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java +++ b/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java @@ -682,15 +682,27 @@ public class WaypointHelper { } else if(((AlarmInfo) point).getType().toString()="BORDER_CONTROL") { return uiCtx.getResources().getDrawable(R.drawable.mx_barrier_border_control); } else if(((AlarmInfo) point).getType().toString()="RAILWAY") { - return uiCtx.getResources().getDrawable(R.drawable.list_warnings_railways); + if(app.getSettings.DRIVING_REGION.get().americanSigns){ + return uiCtx.getResources().getDrawable(R.drawable.list_warnings_railways_us); + } else { + return uiCtx.getResources().getDrawable(R.drawable.list_warnings_railways); + } } else if(((AlarmInfo) point).getType().toString()="TRAFFIC_CALMING") { - return uiCtx.getResources().getDrawable(R.drawable.list_traffic_calming); + if(app.getSettings.DRIVING_REGION.get().americanSigns){ + return uiCtx.getResources().getDrawable(R.drawable.list_traffic_calming_us); + } else { + return uiCtx.getResources().getDrawable(R.drawable.list_traffic_calming); + } } else if(((AlarmInfo) point).getType().toString()="TOLL_BOOTH") { return uiCtx.getResources().getDrawable(R.drawable.mx_barrier_toll_booth); } else if(((AlarmInfo) point).getType().toString()="STOP") { return uiCtx.getResources().getDrawable(R.drawable.list_stop); } else if(((AlarmInfo) point).getType().toString()="PEDESTRIAN") { - return uiCtx.getResources().getDrawable(R.drawable.list_warnings_pedestrian); + if(app.getSettings.DRIVING_REGION.get().americanSigns){ + return uiCtx.getResources().getDrawable(R.drawable.list_warnings_pedestrian_us); + } else { + return uiCtx.getResources().getDrawable(R.drawable.list_warnings_pedestrian); + } } else { return 0; } @@ -726,15 +738,27 @@ public class WaypointHelper { } else if(((AlarmInfo) point).getType().toString()="BORDER_CONTROL") { return uiCtx.getResources().getDrawable(R.drawable.mx_barrier_border_control); } else if(((AlarmInfo) point).getType().toString()="RAILWAY") { - return uiCtx.getResources().getDrawable(R.drawable.list_warnings_railways); + if(app.getSettings.DRIVING_REGION.get().americanSigns){ + return uiCtx.getResources().getDrawable(R.drawable.list_warnings_railways_us); + } else { + return uiCtx.getResources().getDrawable(R.drawable.list_warnings_railways); + } } else if(((AlarmInfo) point).getType().toString()="TRAFFIC_CALMING") { - return uiCtx.getResources().getDrawable(R.drawable.list_traffic_calming); + if(app.getSettings.DRIVING_REGION.get().americanSigns){ + return uiCtx.getResources().getDrawable(R.drawable.list_traffic_calming_us); + } else { + return uiCtx.getResources().getDrawable(R.drawable.list_traffic_calming); + } } else if(((AlarmInfo) point).getType().toString()="TOLL_BOOTH") { return uiCtx.getResources().getDrawable(R.drawable.mx_barrier_toll_booth); } else if(((AlarmInfo) point).getType().toString()="STOP") { return uiCtx.getResources().getDrawable(R.drawable.list_stop); } else if(((AlarmInfo) point).getType().toString()="PEDESTRIAN") { - return uiCtx.getResources().getDrawable(R.drawable.list_warnings_pedestrian); + if(app.getSettings.DRIVING_REGION.get().americanSigns){ + return uiCtx.getResources().getDrawable(R.drawable.list_warnings_pedestrian_us); + } else { + return uiCtx.getResources().getDrawable(R.drawable.list_warnings_pedestrian); + } } else { return null; }