Bug#765421: Re: Re: Re: Bug#765421: jmapviewer/josm issue

[Marcus Lundblad]

I cooked up a patch that fetches the logo image if the embedded resource
isn't found in the package. The reason I did this instead of just
overriding the original code is to hopefully make it possibly more
upstreamable.
I tried building and installing the package with the patch applied and
Josm can successfully load Bing aerials with this.

//Marcus

diff -r jmapviewer-1.03+dfsg.orig/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java jmapviewer-1.03+dfsg/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java
5a6
> import java.io.InputStream;
177c178,184
<             return ImageIO.read(JMapViewer.class.getResourceAsStream("images/bing_maps.png"));
---
> 	    final InputStream imageResource =
> 		JMapViewer.class.getResourceAsStream("images/bing_maps.png"); 
> 	    if (imageResource != null) {
> 		return ImageIO.read(imageResource);
> 	    } else {
> 		return ImageIO.read(new URL("http://dev.virtualearth.net/Branding/logo_powered_by.png";));
> 	    }