From 9a8a4e16b282ffd4ddf02b364a362b9d57440b74 Mon Sep 17 00:00:00 2001
From: simon <myhosting2012@gmail.com>
Date: Thu, 3 Sep 2020 00:13:28 +0300
Subject: [PATCH] server refactoring1

---
 .../java/net/osmand/data/RotatedTileBox.java  | 56 +++++++++++--------
 .../src/net/osmand/plus/server/ApiRouter.java | 22 ++++----
 2 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/OsmAnd-java/src/main/java/net/osmand/data/RotatedTileBox.java b/OsmAnd-java/src/main/java/net/osmand/data/RotatedTileBox.java
index 84a5a39cdd..2219a0a6d6 100644
--- a/OsmAnd-java/src/main/java/net/osmand/data/RotatedTileBox.java
+++ b/OsmAnd-java/src/main/java/net/osmand/data/RotatedTileBox.java
@@ -76,39 +76,49 @@ public class RotatedTileBox {
 		if (this == o) return true;
 		if (o == null || getClass() != o.getClass()) return false;
 		RotatedTileBox tileBox = (RotatedTileBox) o;
-		return Double.compare(tileBox.lat, lat) == 0 &&
-				Double.compare(tileBox.lon, lon) == 0 &&
-				Float.compare(tileBox.rotate, rotate) == 0 &&
-				Float.compare(tileBox.density, density) == 0 &&
+		return this.compare(tileBox.lat, lat) &&
+				this.compare(tileBox.lon, lon) &&
+				this.compare(tileBox.rotate, rotate) &&
+				this.compare(tileBox.density, density) &&
 				zoom == tileBox.zoom &&
-				Double.compare(tileBox.mapDensity, mapDensity) == 0 &&
-				Double.compare(tileBox.zoomAnimation, zoomAnimation) == 0 &&
-				Double.compare(tileBox.zoomFloatPart, zoomFloatPart) == 0 &&
+				this.compare(tileBox.mapDensity, mapDensity) &&
+				this.compare(tileBox.zoomAnimation, zoomAnimation) &&
+				this.compare(tileBox.zoomFloatPart, zoomFloatPart) &&
 				cx == tileBox.cx &&
 				cy == tileBox.cy &&
 				pixWidth == tileBox.pixWidth &&
 				pixHeight == tileBox.pixHeight &&
-				Double.compare(tileBox.zoomFactor, zoomFactor) == 0 &&
-				Double.compare(tileBox.rotateCos, rotateCos) == 0 &&
-				Double.compare(tileBox.rotateSin, rotateSin) == 0 &&
-				Double.compare(tileBox.oxTile, oxTile) == 0 &&
-				Double.compare(tileBox.oyTile, oyTile) == 0;
+				this.compare(tileBox.zoomFactor, zoomFactor) &&
+				this.compare(tileBox.rotateCos, rotateCos) &&
+				this.compare(tileBox.rotateSin, rotateSin) &&
+				this.compare(tileBox.oxTile, oxTile) &&
+				this.compare(tileBox.oyTile, oyTile);
+	}
+
+	private double E = 0.0001;
+
+	private boolean compare(float lon, float lon1) {
+		return Math.abs(lon1-lon) < E;
+	}
+
+	private boolean compare(double lon, double lon1) {
+		return Math.abs(lon1-lon) < E;
 	}
 
 	@Override
 	public int hashCode() {
 		int result = 1 + (int)lat +
-				3* (int)lon +
-				5* (int)rotate +
-				7* (int)density +
-				11* (int)zoom  +
-				13* (int)mapDensity +
-				17* (int)zoomAnimation +
-				19* (int)zoomFloatPart +
-				23* (int)cx +
-				29* (int)cy +
-				31* (int)pixWidth +
-				37* (int)pixHeight;
+				3* (int)(lon*1/E) +
+				5* (int)(rotate*1/E) +
+				7* (int)(density*1/E) +
+				11* zoom  +
+				13* (int)(mapDensity*1/E) +
+				17* (int)(zoomAnimation*1/E) +
+				19* (int)(zoomFloatPart*1/E) +
+				23* cx +
+				29* cy +
+				31* pixWidth +
+				37* pixHeight;
 		return result;
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/server/ApiRouter.java b/OsmAnd/src/net/osmand/plus/server/ApiRouter.java
index cfaa752abb..a8e5ddc86d 100644
--- a/OsmAnd/src/net/osmand/plus/server/ApiRouter.java
+++ b/OsmAnd/src/net/osmand/plus/server/ApiRouter.java
@@ -66,10 +66,10 @@ public class ApiRouter implements OsmandMapTileView.IMapImageDrawListener {
 
 	ExecutorService executor = Executors.newFixedThreadPool(3);
 
-	Map<RotatedTileBox,Bitmap> hashMap = new HashMap<>();
-	Map<RotatedTileBox,Bitmap> map = Collections.synchronizedMap(hashMap);
+	Map<RotatedTileBox, Bitmap> hashMap = new HashMap<>();
+	Map<RotatedTileBox, Bitmap> map = Collections.synchronizedMap(hashMap);
 
-	private NanoHTTPD.Response tileApiCall(NanoHTTPD.IHTTPSession session) {
+	private synchronized NanoHTTPD.Response tileApiCall(NanoHTTPD.IHTTPSession session) {
 		int zoom = 0;
 		double lat = 0;//50.901430;
 		double lon = 0;//34.801775;
@@ -84,19 +84,19 @@ public class ApiRouter implements OsmandMapTileView.IMapImageDrawListener {
 			return ErrorResponses.response500;
 		}
 		mapActivity.getMapView().setMapImageDrawListener(this);
-		Future<Pair<RotatedTileBox,Bitmap>> future;
-		final RotatedTileBox rotatedTileBox = mapActivity.getMapView().getCurrentRotatedTileBox().copy();
-		rotatedTileBox.setZoom(zoom);
-		rotatedTileBox.setLatLonCenter(lat, lon);
-		rotatedTileBox.setPixelDimensions(512, 512);
+		Future<Pair<RotatedTileBox, Bitmap>> future;
+		final RotatedTileBox rotatedTileBox = new RotatedTileBox.RotatedTileBoxBuilder()
+				.setLocation(lat, lon)
+				.setZoom(zoom)
+				.setPixelDimensions(512, 512, 0.5f, 0.5f).build();
 		future = executor.submit(new Callable<Pair<RotatedTileBox, Bitmap>>() {
 			@Override
 			public Pair<RotatedTileBox, Bitmap> call() throws Exception {
 				Bitmap bmp;
-				while((bmp = map.get(rotatedTileBox)) == null) {
+				while ((bmp = map.get(rotatedTileBox)) == null) {
 					Thread.sleep(1000);
 				}
-				return Pair.create(rotatedTileBox,bmp);
+				return Pair.create(rotatedTileBox, bmp);
 			}
 		});
 		mapActivity.getMapView().setCurrentRotatedTileBox(rotatedTileBox);
@@ -251,7 +251,7 @@ public class ApiRouter implements OsmandMapTileView.IMapImageDrawListener {
 
 	@Override
 	public void onDraw(RotatedTileBox viewport, Bitmap bmp) {
-		this.map.put(viewport,bmp);
+		this.map.put(viewport, bmp);
 	}
 
 	static class ErrorResponses {