Fixes after review

jj10133 · May 23, 2022 · 526ce75 · 526ce75
1 parent d2f4789
commit 526ce75
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/OsmAnd/src/net/osmand/plus/plugins/osmedit/OsmBugsLayer.java b/OsmAnd/src/net/osmand/plus/plugins/osmedit/OsmBugsLayer.java
@@ -69,7 +69,7 @@ public class OsmBugsLayer extends OsmandMapLayer implements IContextMenuProvider
 	//OpenGL
 	private OsmBugsTileProvider osmBugsTileProvider;
 	private float textScale = 1f;
-    private boolean showClosed = false;
+	private boolean showClosed = false;
 
 	public OsmBugsLayer(@NonNull Context context, @NonNull OsmEditingPlugin plugin, int baseOrder) {
 		super(context);

diff --git a/OsmAnd/src/net/osmand/plus/views/layers/TransportStopsLayer.java b/OsmAnd/src/net/osmand/plus/views/layers/TransportStopsLayer.java
@@ -195,15 +195,14 @@ private int getRadiusPoi(RotatedTileBox tb){
 
 	@Override
 	public void onPrepareBufferImage(Canvas canvas, RotatedTileBox tb, DrawSettings settings) {
+		if (!mapsInitialized) {
+			return;
+		}
 		List<TransportStop> objects = null;
 		boolean nightMode = settings.isNightMode();
 		OsmandApplication app = getApplication();
 		MapRendererView mapRenderer = getMapRenderer();
-		hasMapRenderer();
 		if (mapRenderer != null) {
-			if (!mapsInitialized) {
-				return;
-			}
 			float textScale = getTextScale();
 			int stopRouteDist = stopRoute != null ? stopRoute.distance : 0;
 			TransportStopType stopRouteType = stopRoute != null ? stopRoute.type : null;
@@ -422,7 +421,7 @@ private void initTransportRouteCollections() {
 		List<TransportStop> transportStops = stopRoute.route.getForwardStops();
 		String transportRouteType = stopRoute.route.getType();
 		if (transportStops.size() > 0) {
-			int baseOrder = getBaseOrder() + 1;
+			int baseOrder = getBaseOrder() - 1;
 			mapMarkersCollection = new MapMarkersCollection();
 			for (TransportStop ts : transportStops) {
 				StopsCollectionPoint collectionPoint =

diff --git a/OsmAnd/src/net/osmand/plus/views/layers/core/OsmBugsTileProvider.java b/OsmAnd/src/net/osmand/plus/views/layers/core/OsmBugsTileProvider.java
@@ -117,7 +117,7 @@ public String getCaption() {
 	}
 
 	public OsmBugsTileProvider(@NonNull Context context, OsmandMapLayer.MapLayerData<List<OsmBugsLayer.OpenStreetNote>> layerData,
-							   int baseOrder, boolean showClosed, int minZoom, float textScale) {
+	                           int baseOrder, boolean showClosed, int minZoom, float textScale) {
 		this.ctx = context;
 		this.layerData = layerData;
 		this.baseOrder = baseOrder;