GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 08:37:25 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Resolves #570 map tile data not downloading.

Browse Source 
Also resolves issue with the default map loading icon pointing to an old image reference.
This commit is contained in:
Denny Sheirer
2019-11-17 11:41:41 -05:00
committed by GitHub
parent f934676bd0
commit 4158d4ac10
3 changed files with 144 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/org/jdesktop/swingx/JXMapViewer.java
View File

@@ -1,3 +1,25 @@
/*
*
* * ******************************************************************************
* * Copyright (C) 2014-2019 Dennis Sheirer
* *
* * This program is free software: you can redistribute it and/or modify
* * it under the terms of the GNU General Public License as published by
* * the Free Software Foundation, either version 3 of the License, or
* * (at your option) any later version.
* *
* * This program is distributed in the hope that it will be useful,
* * but WITHOUT ANY WARRANTY; without even the implied warranty of
* * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* * GNU General Public License for more details.
* *
* * You should have received a copy of the GNU General Public License
* * along with this program. If not, see <http://www.gnu.org/licenses/>
* * *****************************************************************************
*
*
*/
/*
* MapViewer.java
*
@@ -9,6 +31,8 @@
package org.jdesktop.swingx;
import jiconfont.icons.font_awesome.FontAwesome;
import jiconfont.swing.IconFontSwing;
import org.jdesktop.swingx.mapviewer.GeoPosition;
import org.jdesktop.swingx.mapviewer.Tile;
import org.jdesktop.swingx.mapviewer.TileFactory;
@@ -20,7 +44,6 @@ import org.jdesktop.swingx.painter.Painter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.swing.ImageIcon;
import javax.swing.JPanel;
import java.awt.Color;
import java.awt.Dimension;
@@ -35,7 +58,6 @@ import java.awt.image.BufferedImage;
import java.beans.DesignMode;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.net.URL;
import java.util.Set;
/**
@@ -125,18 +147,13 @@ public class JXMapViewer extends JPanel implements DesignMode
// make a dummy loading image
try
{
URL imageURL = JXMapViewer.class.getResource("/images/loading.png");
if(imageURL != null)
{
ImageIcon imageIcon = new ImageIcon( imageURL );
this.setLoadingImage( imageIcon.getImage() );
}
Image loading = IconFontSwing.buildImage(FontAwesome.LINK, 16);
this.setLoadingImage(loading);
}
catch (Throwable ex)
{
mLog.error( "JXMapViewer could not load 'loading.png'" );
mLog.error( "JXMapViewer could not load default 'loading.png'" );
BufferedImage img = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
Graphics2D g2 = img.createGraphics();

48
src/main/java/org/jdesktop/swingx/OSMTileFactoryInfo.java
View File

@@ -1,28 +1,24 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2014 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
******************************************************************************/
// Fraunhofer Institute for Computer Graphics Research (IGD)
// Department Information Visualization and Visual Analytics
//
// Copyright (c) Fraunhofer IGD. All rights reserved.
//
// This source code is property of the Fraunhofer IGD and underlies
// copyright restrictions. It may only be used with explicit
// permission from the respective owner.
/*
*
* * ******************************************************************************
* * Copyright (C) 2014-2019 Dennis Sheirer
* *
* * This program is free software: you can redistribute it and/or modify
* * it under the terms of the GNU General Public License as published by
* * the Free Software Foundation, either version 3 of the License, or
* * (at your option) any later version.
* *
* * This program is distributed in the hope that it will be useful,
* * but WITHOUT ANY WARRANTY; without even the implied warranty of
* * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* * GNU General Public License for more details.
* *
* * You should have received a copy of the GNU General Public License
* * along with this program. If not, see <http://www.gnu.org/licenses/>
* * *****************************************************************************
*
*
*/
package org.jdesktop.swingx;
@@ -44,7 +40,7 @@ public class OSMTileFactoryInfo extends TileFactoryInfo
super("OpenStreetMap",
1, max - 2, max,
256, true, true, // tile size is 256 and x/y orientation is normal
"http://tile.openstreetmap.org",
"https://tile.openstreetmap.org",
"x", "y", "z"); // 5/15/10.png
}

121
src/main/java/org/jdesktop/swingx/mapviewer/AbstractTileFactory.java
View File

