Changeset 3843 in josm

Timestamp:

Feb 1, 2011 10:15:06 PM (2 years ago)

Author:

bastiK

Message:

first version of mapstyle dialog; still hidden because its unfinished (set mappaintdialog.show=true in advanced pref to show it). switching styles on/off and reload from file is supported at the moment.

Location:

trunk

Files:

• images/dialogs/mapstyle.png (added)
• images_nodist/dialogs/mapstyle.svg (added)
• src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/MapFrame.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java (added)
• src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (modified) (8 diffs)
• src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/mappaint/StyleSource.java (added)
• src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/preferences/SourceEntry.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -300 +300 @@
      *--------*/
     public StyleCache mappaintStyle = null;
+    public int mappaintCacheIdx;
 
     /* This should not be called from outside. Fixing the UI to add relevant

trunk/src/org/openstreetmap/josm/gui/MapFrame.java

@@ -51 +51 @@
 import org.openstreetmap.josm.gui.dialogs.HistoryDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
+import org.openstreetmap.josm.gui.dialogs.MapPaintDialog;
 import org.openstreetmap.josm.gui.dialogs.RelationListDialog;
 import org.openstreetmap.josm.gui.dialogs.SelectionListDialog;
@@ -185 +186 @@
         addToggleDialog(filterDialog = new FilterDialog());
         addToggleDialog(new ChangesetDialog(this));
+        if (Main.pref.getBoolean("mappaintdialog.show", false)) {
+            addToggleDialog(new MapPaintDialog());
+        }
 
         // status line below the map

trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java

@@ -19 +19 @@
 import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.mappaint.StyleCache.StyleList;
-import org.openstreetmap.josm.gui.mappaint.xml.XmlStyleSource;
 import org.openstreetmap.josm.tools.FilteredCollection;
 import org.openstreetmap.josm.tools.Pair;
@@ -26 +25 @@
 
 public class ElemStyles {
-    private List<XmlStyleSource> styleSources;
+    private List<StyleSource> styleSources;
     private boolean drawMultipolygon;
+
+    public static int cacheIdx;
 
     public ElemStyles()
     {
-        styleSources = new ArrayList<XmlStyleSource>();
-    }
-
-    public void add(XmlStyleSource style) {
+        styleSources = new ArrayList<StyleSource>();
+    }
+
+    public void add(StyleSource style) {
         styleSources.add(style);
     }
 
-    public Collection<XmlStyleSource> getStyleSources() {
-        return new FilteredCollection<XmlStyleSource>(styleSources, new Predicate<XmlStyleSource>() {
+    public Collection<StyleSource> getStyleSources() {
+        return new FilteredCollection<StyleSource>(styleSources, new Predicate<StyleSource>() {
 
             String name = Main.pref.get("mappaint.style", "standard");
 
             @Override
-            public boolean evaluate(XmlStyleSource s) {
+            public boolean evaluate(StyleSource s) {
                 return Utils.equal(s.getPrefName(), name);
             }
@@ -54 +55 @@
         Set<String> names = new HashSet<String>();
         names.add("standard");
-        for (XmlStyleSource s : styleSources) {
+        for (StyleSource s : styleSources) {
             if (s.name != null) {
                 names.add(s.name);
@@ -67 +68 @@
 
     public Pair<StyleList, Range> getStyleCacheWithRange(OsmPrimitive osm, double scale, NavigatableComponent nc) {
-        if (osm.mappaintStyle == null) {
+        if (osm.mappaintStyle == null || osm.mappaintCacheIdx != cacheIdx) {
             osm.mappaintStyle = StyleCache.EMPTY_STYLECACHE;
         } else {
@@ -83 +84 @@
         }
         osm.mappaintStyle = osm.mappaintStyle.put(p.a, p.b);
+        osm.mappaintCacheIdx = cacheIdx;
         return p;
     }
@@ -90 +92 @@
         {
             return generateStyles(osm, scale, null, false);
-        } 
+        }
         else if (osm instanceof Way)
         {
@@ -178 +180 @@
             }
             return p;
-        } 
+        }
         else if (osm instanceof Relation)
         {
@@ -216 +218 @@
         MultiCascade mc = new MultiCascade();
 
-        for (XmlStyleSource s : styleSources) {
-            s.apply(mc, osm, scale, multipolyOuterWay, pretendWayIsClosed);
+        for (StyleSource s : styleSources) {
+            if (s.active) {
+                s.apply(mc, osm, scale, multipolyOuterWay, pretendWayIsClosed);
+            }
         }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.mappaint;
 
-import org.openstreetmap.josm.gui.mappaint.xml.XmlStyleSource;
-import org.openstreetmap.josm.gui.mappaint.xml.XmlStyleSourceHandler;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.util.Collection;
 import java.util.Collections;
@@ -18 +14 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.mappaint.xml.XmlStyleSource;
 import org.openstreetmap.josm.gui.preferences.SourceEntry;
 import org.openstreetmap.josm.gui.preferences.MapPaintPreference.MapPaintPrefMigration;
 import org.openstreetmap.josm.io.MirroredInputStream;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.XmlObjectParser;
-import org.openstreetmap.josm.tools.Utils;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
 
 public class MapPaintStyles {
@@ -90 +83 @@
 
         for (SourceEntry entry : sourceEntries) {
-            XmlStyleSource style = new XmlStyleSource(entry);
+            StyleSource style = new XmlStyleSource(entry);
             try {
-                XmlObjectParser parser = new XmlObjectParser(new XmlStyleSourceHandler(style));
                 MirroredInputStream in = new MirroredInputStream(entry.url);
                 InputStream zip = in.getZipEntry("xml","style");
-                InputStreamReader ins;
-                if(zip != null)
-                {
+                if (zip != null) {
                     style.zipIcons = in.getFile();
-                    ins = new InputStreamReader(zip);
-                } else {
-                    ins = new InputStreamReader(in);
-                }
-                parser.startWithValidation(ins, "http://josm.openstreetmap.de/mappaint-style-1.0",
-                "resource://data/mappaint-style.xsd");
-                while(parser.hasNext()) {
-                }
+                } 
             } catch(IOException e) {
                 System.err.println(tr("Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}", entry.url, e.toString()));
-                e.printStackTrace();
-                style.hasError = true;
-            } catch(SAXParseException e) {
-                System.err.println(tr("Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}", entry.url, e.getLineNumber(), e.getColumnNumber(), e.getMessage()));
-                e.printStackTrace();
-                style.hasError = true;
-            } catch(SAXException e) {
-                System.err.println(tr("Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}", entry.url, e.getMessage()));
                 e.printStackTrace();
                 style.hasError = true;
@@ -122 +97 @@
             styles.add(style);
         }
+        for (StyleSource s : styles.getStyleSources()) {
+            s.loadStyleSource();
+        }
     }
 }

trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.mappaint.xml;
 
-import java.io.File;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -19 +22 @@
 import org.openstreetmap.josm.gui.mappaint.MultiCascade;
 import org.openstreetmap.josm.gui.mappaint.Range;
+import org.openstreetmap.josm.gui.mappaint.StyleSource;
 import org.openstreetmap.josm.gui.preferences.SourceEntry;
+import org.openstreetmap.josm.io.MirroredInputStream;
 import org.openstreetmap.josm.tools.Utils;
-
-public class XmlStyleSource extends SourceEntry {
+import org.openstreetmap.josm.tools.XmlObjectParser;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+
+public class XmlStyleSource extends StyleSource {
 
     public final HashMap<String, IconPrototype> icons = new HashMap<String, IconPrototype>();
@@ -33 +41 @@
     public final LinkedList<AreaPrototype> areasList = new LinkedList<AreaPrototype>();
 
-    public boolean hasError = false;
-    public File zipIcons;
-
     public XmlStyleSource(String url, String name, String shortdescription) {
-        super(url, name, shortdescription, true);
+        super(url, name, shortdescription);
     }
 
     public XmlStyleSource(SourceEntry entry) {
-        super(entry.url, entry.name, entry.shortdescription, entry.active);
+        super(entry);
+    }
+
+    @Override
+    public void loadStyleSource() {
+        try {
+            MirroredInputStream in = new MirroredInputStream(url);
+            InputStream zip = in.getZipEntry("xml", "style");
+            InputStreamReader reader = null;
+            if (zip != null) {
+                reader = new InputStreamReader(zip);
+            } else {
+                reader = new InputStreamReader(in);
+            }
+
+            XmlObjectParser parser = new XmlObjectParser(new XmlStyleSourceHandler(this));
+            parser.startWithValidation(reader,
+                    "http://josm.openstreetmap.de/mappaint-style-1.0",
+                    "resource://data/mappaint-style.xsd");
+            while(parser.hasNext()) {
+            }
+            
+        } catch(IOException e) {
+            System.err.println(tr("Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}", url, e.toString()));
+            e.printStackTrace();
+            hasError = true;
+        } catch(SAXParseException e) {
+            System.err.println(tr("Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}", url, e.getLineNumber(), e.getColumnNumber(), e.getMessage()));
+            e.printStackTrace();
+            hasError = true;
+        } catch(SAXException e) {
+            System.err.println(tr("Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}", url, e.getMessage()));
+            e.printStackTrace();
+            hasError = true;
+        }
     }
 
@@ -220 +259 @@
      }
 
+    @Override
     public void apply(MultiCascade mc, OsmPrimitive osm, double scale, OsmPrimitive multipolyOuterWay, boolean pretendWayIsClosed) {
         Cascade def = mc.getCascade("default");

trunk/src/org/openstreetmap/josm/gui/preferences/SourceEntry.java

@@ -104 +104 @@
         return name == null ? "standard" : name;
     }
+
+    public boolean isLocal() {
+        if (url.startsWith("http://") || url.startsWith("resource://"))
+            return false;
+        return true;
+    }
 }