Changeset 1196 in josm

Timestamp:

2008-12-31T12:35:50+01:00 (14 years ago)

Author:

stoecker

Message:

partly fix #1720. Patch by Russ Nelson

Location:

trunk

Files:

• presets/presets.xml (modified) (7 diffs)
• src/org/openstreetmap/josm/actions/OpenFileAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/actions/SplitWayAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/OsmReader.java (modified) (4 diffs)

trunk/presets/presets.xml

@@ -764 +764 @@
                 </item>
 
-                <item name="Signpost">
+                <item name="Signpost" icon="presets/empty.png">
                         <key key="amenity" value="signpost" />
                 </item>
@@ -1127 +1127 @@
                 </item>
 
-                <item name="Ferry Terminal">
+                <item name="Ferry Terminal" icon="presets/empty.png">
                         <label text="Edit Ferry Terminal" />
                         <key key="amenity" value="ferry_terminal" />
@@ -1470 +1470 @@
                 </item>
 
-                <item name="Chalet">
+                <item name="Chalet" icon="presets/empty.png">
                         <label text="Edit Chalet" />
                         <key key="tourism" value="chalet" />
@@ -2019 +2019 @@
                 </item>
 
-                <item name="Embassy">
+                <item name="Embassy" icon="presets/empty.png">
                         <label text="Edit Embassy" />
                         <key key="amenity" value="embassy" />
@@ -2434 +2434 @@
 
         <group name="Health" icon="presets/pharmacy.png">
-                <item name="Doctors">
+                <item name="Doctors" icon="presets/empty.png">
                         <label text="Edit Doctors" />
                         <key key="amenity" value="doctors" />
@@ -2440 +2440 @@
                 </item>
                 
-                <item name="Dentist">
+                <item name="Dentist" icon="presets/empty.png">
                         <label text="Edit Dentist" />
                         <key key="amenity" value="dentist" />
@@ -2469 +2469 @@
                 </item>
 
-                <item name="Veterinary">
+                <item name="Veterinary" icon="presets/empty.png">
                         <label text="Edit Veterinary" />
                         <key key="amenity" value="veterinary" />

trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java

@@ -75 +75 @@
         String fn = file.getName();
         if (ExtensionFileFilter.filters[ExtensionFileFilter.OSM].acceptName(fn)) {
-            DataSet dataSet = OsmReader.parseDataSet(new FileInputStream(file), null, Main.pleaseWaitDlg);
+            OsmReader osm = OsmReader.parseDataSetOsm(new FileInputStream(file), null, Main.pleaseWaitDlg);
+            DataSet dataSet = osm.getDs();
             OsmDataLayer layer = new OsmDataLayer(dataSet, file.getName(), file);
             Main.main.addLayer(layer);
             layer.fireDataChange();
+            if (osm.getParseNotes().length() != 0) {
+                /* display at most five lines */
+                String notes = osm.getParseNotes();
+                int j = 0;
+                for (int i = 0; i < 5; i++) {
+                    j = notes.indexOf('\n', j + 1);
+                }
+                JOptionPane.showMessageDialog(Main.parent, notes.substring(0, j));
+            }
         }
         else

trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

@@ -114 +114 @@
             if (wayOccurenceCounter.isEmpty()) {
                 JOptionPane.showMessageDialog(Main.parent,
-                        trn("The selected node is no inner part of any way.",
-                                "The selected nodes are no inner part of any way.", selectedNodes.size()));
+                trn("The selected node is not in the middle of any way.",
+                "The selected nodes are not in the middle of any way.",
+                selectedNodes.size()));
                 return;
             }

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

@@ -345 +345 @@
             }
         }
-        Boolean isMultipolygon = "multipolygon".equals(r.keys.get("type"));
-        if (!drawMultipolygon || !isMultipolygon)
-        {
-            if(r.selected && !isMultipolygon)
+        if (!drawMultipolygon || !"multipolygon".equals(r.keys.get("type")))
+        {
+            if(r.selected)
             {
                 for (RelationMember m : r.members)

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

@@ -60 +60 @@
       */
      private DataSet ds = new DataSet();
+     public DataSet getDs() { return ds; }
+
+     /**
+      * Record warnings.  If there were any data inconsistencies, append
+      * a newline-terminated string.
+      */
+     private String parseNotes = new String();
+     public String getParseNotes() {
+         return parseNotes;
+     }
 
      /**
@@ -333 +343 @@
                     Node n = findNode(id);
                     if (n == null) {
+                         parseNotes += tr("Skipping a way because it includes a node that doesn't exist: {0}\n", id);
                          failed = true;
                          break;
@@ -435 +446 @@
       */
      public static DataSet parseDataSet(InputStream source, DataSet ref, PleaseWaitDialog pleaseWaitDlg) throws SAXException, IOException {
+          return parseDataSetOsm(source, ref, pleaseWaitDlg).ds;
+     }
+
+     public static OsmReader parseDataSetOsm(InputStream source, DataSet ref, PleaseWaitDialog pleaseWaitDlg) throws SAXException, IOException {
           OsmReader osm = new OsmReader();
           osm.references = ref == null ? new DataSet() : ref;
@@ -468 +483 @@
                     o.id = 0;
 
-          return osm.ds;
+          return osm;
      }
 }