diff --git a/OsmAnd-java/src/net/osmand/osm/AbstractPoiType.java b/OsmAnd-java/src/net/osmand/osm/AbstractPoiType.java index 6bf4160189..3e026f54e8 100644 --- a/OsmAnd-java/src/net/osmand/osm/AbstractPoiType.java +++ b/OsmAnd-java/src/net/osmand/osm/AbstractPoiType.java @@ -21,6 +21,11 @@ public abstract class AbstractPoiType { return keyName; } + public String getIconKeyName() { + return keyName.replace(':', '_'); + } + + public String getTranslation() { return registry.getTranslation(this); } diff --git a/OsmAnd-java/src/net/osmand/router/BinaryRoutePlanner.java b/OsmAnd-java/src/net/osmand/router/BinaryRoutePlanner.java index 0efc6b1cde..881bf33df0 100644 --- a/OsmAnd-java/src/net/osmand/router/BinaryRoutePlanner.java +++ b/OsmAnd-java/src/net/osmand/router/BinaryRoutePlanner.java @@ -101,8 +101,8 @@ public class BinaryRoutePlanner { if(TRACE_ROUTING){ printRoad(">", segment, !forwardSearch); } - if(segment.getParentRoute() != null) - System.out.println(segment.getRoad().getId() + " - " + segment.getParentRoute().getRoad().getId()); +// if(segment.getParentRoute() != null) +// System.out.println(segment.getRoad().getId() + " - " + segment.getParentRoute().getRoad().getId()); if(segment instanceof FinalRouteSegment) { if(RoutingContext.SHOW_GC_SIZE){ log.warn("Estimated overhead " + (ctx.memoryOverhead / (1<<20))+ " mb"); diff --git a/OsmAnd/res/layout-land/map_hud_top.xml b/OsmAnd/res/layout-land/map_hud_top.xml index 3f773daaac..417d0716c9 100644 --- a/OsmAnd/res/layout-land/map_hud_top.xml +++ b/OsmAnd/res/layout-land/map_hud_top.xml @@ -112,11 +112,38 @@ + + - + + + + + + + + + - - - - - - - @@ -211,7 +214,7 @@ android:layout_width="@dimen/map_small_button_size" android:layout_height="@dimen/map_small_button_size" android:layout_gravity="top|center_horizontal" - android:background="@drawable/btn_inset_circle" + android:background="@drawable/btn_inset_circle_trans" android:src="@drawable/ic_action_test_light" /> diff --git a/OsmAnd/res/layout/map_hud_top.xml b/OsmAnd/res/layout/map_hud_top.xml index 7b9da38b51..e6f6c42e90 100644 --- a/OsmAnd/res/layout/map_hud_top.xml +++ b/OsmAnd/res/layout/map_hud_top.xml @@ -127,7 +127,7 @@ android:id="@+id/map_layers_button" android:layout_width="@dimen/map_small_button_size" android:layout_height="@dimen/map_small_button_size" - android:background="@drawable/btn_inset_circle" + android:background="@drawable/btn_inset_circle_trans" android:src="@drawable/ic_action_test_light" /> - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java index b35862058b..a7f3c3a456 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java @@ -775,8 +775,8 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa direction.setImageDrawable(draw); PoiType st = amenity.getType().getPoiTypeByKeyName(amenity.getSubType()); if (st != null) { - if (RenderingIcons.containsBigIcon(st.getKeyName())) { - icon.setImageResource(RenderingIcons.getBigIconResourceId(st.getKeyName())); + if (RenderingIcons.containsBigIcon(st.getIconKeyName())) { + icon.setImageResource(RenderingIcons.getBigIconResourceId(st.getIconKeyName())); } else if (RenderingIcons.containsBigIcon(st.getOsmTag() + "_" + st.getOsmValue())) { icon.setImageResource(RenderingIcons.getBigIconResourceId(st.getOsmTag() + "_" + st.getOsmValue())); } else { diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPoiFilterFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPoiFilterFragment.java index bdb283575b..b22ead698b 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPoiFilterFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPoiFilterFragment.java @@ -255,8 +255,8 @@ public class SearchPoiFilterFragment extends ListFragment implements SearchActiv name = model.getName(); } else { AbstractPoiType st = (AbstractPoiType) item; - if (RenderingIcons.containsBigIcon(st.getKeyName())) { - icon.setImageDrawable(RenderingIcons.getBigIcon(getActivity(), st.getKeyName())); + if (RenderingIcons.containsBigIcon(st.getIconKeyName())) { + icon.setImageDrawable(RenderingIcons.getBigIcon(getActivity(), st.getIconKeyName())); } else if (st instanceof PoiType && RenderingIcons.containsBigIcon(((PoiType) st).getOsmTag() + "_" + ((PoiType) st).getOsmValue())) { diff --git a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java index d2a7b44e8a..b638dde06c 100644 --- a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java +++ b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java @@ -388,7 +388,8 @@ public class ConfigureMapMenu { ctx.getString(R.string.lang_es), ctx.getString(R.string.lang_fi), ctx.getString(R.string.lang_fr), ctx.getString(R.string.lang_he), ctx.getString(R.string.lang_hi), ctx.getString(R.string.lang_hr), ctx.getString(R.string.lang_hu), ctx.getString(R.string.lang_it), ctx.getString(R.string.lang_ja), - ctx.getString(R.string.lang_ko), ctx.getString(R.string.lang_lv), ctx.getString(R.string.lang_nl), + ctx.getString(R.string.lang_ko), ctx.getString(R.string.lang_lt), + ctx.getString(R.string.lang_lv), ctx.getString(R.string.lang_nl), ctx.getString(R.string.lang_pl), ctx.getString(R.string.lang_ro), ctx.getString(R.string.lang_ru), ctx.getString(R.string.lang_sk), ctx.getString(R.string.lang_sl), ctx.getString(R.string.lang_sv), ctx.getString(R.string.lang_sw), ctx.getString(R.string.lang_zh) }; diff --git a/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java b/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java index 1f6f9427cf..84863f6087 100644 --- a/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java +++ b/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java @@ -666,9 +666,9 @@ public class WaypointHelper { Amenity amenity = ((AmenityLocationPoint) point).a; PoiType st = amenity.getType().getPoiTypeByKeyName(amenity.getSubType()); if (st != null) { - if (RenderingIcons.containsBigIcon(st.getKeyName())) { + if (RenderingIcons.containsBigIcon(st.getIconKeyName())) { return uiCtx.getResources().getDrawable( - RenderingIcons.getBigIconResourceId(st.getKeyName())); + RenderingIcons.getBigIconResourceId(st.getIconKeyName())); } else if (RenderingIcons.containsBigIcon(st.getOsmTag() + "_" + st.getOsmValue())) { return uiCtx.getResources().getDrawable( RenderingIcons.getBigIconResourceId(st.getOsmTag() + "_" + st.getOsmValue())); diff --git a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java index 05268b90b9..92475ecb09 100644 --- a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java +++ b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java @@ -189,8 +189,13 @@ public class OsmandMonitoringPlugin extends OsmandPlugin { if ((last != lastUpdateTime) && (globalRecord || isRecording)) { lastUpdateTime = last; //blink implementation with 2 indicator states (global logging + profile/navigation logging) - setIcons(R.drawable.widget_monitoring_rec_inactive_day, - R.drawable.widget_monitoring_rec_inactive_night); + if (globalRecord) { + setIcons(R.drawable.widget_monitoring_rec_small_day, + R.drawable.widget_monitoring_rec_small_night); + } else { + setIcons(R.drawable.widget_monitoring_rec_small_day, + R.drawable.widget_monitoring_rec_small_night); + } map.getMyApplication().runInUIThread(new Runnable() { @Override diff --git a/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java b/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java index 7fa8ace503..47e731228a 100644 --- a/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java @@ -208,8 +208,8 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon String id = null; PoiType st = o.getType().getPoiTypeByKeyName(o.getSubType()); if (st != null) { - if (RenderingIcons.containsIcon(st.getKeyName())) { - id = st.getKeyName(); + if (RenderingIcons.containsIcon(st.getIconKeyName())) { + id = st.getIconKeyName(); } else if (RenderingIcons.containsIcon(st.getOsmTag() + "_" + st.getOsmValue())) { id = st.getOsmTag() + "_" + st.getOsmValue(); }