Skip to content

AbstractTileFactory: add openRemoteStream hook for custom HTTP implementations #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
catobus wants to merge 1 commit into
base: master
Choose a base branch
from
Open

AbstractTileFactory: add openRemoteStream hook for custom HTTP implementations #140

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 23 additions & 6 deletions jxmapviewer2/src/main/java/org/jxmapviewer/viewer/AbstractTileFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,23 @@ public synchronized int getPendingTiles() {
return tileQueue.size();
}

/**
* Opens an InputStream for the given tile URL.
*
* Subclasses may override this method to use a custom HTTP implementation.
* The default implementation uses URLConnection.
*
* @param url the URL of the tile
* @return the input stream for the URL
* @throws IOException if an I/O error occurs while opening the stream
*/
protected InputStream openRemoteStream(URL url) throws IOException {
URLConnection connection = url.openConnection();
connection.setRequestProperty("User-Agent", userAgent);
addCustomRequestProperties(connection);
return connection.getInputStream();
}

/**
* An inner class which actually loads the tiles. Used by the thread queue. Subclasses can override this
* via {@link #createTileRunner(Tile)} if necessary.
Expand Down Expand Up @@ -437,15 +454,15 @@ public void run()
private byte[] cacheInputStream(URL url) throws IOException
{
InputStream ins = localCache.get(url);
if (ins == null) {
URLConnection connection = url.openConnection();
connection.setRequestProperty("User-Agent", userAgent);
addCustomRequestProperties(connection);
ins = connection.getInputStream();
boolean fromCache = (ins != null);
if (!fromCache) {
ins = openRemoteStream(url);
}
try {
byte[] data = readAllBytes(ins);
localCache.put(url, new ByteArrayInputStream(data));
if (!fromCache) {
localCache.put(url, new ByteArrayInputStream(data));
}
return data;
}
finally {
Expand Down