From b708f8e6ff06ff892c3d8d3714324539794e1746 Mon Sep 17 00:00:00 2001 From: simon Date: Thu, 10 Sep 2020 17:12:46 +0300 Subject: [PATCH] time checks removed --- .../server/endpoints/MetaTileFileSystemCache.java | 3 +-- .../osmand/plus/server/endpoints/TileEndpoint.java | 13 ++++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/server/endpoints/MetaTileFileSystemCache.java b/OsmAnd/src/net/osmand/plus/server/endpoints/MetaTileFileSystemCache.java index b775531361..6e5becdfbe 100644 --- a/OsmAnd/src/net/osmand/plus/server/endpoints/MetaTileFileSystemCache.java +++ b/OsmAnd/src/net/osmand/plus/server/endpoints/MetaTileFileSystemCache.java @@ -6,7 +6,6 @@ import net.osmand.PlatformUtil; import net.osmand.data.RotatedTileBox; import net.osmand.plus.OsmandApplication; import net.osmand.util.MapUtils; - import org.apache.commons.logging.Log; import java.io.File; @@ -18,7 +17,7 @@ public class MetaTileFileSystemCache { private static final String TILES_FOLDER = "webtiles"; static final int TILE_SIZE_PX = 256; static final int TILE_DENSITY = 2; - static final int METATILE_SIZE = 4; + static final int METATILE_SIZE = 2; private static final int MAX_IN_MEMORY_CACHE_SIZE = 16 / METATILE_SIZE; private static final int MAX_CACHE_SIZE = 128; diff --git a/OsmAnd/src/net/osmand/plus/server/endpoints/TileEndpoint.java b/OsmAnd/src/net/osmand/plus/server/endpoints/TileEndpoint.java index 0eff5b0ac6..df23f4f710 100644 --- a/OsmAnd/src/net/osmand/plus/server/endpoints/TileEndpoint.java +++ b/OsmAnd/src/net/osmand/plus/server/endpoints/TileEndpoint.java @@ -1,13 +1,13 @@ package net.osmand.plus.server.endpoints; import android.graphics.*; +import androidx.annotation.GuardedBy; import fi.iki.elonen.NanoHTTPD; import net.osmand.PlatformUtil; import net.osmand.data.RotatedTileBox; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.resources.AsyncLoadingThread; import net.osmand.plus.server.OsmAndHttpServer; -import net.osmand.util.MapUtils; import org.apache.commons.logging.Log; import java.io.ByteArrayInputStream; @@ -16,16 +16,16 @@ import java.io.ByteArrayOutputStream; import static fi.iki.elonen.NanoHTTPD.newFixedLengthResponse; public class TileEndpoint implements OsmAndHttpServer.ApiEndpoint { - private static final int TIMEOUT_STEP = 150; private static final int TIMEOUT = 15000; - - private static final Log LOG = PlatformUtil.getLog(TileEndpoint.class); - private final MapActivity mapActivity; - private final MetaTileFileSystemCache cache; + @GuardedBy("this") + //todo cancel on zoom + private static int lastZoom = -999; //TODO restore mapState on Exit private final RotatedTileBox mapTileBoxCopy; + private final MapActivity mapActivity; + private final MetaTileFileSystemCache cache; public TileEndpoint(MapActivity mapActivity) { this.mapActivity = mapActivity; @@ -82,7 +82,6 @@ public class TileEndpoint implements OsmAndHttpServer.ApiEndpoint { if (cacheTile != null) { return cacheTile; } - MetaTileFileSystemCache.MetaTileCache res = cache.createMetaTile(zoom, x, y); mapActivity.getMapView().setCurrentViewport(res.bbox); int timeout = 0;