Changeset 7132 in josm for trunk/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java
- Timestamp:
- 2014-05-15T03:15:28+02:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java
r7082 r7132 24 24 import java.util.regex.Pattern; 25 25 26 import javax.imageio.ImageIO;27 28 26 import org.openstreetmap.josm.Main; 29 27 import org.openstreetmap.josm.data.coor.EastNorth; … … 35 33 import org.openstreetmap.josm.io.OsmTransferException; 36 34 import org.openstreetmap.josm.io.ProgressInputStream; 35 import org.openstreetmap.josm.tools.ImageProvider; 37 36 import org.openstreetmap.josm.tools.Utils; 38 39 37 40 38 public class WMSGrabber extends Grabber { … … 137 135 @Override 138 136 public boolean loadFromCache(WMSRequest request) { 139 BufferedImage cached = layer.cache.getExactMatch(Main.getProjection(), request.getPixelPerDegree(), b.minEast, b.minNorth); 137 BufferedImage cached = layer.cache.getExactMatch( 138 Main.getProjection(), request.getPixelPerDegree(), b.minEast, b.minNorth); 140 139 141 140 if (cached != null) { … … 143 142 return true; 144 143 } else if (request.isAllowPartialCacheMatch()) { 145 BufferedImage partialMatch = layer.cache.getPartialMatch(Main.getProjection(), request.getPixelPerDegree(), b.minEast, b.minNorth); 144 BufferedImage partialMatch = layer.cache.getPartialMatch( 145 Main.getProjection(), request.getPixelPerDegree(), b.minEast, b.minNorth); 146 146 if (partialMatch != null) { 147 147 request.finish(State.PARTLY_IN_CACHE, partialMatch); … … 179 179 180 180 ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); 181 BufferedImage img = layer.normalizeImage(Image IO.read(bais));181 BufferedImage img = layer.normalizeImage(ImageProvider.read(bais, true, WMSLayer.PROP_ALPHA_CHANNEL.get())); 182 182 bais.reset(); 183 183 layer.cache.saveToCache(layer.isOverlapEnabled()?img:null, bais, Main.getProjection(), request.getPixelPerDegree(), b.minEast, b.minNorth);
Note:
See TracChangeset
for help on using the changeset viewer.