Changeset 4713 in josm for trunk/src/org

Timestamp:

2011-12-26T21:48:25+01:00 (12 years ago)

Author:

simon04

Message:

see #7182 - Individual Icons for Imagery Background

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AddImageryLayerAction.java (modified) (2 diffs)
• data/imagery/ImageryInfo.java (modified) (6 diffs)
• io/imagery/ImageryReader.java (modified) (5 diffs)
• tools/ImageProvider.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

@@ -5 +5 @@
 
 import java.awt.event.ActionEvent;
-
+import javax.swing.Action;
+import javax.swing.ImageIcon;
 import javax.swing.JOptionPane;
-
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
+import org.openstreetmap.josm.tools.ImageRequest;
 
 public class AddImageryLayerAction extends JosmAction implements AdaptableAction {
 
+    private static final int MAX_ICON_SIZE = 24;
     private final ImageryInfo info;
 
@@ -22 +24 @@
         this.info = info;
         installAdapters();
+
+        // change toolbar icon from if specified
+        try {
+            if (info.getIcon() != null) {
+                ImageIcon i = new ImageRequest().setName(info.getIcon()).setMaxHeight(MAX_ICON_SIZE).setMaxWidth(MAX_ICON_SIZE).get();
+                putValue(Action.SMALL_ICON, i);
+            }
+        } catch (Exception ex) {
+            throw new RuntimeException(ex.getMessage(), ex);
+        }
     }
 

trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

@@ -85 +85 @@
     private String termsOfUseURL;
     private String countryCode = "";
+    private String icon;
 
     /** auxiliary class to save an ImageryInfo object in the preferences */
@@ -106 +107 @@
         @pref String shapes;
         @pref String projections;
+        @pref String icon;
 
         public ImageryPreferenceEntry() {
@@ -126 +128 @@
             min_zoom = i.defaultMinZoom;
             cookies = i.cookies;
+            icon = i.icon;
             if (i.bounds != null) {
                 bounds = i.bounds.encodeAsString(",");
@@ -219 +222 @@
         termsOfUseURL = e.terms_of_use_url;
         countryCode = e.country_code;
+        icon = e.icon;
     }
 
@@ -285 +289 @@
         this.termsOfUseURL = i.termsOfUseURL;
         this.serverProjections = i.serverProjections;
+        this.icon = i.icon;
     }
 
@@ -515 +520 @@
     }
 
+    public String getIcon() {
+        return icon;
+    }
+
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+
     /**
      * Get the projections supported by the server. Only relevant for

trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java

@@ -5 +5 @@
 import static org.openstreetmap.josm.tools.Utils.equal;
 
-import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -18 +15 @@
 import javax.xml.parsers.SAXParserFactory;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryBounds;
@@ -25 +21 @@
 import org.openstreetmap.josm.io.MirroredInputStream;
 import org.openstreetmap.josm.io.UTFInputStreamReader;
-import org.openstreetmap.josm.tools.Utils;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
@@ -130 +125 @@
                         "terms-of-use-url",
                         "country-code",
+                        "icon",
                     }).contains(qName)) {
                         newState = State.ENTRY_ATTRIBUTE;
@@ -260 +256 @@
                     } else if (qName.equals("country-code")) {
                         entry.setCountryCode(accumulator.toString());
+                    } else if (qName.equals("icon")) {
+                        entry.setIcon(accumulator.toString());
                     } else {
                     }

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -21 +21 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.StringReader;
+import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
+import java.net.URLDecoder;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
-
+import org.apache.commons.codec.binary.Base64;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.io.MirroredInputStream;
 import org.openstreetmap.josm.plugins.PluginHandler;
-import org.openstreetmap.josm.tools.Utils;
 import org.xml.sax.Attributes;
 import org.xml.sax.EntityResolver;
@@ -45 +49 @@
 import org.xml.sax.helpers.DefaultHandler;
 import org.xml.sax.helpers.XMLReaderFactory;
-
 import com.kitfox.svg.SVGDiagram;
 import com.kitfox.svg.SVGException;
@@ -167 +170 @@
     }
 
+    /**
+     * {@code data:[<mediatype>][;base64],<data>}
+     * @see RFC2397
+     */
+    private static final Pattern dataUrlPattern = Pattern.compile(
+            "^data:([a-zA-Z]+/[a-zA-Z+]+)?(;base64)?,(.+)$");
+
     static ImageResource getIfAvailableImpl(Collection<String> dirs, String id, String subdir, String name, File archive) {
         if (name == null)
             return null;
+
+        try {
+            if (name.startsWith("data:")) {
+                Matcher m = dataUrlPattern.matcher(name);
+                if (m.matches()) {
+                    String mediatype = m.group(1);
+                    String base64 = m.group(2);
+                    String data = m.group(3);
+                    byte[] bytes = ";base64".equals(base64)
+                            ? Base64.decodeBase64(data)
+                            : URLDecoder.decode(data, "utf-8").getBytes();
+                    if (mediatype != null && mediatype.contains("image/svg+xml")) {
+                        URI uri = getSvgUniverse().loadSVG(new StringReader(new String(bytes)), name);
+                        SVGDiagram svg = getSvgUniverse().getDiagram(uri);
+                        return new ImageResource(svg);
+                    } else {
+                        return new ImageResource(new ImageIcon(bytes).getImage(), true);
+                    }
+                }
+            }
+        } catch (UnsupportedEncodingException ex) {
+            throw new RuntimeException(ex.getMessage(), ex);
+        } catch (IOException ex) {
+            throw new RuntimeException(ex.getMessage(), ex);
+        }
+
         ImageType type = name.toLowerCase().endsWith(".svg") ? ImageType.SVG : ImageType.OTHER;