From a7633b2031ddd2a7e2fa1740da5ca3a5ee502e0e Mon Sep 17 00:00:00 2001 From: simon Date: Fri, 4 Sep 2020 18:48:01 +0300 Subject: [PATCH] refactoring3 --- .../src/net/osmand/plus/server/endpoints/TileEndpoint.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/server/endpoints/TileEndpoint.java b/OsmAnd/src/net/osmand/plus/server/endpoints/TileEndpoint.java index 3672a70550..74e0453b2e 100644 --- a/OsmAnd/src/net/osmand/plus/server/endpoints/TileEndpoint.java +++ b/OsmAnd/src/net/osmand/plus/server/endpoints/TileEndpoint.java @@ -1,6 +1,7 @@ package net.osmand.plus.server.endpoints; import android.graphics.Bitmap; +import android.util.Log; import fi.iki.elonen.NanoHTTPD; import net.osmand.PlatformUtil; import net.osmand.data.RotatedTileBox; @@ -9,7 +10,6 @@ import net.osmand.plus.render.MapRenderRepositories; import net.osmand.plus.resources.AsyncLoadingThread; import net.osmand.plus.server.ApiEndpoint; import net.osmand.plus.server.OsmAndHttpServer; -import org.apache.commons.logging.Log; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -23,6 +23,7 @@ import static fi.iki.elonen.NanoHTTPD.newFixedLengthResponse; public class TileEndpoint implements ApiEndpoint { private static final int RENDER_WAIT_THRESHOLD = 5000; private static final Object lock = new Object(); + private static final int TILE_SIZE_PX = 512; Map hashMap = new HashMap<>(); Map map = Collections.synchronizedMap(hashMap); OsmandApplication application; @@ -46,6 +47,7 @@ public class TileEndpoint implements ApiEndpoint { if (bitmap == null) { return OsmAndHttpServer.ErrorResponses.response500; } + //stream also needs to be synchronized ByteArrayOutputStream stream = new ByteArrayOutputStream(); bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream); byte[] byteArray = stream.toByteArray(); @@ -67,7 +69,7 @@ public class TileEndpoint implements ApiEndpoint { final RotatedTileBox rotatedTileBox = new RotatedTileBox.RotatedTileBoxBuilder() .setLocation(lat, lon) .setZoom(zoom) - .setPixelDimensions(512, 512, 0.5f, 0.5f).build(); + .setPixelDimensions(TILE_SIZE_PX, TILE_SIZE_PX, 0.5f, 0.5f).build(); final MapRenderRepositories renderer = application.getResourceManager().getRenderer(); application.getResourceManager().updateRendererMap(rotatedTileBox, new AsyncLoadingThread.OnMapLoadedListener() { @Override