Changeset 735 in josm for trunk/src

Timestamp:

2008-07-24T12:06:08+02:00 (16 years ago)

Author:

stoecker

Message:

added boolean checks to mappaint element styles

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint

Files:

• ElemStyleHandler.java (modified) (5 diffs)
• MapPaintStyles.java (modified) (3 diffs)

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

@@ -17 +17 @@
         String curKey = null;
         String curValue = null;
+        String curBoolean = null;
         int curLineWidth = -1;
         int curLineRealWidth = 0;
@@ -56 +57 @@
                                 for (int count=0; count<atts.getLength(); count++) {
                                         if(atts.getQName(count).equals("k"))
-                                                curKey = atts.getValue(count);        
+                                        {
+                                                curKey = atts.getValue(count);
+                                                curBoolean = null;
+                                                curValue = null;
+                                        }
                                         else if(atts.getQName(count).equals("v"))
-                                                curValue = atts.getValue(count);        
+                                                curValue = atts.getValue(count);
+                                        else if(atts.getQName(count).equals("b"))
+                                                curBoolean = atts.getValue(count);
                                 }
                         } else if (qName.equals("line")) {
@@ -127 +134 @@
                                 newStyle = new LineElemStyle(curLineWidth, curLineRealWidth, curLineColour, 
                                                 curLineDashed, curScaleMax, curScaleMin);
-                                MapPaintStyles.add(curKey, curValue, newStyle);
+                                MapPaintStyles.add(curKey, curValue, curBoolean, newStyle);
                                 curLineWidth    = -1;
                                 curLineRealWidth= 0;
@@ -136 +143 @@
                         if (curIcon != null) {
                                 newStyle = new IconElemStyle(curIcon, curIconAnnotate, curScaleMax, curScaleMin);
-                                MapPaintStyles.add(curKey, curValue, newStyle);
+                                MapPaintStyles.add(curKey, curValue, curBoolean, newStyle);
                                 curIcon                 = null;
                                 curIconAnnotate = true;
@@ -142 +149 @@
                         if (curAreaColour != null) {
                                 newStyle = new AreaElemStyle (curAreaColour, curScaleMax, curScaleMin);
-                                MapPaintStyles.add(curKey, curValue, newStyle);
+                                MapPaintStyles.add(curKey, curValue, curBoolean, newStyle);
                                 curAreaColour   = null;
                         }

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

@@ -9 +9 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
@@ -75 +76 @@
         }
 
-        static int nr = 0;
+//      static int nr = 0;
 
-        public static void add (String k, String v, ElemStyle style) {
+        public static void add (String k, String v, String b, ElemStyle style) {
                 ElemStyle  old_style;
-                String key = k + "=" + v;
+                String key;
 
                 /* 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";
-                }
+                if (style instanceof AreaElemStyle)
+                        key = "way";
+                else if (style instanceof LineElemStyle)
+                        key = "way";
+                else if (style instanceof IconElemStyle)
+                        key = "node";
+                else
+                        key = "";
+
+                if(v != null)
+                        key += "n" + k + "=" + v;
+                else if(b != null)
+                        key += "b" + k  + "=" + OsmUtils.getNamedOsmBoolean(b);
+                else
+                        key += "x" + k;
+
                 /* avoid duplicates - for now */
                 old_style = styles.get(key);
@@ -120 +130 @@
                         {
                                 String key = iterator.next();
-                                kv = key + "=" + p.keys.get(key) + classname;
-                                if (styles.containsKey(kv))     {
+                                kv = classname + "n" + key + "=" + p.keys.get(key);
+                                if (styles.containsKey(kv))
                                         return styles.get(kv);
-                                }
+                                kv = classname + "b" + key + "=" + OsmUtils.getNamedOsmBoolean(p.keys.get(key));
+                                if (styles.containsKey(kv))
+                                        return styles.get(kv);
+                                kv = classname + "x" + key;
+                                if (styles.containsKey(kv))
+                                        return styles.get(kv);
                         }
 
                         // not a known key/value combination
-                        boolean first_line = true;
+//                      boolean first_line = true;
 
                         // filter out trivial tags and show the rest
-                        iterator = p.keys.keySet().iterator();
-                        while (iterator.hasNext()) {
-                                String key = iterator.next();
-                                kv = key + "=" + p.keys.get(key);
-                                if (!kv.startsWith("created_by=") &&
-                                                !kv.startsWith("converted_by=") &&
-                                                !kv.startsWith("source=") &&
-                                                !kv.startsWith("note=") &&
-                                                !kv.startsWith("layer=") &&
-                                                !kv.startsWith("bridge=") &&
-                                                !kv.startsWith("tunnel=") &&
-                                                !kv.startsWith("oneway=") &&
-                                                !kv.startsWith("speedlimit=") &&
-                                                !kv.startsWith("motorcar=") &&
-                                                !kv.startsWith("horse=") &&
-                                                !kv.startsWith("bicycle=") &&
-                                                !kv.startsWith("foot=")
-                                ) {
+//                      iterator = p.keys.keySet().iterator();
+//                      while (iterator.hasNext()) {
+//                              String key = iterator.next();
+//                              kv = key + "=" + p.keys.get(key);
+//                              if (!kv.startsWith("created_by=") &&
+//                                              !kv.startsWith("converted_by=") &&
+//                                              !kv.startsWith("source=") &&
+//                                              !kv.startsWith("note=") &&
+//                                              !kv.startsWith("layer=") &&
+//                                              !kv.startsWith("bridge=") &&
+//                                              !kv.startsWith("tunnel=") &&
+//                                              !kv.startsWith("oneway=") &&
+//                                              !kv.startsWith("speedlimit=") &&
+//                                              !kv.startsWith("motorcar=") &&
+//                                              !kv.startsWith("horse=") &&
+//                                              !kv.startsWith("bicycle=") &&
+//                                              !kv.startsWith("foot=")
+//                              ) {
 
-                                        if (first_line) {
-                                                nr++;
-                                                //System.out.println("mappaint - rule not found[" + nr + "]: " + kv + " id:" + p.id);
-                                        } else {
-                                                //System.out.println("mappaint - rule not found[" + nr + "]: " + kv);
-                                        }
-                                        first_line=false;
-                                }
-                        }
+//                                      if (first_line) {
+//                                              nr++;
+//                                              System.out.println("mappaint - rule not found[" + nr + "]: " + kv + " id:" + p.id);
+//                                      } else {
+//                                              System.out.println("mappaint - rule not found[" + nr + "]: " + kv);
+//                                      }
+//                                      first_line=false;
+//                              }
+//                      }
                 }