Changeset 3590 in osm for applications/editors/josm/plugins/mappaint/src

Timestamp:

2007-07-14T23:25:09+02:00 (18 years ago)

Author:

ulf

Message:

make it possible to have both an icon and an area for the same key/value pair (in a single or two rules - as you like). I've used it for amenity=parking, but this will probably be useful for other key/values as well.

Mixing area and line is still not possible, basically because JOSM core doesn't make a difference here (it's both just a way for JOSM). Fortunately, rules with both area and line possible are pretty rare.

Location:

applications/editors/josm/plugins/mappaint/src/mappaint

Files:

• ElemStyleHandler.java (modified) (4 diffs)
• ElemStyles.java (modified) (2 diffs)

applications/editors/josm/plugins/mappaint/src/mappaint/ElemStyleHandler.java

@@ -16 +16 @@
 {
     boolean inDoc, inRule, inCondition, inElemStyle, inLine, inIcon, inArea;
-    ElemStyle curStyle;
+    ElemStyle curLineStyle=null;
+    ElemStyle curIconStyle=null;
+    ElemStyle curAreaStyle=null;
     ElemStyles styles;
     String curKey, curValue ;
@@ -140 +142 @@
         {
             inRule = false;
-            styles.add (curKey, curValue, curStyle);
+                        if(curLineStyle != null)
+                        {
+                styles.add (curKey, curValue, curLineStyle);
+                                curLineStyle = null;
+                        }
+                        if(curIconStyle != null)
+                        {
+                styles.add (curKey, curValue, curIconStyle);
+                                curIconStyle = null;
+                        }
+                        if(curAreaStyle != null)
+                        {
+                styles.add (curKey, curValue, curAreaStyle);
+                                curAreaStyle = null;
+                        }
         }
         else if (inCondition && qName.equals("condition"))
@@ -147 +163 @@
         {
             inLine = false;
-            curStyle = new LineElemStyle(curWidth,curRealWidth, curColour,
+            curLineStyle = new LineElemStyle(curWidth,curRealWidth, curColour,
                                                                                 curMinZoom);
                                                 curWidth=1;
@@ -155 +171 @@
         {
             inIcon = false;
-            curStyle = new IconElemStyle(curIcon,curAnnotate,curMinZoom);
+            curIconStyle = new IconElemStyle(curIcon,curAnnotate,curMinZoom);
         }
         else if (inArea && qName.equals("area"))
         {
             inArea = false;
-            curStyle = new AreaElemStyle (curColour,curMinZoom);
+            curAreaStyle = new AreaElemStyle (curColour,curMinZoom);
         }
 

applications/editors/josm/plugins/mappaint/src/mappaint/ElemStyles.java

@@ -17 +17 @@
         {
                 String key = k + "=" + v;
+                
+                /* unfortunately, there don't seem to be an efficient way to */
+                /* find out, if a given OsmPrimitive is an area or not, */
+                /* so distinguish only between way and node here - for now */
+                if(style instanceof AreaElemStyle) {
+                        key = key + "way";
+                }
+                else if(style instanceof LineElemStyle) {
+                        key = key + "way";
+                }
+                else if(style instanceof IconElemStyle) {
+                        key = key + "node";
+                }
                 styles.put(key, style);
         }
@@ -24 +37 @@
                 if(p.keys!=null)
                 {
+                        String classname;
+                        
+                        if(p instanceof org.openstreetmap.josm.data.osm.Node) {
+                                classname = "node";
+                        } else {
+                                classname = "way";
+                        }
                         Iterator<String> iterator = p.keys.keySet().iterator();
                         while(iterator.hasNext())       
                         {
                                 String key = iterator.next();
-                                String kv = key + "=" + p.keys.get(key);
+                                String kv = key + "=" + p.keys.get(key) + classname;
                                 if(styles.containsKey(kv))
                                 {