Changeset 1696 in josm

Timestamp:

Jun 27, 2009 1:06:24 AM (4 years ago)

Author:

stoecker

Message:

fixed mappaint area style handling for closed ways a little bit again

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/visitor/MapPaintVisitor.java (modified) (1 diff)
• gui/dialogs/relation/GenericRelationEditor.java (modified) (1 diff)
• gui/mappaint/ElemStyles.java (modified) (1 diff)
• io/GpxImporter.java (modified) (2 diffs)
• io/OsmImporter.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java

@@ -833 +833 @@
             for (Way w : outer)
             {
-               if(wayStyle == null || !(wayStyle instanceof AreaElemStyle))
-                   wayStyle = styles.get(w);
+               if(wayStyle == null)
+                   wayStyle = styles.getArea(w);
             }
             r.mappaintStyle = wayStyle;

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -366 +366 @@
             if (way1 != null) {
                 int next = i+1;
-                while (next < clone.members.size()) {
-                    m = clone.members.get(next++);
+                while (next <= clone.members.size()) {
+                    m = clone.members.get(next == clone.members.size() ? 0 : next);
+                    next++;
                     depth = 0;
                     while (m != null && depth < 10) {

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

@@ -126 +126 @@
         }
 
+        public ElemStyle getArea(Way osm)
+        {
+            if(osm.keys != null)
+            {
+                /* force area mode also for unclosed ways */
+                ElemStyle style = get(osm.keys, false);
+                if(style != null && style instanceof AreaElemStyle)
+                    return style;
+            }
+            return null;
+        }
+
         public IconElemStyle getIcon(OsmPrimitive osm)
         {

trunk/src/org/openstreetmap/josm/io/GpxImporter.java

@@ -6 +6 @@
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -50 +51 @@
                     Main.main.addLayer(ml);
             }
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+            throw new IOException(tr("File \"{0}\" does not exist", file.getName()));
         } catch (SAXException e) {
             e.printStackTrace();
-            throw new IOException(tr("Could not read \"{0}\"", file.getName()));
+            throw new IOException(tr("Parsing file \"{0}\" failed", file.getName()));
         }
-
     }
-
 }

trunk/src/org/openstreetmap/josm/io/OsmImporter.java

@@ -38 +38 @@
         } catch (FileNotFoundException e) {
             e.printStackTrace();
-            throw new IOException(tr("Could not read \"{0}\"", file.getName()));
+            throw new IOException(tr("File \"{0}\" does not exist", file.getName()));
         } catch (SAXException e) {
             e.printStackTrace();
-            throw new IOException(tr("Could not read \"{0}\"", file.getName()));
+            throw new IOException(tr("Parsing file \"{0}\" failed", file.getName()));
         }
     }