Changeset 3590 in osm for applications/editors/josm

Timestamp:

2007-07-14T23:25:09+02:00 (17 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

Files:

• src/mappaint/ElemStyleHandler.java (modified) (4 diffs)
• src/mappaint/ElemStyles.java (modified) (2 diffs)
• styles/standard/elemstyles.xml (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))
                                 {

applications/editors/josm/plugins/mappaint/styles/standard/elemstyles.xml

@@ -9 +9 @@
 4. area attributes
                 - colour
-5. amenity attributes
+5. icon attributes
                 - icon path to icon , relative from where this file is
+
+Using both area and line attributes for the same key/value pair doesn't work!
 -->
 
@@ -712 +714 @@
                 <condition k="amenity" v="parking" />
                 <icon annotate="true" src="carpark.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-        </rule>
-
-<!-- enabling parking areas will hide single parking nodes COMPLETELY.
-     unless this is fixed in mappaint, disable the area for now!
-        <rule>
-                <condition k="amenity" v="parking" />
-                <icon annotate="true" src="carpark.png" />
                 <area colour="#f7efb7"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
         </rule>
--->
 
         <rule>