Downloading satellite maps

mahomaps · Jun 23, 2023 · c1d66d2 · c1d66d2
1 parent 482f8d6
commit c1d66d2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/mahomaps/map/MapState.java b/src/mahomaps/map/MapState.java
@@ -51,6 +51,7 @@ public MapState Clone() {
 		ms.xOffset = xOffset;
 		ms.yOffset = yOffset;
 		ms.zoom = zoom;
+		ms.map = map;
 		return ms;
 	}
 
@@ -63,6 +64,7 @@ public MapState ZoomIn() {
 		ms.tileY = tileY * 2;
 		ms.xOffset = xOffset * 2;
 		ms.yOffset = yOffset * 2;
+		ms.map = map;
 		ms.ClampOffset();
 		return ms;
 	}
@@ -76,6 +78,7 @@ public MapState ZoomOut() {
 		ms.tileY = tileY / 2;
 		ms.xOffset = (xOffset - (tileX % 2 == 1 ? 256 : 0)) / 2;
 		ms.yOffset = (yOffset - (tileY % 2 == 1 ? 256 : 0)) / 2;
+		ms.map = map;
 		ms.ClampOffset();
 		return ms;
 	}

diff --git a/src/mahomaps/map/TilesProvider.java b/src/mahomaps/map/TilesProvider.java
@@ -305,10 +305,7 @@ private Image download(TileId id) throws InterruptedException {
 		FileConnection fc = null;
 		try {
 			hc = (HttpConnection) Connector.open(getUrl(id) + MahoMapsApp.getConnectionParams());
-			int len = (int) hc.getLength();
-			if (len <= 0)
-				throw new IOException("Empty response");
-			ByteArrayOutputStream blob = new ByteArrayOutputStream(len);
+			ByteArrayOutputStream blob = new ByteArrayOutputStream();
 			byte[] buf = new byte[8192];
 			InputStream s = hc.openInputStream();
 			while (true) {
@@ -570,7 +567,8 @@ public TileCache getTile(TileId tileId) {
 	}
 
 	private String getUrl(TileId tileId) {
-		String url = "https://core-renderer-tiles.maps.yandex.net/tiles?l=map&lang=" + lang + "&x=" + tileId.x + "&y="
+		String url = (tileId.map == 0 ? "https://core-renderer-tiles.maps.yandex.net/tiles?l=map&lang=" : "https://core-sat.maps.yandex.net/tiles?l=sat&lang=")
+				+ lang + "&x=" + tileId.x + "&y="
 				+ tileId.y + "&z=" + tileId.zoom;
 		if (Settings.proxyTiles) {
 			return Settings.proxyServer + YmapsApiBase.EncodeUrl(url);