Changeset 29989 in osm for applications/editors/josm/plugins/canvec_helper

Timestamp:

2013-10-02T10:56:55+02:00 (11 years ago)

Author:

clever

Message:

JOSM/Canvec_helper: fixed a crash caused by osm directory being renamed to OSM

Location:

applications/editors/josm/plugins/canvec_helper

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/canvec_helper/CanVecTile.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/canvec_helper/CanvecLayer.java (modified) (3 diffs)

applications/editors/josm/plugins/canvec_helper/build.xml

@@ -2 +2 @@
 <project name="canvec_helper" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="JOSM/Canvec_helper: update to new menu structure"/>
+    <property name="commit.message" value="JOSM/Canvec_helper: fixed a crash caused by osm directory being renamed to OSM"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="6162"/>

applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanVecTile.java

@@ -178 +178 @@
         }
         public String getDownloadUrl() {
-                return String.format("http://ftp2.cits.rncan.gc.ca/osm/pub/%1$03d/%2$s/%1$03d%2$s%3$02d.zip",corda,cordb,cordc);
+                return String.format("http://ftp2.cits.rncan.gc.ca/OSM/pub/%1$03d/%2$s/%1$03d%2$s%3$02d.zip",corda,cordb,cordc);
         }
         private ZipFile open_zip() throws IOException {
@@ -199 +199 @@
                 while (entries.hasMoreElements()) {
                         ZipEntry entry = entries.nextElement();
+                        if (entry.getName().equals("Metadata.txt")) continue;
                         sub_tile_ids.add(entry.getName());
                         zip_scanned = true;
@@ -220 +221 @@
                                         Main.worker.submit(temp.getPostLayerTask());
                                         Main.main.addLayer(temp.getLayer());
+                                        temp.getLayer().data.setUploadDiscouraged(false);
                                 }
                         }

applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecLayer.java

@@ -51 +51 @@
                         long start = System.currentTimeMillis();
                         Pattern p = Pattern.compile("(\\d\\d\\d)([A-Z]\\d\\d).*");
-                        MirroredInputStream index = new MirroredInputStream("http://ftp2.cits.rncan.gc.ca/osm/pub/ZippedOsm.txt");
+                        MirroredInputStream index = new MirroredInputStream("http://ftp2.cits.rncan.gc.ca/OSM/pub/ZippedOsm.txt");
                         BufferedReader br = new BufferedReader(new InputStreamReader(index));
                         String line;
@@ -69 +69 @@
                                         }
                                         last_cell = cell;
-                                } else System.out.print("bad line '" + line + "'\n");
+                                } else if (line.contains("Metadata.txt")) {
+                                } else {
+                                                System.out.print("bad line '" + line + "'\n");
+                                }
                         }
                         br.close();
@@ -79 +82 @@
                 } catch (IOException e) {
                         System.out.println("exception getting index");
+                        e.printStackTrace();
                 }
         }