Changeset 1190 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java

Timestamp:

2008-12-29T19:21:40+01:00 (15 years ago)

Author:

stoecker

Message:

added first part of multipolygon drawing

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (modified) (4 diffs)

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

@@ -5 +5 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Iterator;
 
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmUtils;
+import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.Main;
@@ -46 +49 @@
     public void add(String name, String k, String v, String b, LineElemStyle style)
     {
-        getStyleSet(name, true).lines.put(getKey(k,v,b), style);
+        String key = getKey(k,v,b);
+        style.code = key;
+        getStyleSet(name, true).lines.put(key, style);
     }
 
     public void addModifier(String name, String k, String v, String b, LineElemStyle style)
     {
-        getStyleSet(name, true).modifiers.put(getKey(k,v,b), style);
+        String key = getKey(k,v,b);
+        style.code = key;
+        getStyleSet(name, true).modifiers.put(key, style);
     }
 
     public void add(String name, String k, String v, String b, AreaElemStyle style)
     {
-        getStyleSet(name, true).areas.put(getKey(k,v,b), style);
+        String key = getKey(k,v,b);
+        style.code = key;
+        getStyleSet(name, true).areas.put(key, style);
     }
 
     public void add(String name, String k, String v, String b, IconElemStyle style)
     {
-        getStyleSet(name, true).icons.put(getKey(k,v,b), style);
+        String key = getKey(k,v,b);
+        style.code = key;
+        getStyleSet(name, true).icons.put(key, style);
     }
 
@@ -109 +120 @@
     }
 
-    public ElemStyle get(Way w)
-    {
-        StyleSet ss = getStyleSet(null, false);
-        if(ss == null || w.keys == null)
-            return null;
+    private ElemStyle get(Map<String, String> keys, StyleSet ss)
+    {
         AreaElemStyle retArea = null;
         LineElemStyle retLine = null;
         String linestring = null;
         HashMap<String, LineElemStyle> over = new HashMap<String, LineElemStyle>();
-        Iterator<String> iterator = w.keys.keySet().iterator();
+        Iterator<String> iterator = keys.keySet().iterator();
         while(iterator.hasNext())
         {
             String key = iterator.next();
-            String val = w.keys.get(key);
+            String val = keys.get(key);
             AreaElemStyle styleArea;
             LineElemStyle styleLine;
@@ -173 +181 @@
     }
 
-    public boolean isArea(Way w)
-    {
-        StyleSet ss = getStyleSet(null, false);
-        if(ss != null && w.keys != null)
-        {
-            Iterator<String> iterator = w.keys.keySet().iterator();
-            while(iterator.hasNext())
-            {
-                String key = iterator.next();
-                String val = w.keys.get(key);
-                if(ss.areas.containsKey("n" + key + "=" + val)
-                || ss.areas.containsKey("n" + key + "=" + OsmUtils.getNamedOsmBoolean(val))
-                || ss.areas.containsKey("x" + key))
-                    return true;
-            }
+    public ElemStyle get(Way w)
+    {
+        StyleSet ss = getStyleSet(null, false);
+        return (ss == null || w.keys == null) ? null : get(w.keys, ss);
+    }
+
+    public ElemStyle get(Relation r)
+    {
+        StyleSet ss = getStyleSet(null, false);
+        return (ss == null || r.keys == null) ? null : get(r.keys, ss);
+    }
+
+    private boolean isArea(Map<String, String> keys, StyleSet ss)
+    {
+        Iterator<String> iterator = keys.keySet().iterator();
+        while(iterator.hasNext())
+        {
+            String key = iterator.next();
+            String val = keys.get(key);
+            if(ss.areas.containsKey("n" + key + "=" + val)
+            || ss.areas.containsKey("n" + key + "=" + OsmUtils.getNamedOsmBoolean(val))
+            || ss.areas.containsKey("x" + key))
+                return true;
         }
         return false;
     }
+
+    public boolean isArea(OsmPrimitive o)
+    {
+        StyleSet ss = getStyleSet(null, false);
+        return (ss != null && o.keys != null && !(o instanceof Node))
+        ? isArea(o.keys, ss) : false;
+    }
+
     public boolean hasAreas()
     {