Changeset 1353 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2009-01-31T19:09:46+01:00 (18 years ago)

Author:

stoecker

Message:

apply patch by xeen - #2114

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• OsmReader.java (modified) (8 diffs)
• OsmServerReader.java (modified) (3 diffs)

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

@@ -52 +52 @@
 public class OsmReader {
 
-     static long tagsN = 0;
-     static long nodesN = 0;
-     static long waysN = 0;
-     static long relationsN = 0;
-     static long membersN = 0;
+//     static long tagsN = 0;
+//     static long nodesN = 0;
+//     static long waysN = 0;
+//     static long relationsN = 0;
+//     static long membersN = 0;
 
      static InputStream currSource;
@@ -143 +143 @@
           private OsmPrimitive current;
           private String generator;
-          int n = 0;
-          
+//          int n = 0;
+
           @Override public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException {
                try {
-                    if(n%100000 == 0) {
-                        try {
-                            FileInputStream fis = (FileInputStream)currSource;
-                            FileChannel channel = fis.getChannel();
-                            double perc = (((double)channel.position()) / ((double)channel.size()) * 100.0);
-                            System.out.format(" " + (int)perc + "%%");
-                        }
-                        catch(java.lang.ClassCastException cce) {
-                        }
-                        catch(IOException e) {
-                            System.out.format("Error reading file position " + e);
-                        }
-                    }
-                    n++;                    
+//                    if(n%100000 == 0) {
+//                        try {
+//                            FileInputStream fis = (FileInputStream)currSource;
+//                            FileChannel channel = fis.getChannel();
+//                            double perc = (((double)channel.position()) / ((double)channel.size()) * 100.0);
+//                            System.out.format(" " + (int)perc + "%%");
+//                        }
+//                        catch(java.lang.ClassCastException cce) {
+//                        }
+//                        catch(IOException e) {
+//                            System.out.format("Error reading file position " + e);
+//                        }
+//                    }
+//                    n++;
 
                     if (qName.equals("osm")) {
@@ -213 +213 @@
 
                     } else if (qName.equals("node")) {
-                         nodesN++;
+//                         nodesN++;
                          current = new Node(new LatLon(getDouble(atts, "lat"), getDouble(atts, "lon")));
                          readCommon(atts, current);
                          nodes.put(current.id, (Node)current);
                     } else if (qName.equals("way")) {
-                         waysN++;
+//                         waysN++;
                          current = new OsmPrimitiveData();
                          readCommon(atts, current);
@@ -234 +234 @@
 
                     } else if (qName.equals("relation")) {
-                         relationsN++;
+//                         relationsN++;
                          current = new OsmPrimitiveData();
                          readCommon(atts, current);
                          relations.put((OsmPrimitiveData)current, new LinkedList<RelationMemberData>());
                     } else if (qName.equals("member")) {
-                         membersN++;
+//                         membersN++;
                          Collection<RelationMemberData> list = relations.get(current);
                          if (list == null)
@@ -257 +257 @@
 
                     } else if (qName.equals("tag")) {
-                         tagsN++;
+//                         tagsN++;
                          current.put(atts.getValue("k"), atts.getValue("v"));
                     }
@@ -439 +439 @@
           for (Way wy : ds.ways)
             hm.put(wy.id, wy);
-          
+
           // pass 2 - sort out members
           for (Entry<OsmPrimitiveData, Collection<RelationMemberData>> e : relations.entrySet()) {
@@ -490 +490 @@
           osm.references = ref == null ? new DataSet() : ref;
 
-          
+
           currSource = source;
-          
+
           // phase 1: Parse nodes and read in raw ways
           InputSource inputSource = new InputSource(new InputStreamReader(source, "UTF-8"));
           try {
              SAXParserFactory.newInstance().newSAXParser().parse(inputSource, osm.new Parser());
-        } catch (ParserConfigurationException e1) {
+          } catch (ParserConfigurationException e1) {
              e1.printStackTrace(); // broken SAXException chaining
              throw new SAXException(e1);
-        }
-            
+          }
+
           Main.pleaseWaitDlg.currentAction.setText(tr("Prepare OSM data..."));
           Main.pleaseWaitDlg.setIndeterminate(true); 
 
-          System.out.println("");
-          System.out.println("Parser finished: Tags " + tagsN + " Nodes " + nodesN + " Ways " + waysN + 
-            " Relations " + relationsN + " Members " + membersN);
+//          System.out.println("Parser finished: Tags " + tagsN + " Nodes " + nodesN + " Ways " + waysN +
+//            " Relations " + relationsN + " Members " + membersN);
 
           for (Node n : osm.nodes.values())
@@ -525 +524 @@
                     o.id = 0;
 
-          System.out.println("Data loaded!");
+//          System.out.println("Data loaded!");
           Main.pleaseWaitDlg.setIndeterminate(false); 
           Main.pleaseWaitDlg.progress.setValue(0); 
-          
+
           return osm;
      }

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

@@ -42 +42 @@
     protected InputStream getInputStreamRaw(String urlStr, PleaseWaitDialog pleaseWaitDlg) throws IOException {
 
-        System.out.println("download: "+urlStr);
+//        System.out.println("download: "+urlStr);
         initAuthentication();
         URL url = new URL(urlStr);
@@ -55 +55 @@
 
         activeConnection.setConnectTimeout(15000);
-        
+
         try {
             activeConnection.connect();
@@ -62 +62 @@
             throw new IOException(tr("Couldn't connect to the osm server. Please check your internet connection."));
         }
-        
+
         if (isAuthCancelled() && activeConnection.getResponseCode() == 401)
             return null;