@@ -1,20 +1,24 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2014 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
******************************************************************************/
/*
*
* * ******************************************************************************
* * Copyright (C) 2014-2019 Dennis Sheirer
* *
* * This program is free software: you can redistribute it and/or modify
* * it under the terms of the GNU General Public License as published by
* * the Free Software Foundation, either version 3 of the License, or
* * (at your option) any later version.
* *
* * This program is distributed in the hope that it will be useful,
* * but WITHOUT ANY WARRANTY; without even the implied warranty of
* * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* * GNU General Public License for more details.
* *
* * You should have received a copy of the GNU General Public License
* * along with this program. If not, see <http://www.gnu.org/licenses/>
* * *****************************************************************************
*
*
*/
package org.jdesktop.swingx.mapviewer;
import org.jdesktop.swingx.mapviewer.util.GeoUtil;
@@ -22,7 +26,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.imageio.ImageIO;
import javax.swing.*;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLException;
import javax.swing.SwingUtilities;
import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -32,6 +38,7 @@ import java.lang.ref.SoftReference;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.Arrays;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Map;
@@ -346,7 +353,6 @@ public abstract class AbstractTileFactory extends TileFactory
}
if (img == null)
{
System.out.println("error loading: " + uri);
trys--;
}
else
@@ -368,17 +374,26 @@ public abstract class AbstractTileFactory extends TileFactory
{
cache.needMoreMemory();
}
catch(SSLException ssle)
{
if(ssle.getMessage() != null && ssle.getMessage().startsWith("No PSK available"))
{
//JDK 11 bug: https://bugs.openjdk.java.net/browse/JDK-8213202
}
else
{
mLog.error("SSL Exception: " + ssle.getMessage());
}
}
catch (Throwable e)
{
if (trys == 0)
{
mLog.error("Failed to load a tile at url: " +
tile.getURL() + ", stopping", e );
mLog.error("Failed to load a tile at url: " + tile.getURL() + ", stopping", e );
}
else
{
mLog.error("Failed to load a tile at url: " +
tile.getURL() + ", retrying", e );
mLog.error("Failed to load a tile at url: " + tile.getURL() + ", retrying", e );
trys--;
}
}
@@ -388,17 +403,71 @@ public abstract class AbstractTileFactory extends TileFactory
private byte[] cacheInputStream(URL url) throws IOException
{
InputStream ins = url.openStream();
//Ugly hack. We only use OSM tiles, so detect it here and comply with SOM Terms of Service (ie user agent)
if(url.toString().startsWith("https://tile.openstreetmap.org"))
{
HttpsURLConnection conn = (HttpsURLConnection)url.openConnection();
conn.addRequestProperty("User-Agent", "sdrtrunk");
InputStream is = conn.getInputStream();
ByteArrayOutputStream bout = new ByteArrayOutputStream();
byte[] buf = new byte[256];
while (true)
{
int n = is.read(buf);
if (n == -1)
break;
bout.write(buf, 0, n);
}
return bout.toByteArray();
}
else
{
InputStream ins = url.openStream();
ByteArrayOutputStream bout = new ByteArrayOutputStream();
byte[] buf = new byte[256];
while (true)
{
int n = ins.read(buf);
if (n == -1)
break;
bout.write(buf, 0, n);
}
return bout.toByteArray();
}
}
}
public static void main(String[] args)
{
String a = "https://tile.openstreetmap.org/12/1178/1504.png";
// String a = "https://tile.openstreetmap.org/11/589/751.png";
try
{
URL url = new URL(a);
System.out.println("Fetching URL: " + url.getClass() + " " + url.toString());
HttpsURLConnection conn = (HttpsURLConnection)url.openConnection();
conn.addRequestProperty("User-Agent", "sdrtrunk");
InputStream is = conn.getInputStream();
ByteArrayOutputStream bout = new ByteArrayOutputStream();
byte[] buf = new byte[256];
while (true)
{
int n = ins.read(buf);
int n = is.read(buf);
if (n == -1)
break;
bout.write(buf, 0, n);
}
return bout.toByteArray();
System.out.println("Bytes:" + Arrays.toString(bout.toByteArray()));
}
catch(IOException ioe)
{
ioe.printStackTrace();
}
}
}