Index: applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanVecTile.java =================================================================== --- applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanVecTile.java (revision 30737) +++ applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanVecTile.java (revision 30738) @@ -23,298 +23,298 @@ public class CanVecTile { - CanvecLayer layer; - public boolean can_download = false; - private ArrayList sub_tile_ids = new ArrayList<>(); - private boolean zip_scanned = false; - - private ArrayList sub_tiles = new ArrayList<>(); - private boolean sub_tiles_made = false; - - private ArrayList index; - private int depth; - - int corda,cordc; - private boolean valid = false; - String cordb,cordd; - private Bounds bounds; - public String tileid; - public CanVecTile(String tileid,CanvecLayer layer) { - String parta,partb,partc,partd; - parta = tileid.substring(0,3); - partb = tileid.substring(3, 4); - partc = tileid.substring(4, 6); - partd = tileid.substring(6); - int a,c; - a = Integer.parseInt(parta); - c = Integer.parseInt(partc); - real_init(a,partb,c,partd,layer,new ArrayList()); - } - public CanVecTile(int a,String b,int c,String d,CanvecLayer layer,ArrayList index) { - real_init(a,b,c,d,layer,index); - } - public void real_init(int a,String b,int c,String d,CanvecLayer layer, ArrayList index) { - this.index = index; - this.layer = layer; - corda = a; - cordb = b; - cordc = c; - cordd = d; - double zero_point_lat,zero_point_lon; - double lat_span,lon_span; - double lat2,lon2; - if ((a >= 0) && (a <= 119)) { // main block of tiles - int column = a / 10; - int row = a % 10; - if (row > 6) { - // cant handle x7 x8 and x9 yet - return; - } - zero_point_lat = 40 + 4 * row; - zero_point_lon = -56 - 8 * column; - - // size of each grid - if (row <= 6) { - // each is 4x8 degrees, broken into a 4x4 grid - lat_span = 4; - lon_span = 8; - depth = 1; - } else { - return; - } - } else { // last few tiles, very far north - return; - } - - // a 4x4 grid of A thru P - // map A-P to 1-16 - int grid2; - if (b == "") grid2 = 0; - else grid2 = b.charAt(0) - 64; - int rows1[] = { 0, 0,0,0,0, 1,1,1,1, 2,2,2,2, 3,3,3,3 }; - int cols1[] = { 0, 3,2,1,0, 0,1,2,3, 3,2,1,0, 0,1,2,3 }; - lat2 = zero_point_lat + (lat_span/4)*rows1[grid2]; - lon2 = zero_point_lon + (lon_span/4)*cols1[grid2]; - - if (grid2 != 0) { - lat_span = lat_span / 4; - lon_span = lon_span / 4; - depth = 2; - } - - int rows3[] = { 0, 0,0,0,0, 1,1,1,1, 2,2,2,2, 3,3,3,3 }; - lat2 = lat2 + (lat_span/4)*rows3[c]; - int cols3[] = { 0, 3,2,1,0, 0,1,2,3, 3,2,1,0, 0,1,2,3 }; - lon2 = lon2 + (lon_span/4)*cols3[c]; - - if (c != 0) { - lat_span = lat_span / 4; - lon_span = lon_span / 4; - depth = 3; - } - - if (cordd != "") { - depth = 4; - System.out.println("cordd: "+cordd); - String foo[] = cordd.split("\\."); - for (int i = 0; i < foo.length; i++) { - int cell; - System.out.println(foo[i]); - if (foo[i] == "osm") break; - if (foo[i] == "") continue; - try { - cell = Integer.parseInt(foo[i]); - } catch (NumberFormatException e) { - continue; - } - switch (cell) { - case 0: - break; - case 1: - lat2 = lat2 + lat_span/2; - break; - case 2: - lat2 = lat2 + lat_span/2; - lon2 = lon2 + lon_span/2; - break; - case 3: - lon2 = lon2 + lon_span/2; - break; - } - lat_span = lat_span/2; - lon_span = lon_span/2; - } - } - - bounds = new Bounds(lat2,lon2,lat2+lat_span,lon2+lon_span); - if (cordb == "") this.tileid = String.format("%03d",corda); - else if (cordc == 0) this.tileid = String.format("%03d%s",corda,cordb); - else if (cordd == "") this.tileid = String.format("%03d%s%02d",corda,cordb,cordc); - else this.tileid = String.format("%03d%s%02d%s",corda,cordb,cordc,cordd); - valid = true; - //debug(index.toString()); - //debug("creating tileid: "+this.tileid); - } - public boolean isValid() { return valid; } - public String getTileId() { - return this.tileid; - } - private void debug(String line) { - System.out.println(depth + "_" + tileid + ": " + line); - } - public boolean isVisible(Bounds view) { - return view.intersects(bounds); - } - public Point[] getCorners(MapView mv) { - LatLon min = bounds.getMin(); - LatLon max = bounds.getMax(); - LatLon x1 = new LatLon(min.lat(),max.lon()); - LatLon x2 = new LatLon(max.lat(),min.lon()); - return new Point[] { - mv.getPoint(min), // south west - mv.getPoint(x1), - mv.getPoint(max), - mv.getPoint(x2) // north west - }; - } - 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); - } - private ZipFile open_zip() throws IOException { - File download_path = new File(layer.plugin_self.getPluginDir() + File.separator); - download_path.mkdir(); - CachedFile tile_zip = new CachedFile(getDownloadUrl()).setDestDir(download_path.toString()); - return new ZipFile(tile_zip.getFile()); - } - public void downloadSelf() { - if (zip_scanned) return; - ZipFile zipFile; - try { - zipFile = open_zip(); - } catch (IOException e) { - e.printStackTrace(); - return; - } - Enumeration entries = zipFile.entries(); - while (entries.hasMoreElements()) { - ZipEntry entry = entries.nextElement(); - if (entry.getName().equals("Metadata.txt")) continue; - sub_tile_ids.add(entry.getName()); - zip_scanned = true; - CanVecTile final_tile = new CanVecTile(entry.getName(),layer); - if (final_tile.isValid()) sub_tiles.add(final_tile); - } - } - public void load_raw_osm() { - ZipFile zipFile; - try { - zipFile = open_zip(); - Enumeration entries = zipFile.entries(); - while (entries.hasMoreElements()) { - ZipEntry entry = entries.nextElement(); - if (tileid.equals(entry.getName())) { - debug("found myself!"); - InputStream rawtile = zipFile.getInputStream(entry); - OsmImporter importer = new OsmImporter(); - debug("loading raw osm"); - OsmImporterData temp = importer.loadLayer(rawtile, null, entry.getName(), null); - Main.worker.submit(temp.getPostLayerTask()); - Main.main.addLayer(temp.getLayer()); - temp.getLayer().data.setUploadDiscouraged(false); - } - } - } catch (IOException e) { - e.printStackTrace(); - return; - } catch (IllegalDataException e) { - e.printStackTrace(); - return; - } - } - private void make_sub_tiles(int layer) { - ArrayList buffer = new ArrayList<>(); - Pattern p; - if (sub_tiles_made) return; - switch (layer) { - case 1: - p = Pattern.compile("\\d\\d\\d([A-Z]).*"); - String last_cell = ""; - for (int i = 0; i < index.size(); i++) { - Matcher m = p.matcher(index.get(i)); - m.matches(); - - String cell = m.group(1); - if (cell.equals(last_cell)) { - buffer.add(m.group(0)); - } else if (last_cell == "") { - buffer.add(m.group(0)); - } else { - sub_tiles.add(new CanVecTile(corda,last_cell,0,"",this.layer,buffer)); - buffer = new ArrayList<>(); - buffer.add(m.group(0)); - } - last_cell = cell; - } - sub_tiles.add(new CanVecTile(corda,last_cell,0,"",this.layer,buffer)); - break; - case 2: - p = Pattern.compile("\\d\\d\\d[A-Z](\\d\\d).*"); - int last_cell2 = -1; - for (int i = 0; i < index.size(); i++) { - Matcher m = p.matcher(index.get(i)); - m.matches(); - - int cell = Integer.parseInt(m.group(1)); - if (cell == last_cell2) { - buffer.add(m.group(0)); - } else if (last_cell2 == -1) { - buffer.add(m.group(0)); - } else { - sub_tiles.add(new CanVecTile(corda,cordb,last_cell2,"",this.layer,buffer)); - buffer = new ArrayList<>(); - buffer.add(m.group(0)); - } - last_cell2 = cell; - } - if (last_cell2 != -1) sub_tiles.add(new CanVecTile(corda,cordb,last_cell2,"",this.layer,buffer)); - break; - } - sub_tiles_made = true; - } - public void paint(Graphics2D g, MapView mv, Bounds bounds, int max_zoom) { - boolean show_sub_tiles = false; - if (!isVisible(bounds)) return; - if (depth == 4) { - layer.openable.add(this); - } - if ((depth == 3) && (bounds.getArea() < 0.5)) { // 022B01 - if (zip_scanned) { - show_sub_tiles = true; - } else if (can_download) { - downloadSelf(); - show_sub_tiles = true; - } else { - layer.downloadable.add(this); - } - } else if ((depth == 2) && (bounds.getArea() < 20)) { // its a layer2 tile - make_sub_tiles(2); - show_sub_tiles = true; - } else if ((depth == 1) && (bounds.getArea() < 40)) { // its a layer1 tile and zoom too small - // draw layer2 tiles for self - make_sub_tiles(1); - show_sub_tiles = true; - } - if (show_sub_tiles && (depth < max_zoom)) { - for (int i = 0; i < sub_tiles.size(); i++) { - CanVecTile tile = sub_tiles.get(i); - tile.paint(g,mv,bounds,max_zoom); - } - } else { - Point corners[] = getCorners(mv); - int xs[] = { corners[0].x, corners[1].x, corners[2].x, corners[3].x }; - int ys[] = { corners[0].y, corners[1].y, corners[2].y, corners[3].y }; - Polygon shape = new Polygon(xs,ys,4); - g.draw(shape); - g.drawString(getTileId(),corners[0].x,corners[0].y); - } - } + CanvecLayer layer; + public boolean can_download = false; + private ArrayList sub_tile_ids = new ArrayList<>(); + private boolean zip_scanned = false; + + private ArrayList sub_tiles = new ArrayList<>(); + private boolean sub_tiles_made = false; + + private ArrayList index; + private int depth; + + int corda,cordc; + private boolean valid = false; + String cordb,cordd; + private Bounds bounds; + public String tileid; + public CanVecTile(String tileid,CanvecLayer layer) { + String parta,partb,partc,partd; + parta = tileid.substring(0,3); + partb = tileid.substring(3, 4); + partc = tileid.substring(4, 6); + partd = tileid.substring(6); + int a,c; + a = Integer.parseInt(parta); + c = Integer.parseInt(partc); + real_init(a,partb,c,partd,layer,new ArrayList()); + } + public CanVecTile(int a,String b,int c,String d,CanvecLayer layer,ArrayList index) { + real_init(a,b,c,d,layer,index); + } + public void real_init(int a,String b,int c,String d,CanvecLayer layer, ArrayList index) { + this.index = index; + this.layer = layer; + corda = a; + cordb = b; + cordc = c; + cordd = d; + double zero_point_lat,zero_point_lon; + double lat_span,lon_span; + double lat2,lon2; + if ((a >= 0) && (a <= 119)) { // main block of tiles + int column = a / 10; + int row = a % 10; + if (row > 6) { + // cant handle x7 x8 and x9 yet + return; + } + zero_point_lat = 40 + 4 * row; + zero_point_lon = -56 - 8 * column; + + // size of each grid + if (row <= 6) { + // each is 4x8 degrees, broken into a 4x4 grid + lat_span = 4; + lon_span = 8; + depth = 1; + } else { + return; + } + } else { // last few tiles, very far north + return; + } + + // a 4x4 grid of A thru P + // map A-P to 1-16 + int grid2; + if (b == "") grid2 = 0; + else grid2 = b.charAt(0) - 64; + int rows1[] = { 0, 0,0,0,0, 1,1,1,1, 2,2,2,2, 3,3,3,3 }; + int cols1[] = { 0, 3,2,1,0, 0,1,2,3, 3,2,1,0, 0,1,2,3 }; + lat2 = zero_point_lat + (lat_span/4)*rows1[grid2]; + lon2 = zero_point_lon + (lon_span/4)*cols1[grid2]; + + if (grid2 != 0) { + lat_span = lat_span / 4; + lon_span = lon_span / 4; + depth = 2; + } + + int rows3[] = { 0, 0,0,0,0, 1,1,1,1, 2,2,2,2, 3,3,3,3 }; + lat2 = lat2 + (lat_span/4)*rows3[c]; + int cols3[] = { 0, 3,2,1,0, 0,1,2,3, 3,2,1,0, 0,1,2,3 }; + lon2 = lon2 + (lon_span/4)*cols3[c]; + + if (c != 0) { + lat_span = lat_span / 4; + lon_span = lon_span / 4; + depth = 3; + } + + if (cordd != "") { + depth = 4; + System.out.println("cordd: "+cordd); + String foo[] = cordd.split("\\."); + for (int i = 0; i < foo.length; i++) { + int cell; + System.out.println(foo[i]); + if (foo[i] == "osm") break; + if (foo[i] == "") continue; + try { + cell = Integer.parseInt(foo[i]); + } catch (NumberFormatException e) { + continue; + } + switch (cell) { + case 0: + break; + case 1: + lat2 = lat2 + lat_span/2; + break; + case 2: + lat2 = lat2 + lat_span/2; + lon2 = lon2 + lon_span/2; + break; + case 3: + lon2 = lon2 + lon_span/2; + break; + } + lat_span = lat_span/2; + lon_span = lon_span/2; + } + } + + bounds = new Bounds(lat2,lon2,lat2+lat_span,lon2+lon_span); + if (cordb == "") this.tileid = String.format("%03d",corda); + else if (cordc == 0) this.tileid = String.format("%03d%s",corda,cordb); + else if (cordd == "") this.tileid = String.format("%03d%s%02d",corda,cordb,cordc); + else this.tileid = String.format("%03d%s%02d%s",corda,cordb,cordc,cordd); + valid = true; + //debug(index.toString()); + //debug("creating tileid: "+this.tileid); + } + public boolean isValid() { return valid; } + public String getTileId() { + return this.tileid; + } + private void debug(String line) { + System.out.println(depth + "_" + tileid + ": " + line); + } + public boolean isVisible(Bounds view) { + return view.intersects(bounds); + } + public Point[] getCorners(MapView mv) { + LatLon min = bounds.getMin(); + LatLon max = bounds.getMax(); + LatLon x1 = new LatLon(min.lat(),max.lon()); + LatLon x2 = new LatLon(max.lat(),min.lon()); + return new Point[] { + mv.getPoint(min), // south west + mv.getPoint(x1), + mv.getPoint(max), + mv.getPoint(x2) // north west + }; + } + 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); + } + private ZipFile open_zip() throws IOException { + File download_path = new File(layer.plugin_self.getPluginDir() + File.separator); + download_path.mkdir(); + CachedFile tile_zip = new CachedFile(getDownloadUrl()).setDestDir(download_path.toString()); + return new ZipFile(tile_zip.getFile()); + } + public void downloadSelf() { + if (zip_scanned) return; + ZipFile zipFile; + try { + zipFile = open_zip(); + } catch (IOException e) { + e.printStackTrace(); + return; + } + Enumeration entries = zipFile.entries(); + while (entries.hasMoreElements()) { + ZipEntry entry = entries.nextElement(); + if (entry.getName().equals("Metadata.txt")) continue; + sub_tile_ids.add(entry.getName()); + zip_scanned = true; + CanVecTile final_tile = new CanVecTile(entry.getName(),layer); + if (final_tile.isValid()) sub_tiles.add(final_tile); + } + } + public void load_raw_osm() { + ZipFile zipFile; + try { + zipFile = open_zip(); + Enumeration entries = zipFile.entries(); + while (entries.hasMoreElements()) { + ZipEntry entry = entries.nextElement(); + if (tileid.equals(entry.getName())) { + debug("found myself!"); + InputStream rawtile = zipFile.getInputStream(entry); + OsmImporter importer = new OsmImporter(); + debug("loading raw osm"); + OsmImporterData temp = importer.loadLayer(rawtile, null, entry.getName(), null); + Main.worker.submit(temp.getPostLayerTask()); + Main.main.addLayer(temp.getLayer()); + temp.getLayer().data.setUploadDiscouraged(false); + } + } + } catch (IOException e) { + e.printStackTrace(); + return; + } catch (IllegalDataException e) { + e.printStackTrace(); + return; + } + } + private void make_sub_tiles(int layer) { + ArrayList buffer = new ArrayList<>(); + Pattern p; + if (sub_tiles_made) return; + switch (layer) { + case 1: + p = Pattern.compile("\\d\\d\\d([A-Z]).*"); + String last_cell = ""; + for (int i = 0; i < index.size(); i++) { + Matcher m = p.matcher(index.get(i)); + m.matches(); + + String cell = m.group(1); + if (cell.equals(last_cell)) { + buffer.add(m.group(0)); + } else if (last_cell == "") { + buffer.add(m.group(0)); + } else { + sub_tiles.add(new CanVecTile(corda,last_cell,0,"",this.layer,buffer)); + buffer = new ArrayList<>(); + buffer.add(m.group(0)); + } + last_cell = cell; + } + sub_tiles.add(new CanVecTile(corda,last_cell,0,"",this.layer,buffer)); + break; + case 2: + p = Pattern.compile("\\d\\d\\d[A-Z](\\d\\d).*"); + int last_cell2 = -1; + for (int i = 0; i < index.size(); i++) { + Matcher m = p.matcher(index.get(i)); + m.matches(); + + int cell = Integer.parseInt(m.group(1)); + if (cell == last_cell2) { + buffer.add(m.group(0)); + } else if (last_cell2 == -1) { + buffer.add(m.group(0)); + } else { + sub_tiles.add(new CanVecTile(corda,cordb,last_cell2,"",this.layer,buffer)); + buffer = new ArrayList<>(); + buffer.add(m.group(0)); + } + last_cell2 = cell; + } + if (last_cell2 != -1) sub_tiles.add(new CanVecTile(corda,cordb,last_cell2,"",this.layer,buffer)); + break; + } + sub_tiles_made = true; + } + public void paint(Graphics2D g, MapView mv, Bounds bounds, int max_zoom) { + boolean show_sub_tiles = false; + if (!isVisible(bounds)) return; + if (depth == 4) { + layer.openable.add(this); + } + if ((depth == 3) && (bounds.getArea() < 0.5)) { // 022B01 + if (zip_scanned) { + show_sub_tiles = true; + } else if (can_download) { + downloadSelf(); + show_sub_tiles = true; + } else { + layer.downloadable.add(this); + } + } else if ((depth == 2) && (bounds.getArea() < 20)) { // its a layer2 tile + make_sub_tiles(2); + show_sub_tiles = true; + } else if ((depth == 1) && (bounds.getArea() < 40)) { // its a layer1 tile and zoom too small + // draw layer2 tiles for self + make_sub_tiles(1); + show_sub_tiles = true; + } + if (show_sub_tiles && (depth < max_zoom)) { + for (int i = 0; i < sub_tiles.size(); i++) { + CanVecTile tile = sub_tiles.get(i); + tile.paint(g,mv,bounds,max_zoom); + } + } else { + Point corners[] = getCorners(mv); + int xs[] = { corners[0].x, corners[1].x, corners[2].x, corners[3].x }; + int ys[] = { corners[0].y, corners[1].y, corners[2].y, corners[3].y }; + Polygon shape = new Polygon(xs,ys,4); + g.draw(shape); + g.drawString(getTileId(),corners[0].x,corners[0].y); + } + } } Index: applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecHelper.java =================================================================== --- applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecHelper.java (revision 30737) +++ applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecHelper.java (revision 30738) @@ -8,15 +8,15 @@ public class CanvecHelper extends Plugin { - public CanvecHelper(PluginInformation info) { - super(info); - Main.main.menu.imagerySubMenu.add(new CanvecHelperAction(this)); - } - + public CanvecHelper(PluginInformation info) { + super(info); + Main.main.menu.imagerySubMenu.add(new CanvecHelperAction(this)); + } + @Override - public void mapFrameInitialized(MapFrame old, MapFrame new1) { - updateLayer(); - } + public void mapFrameInitialized(MapFrame old, MapFrame new1) { + updateLayer(); + } - private synchronized void updateLayer() { - } + private synchronized void updateLayer() { + } } Index: applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecHelperAction.java =================================================================== --- applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecHelperAction.java (revision 30737) +++ applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecHelperAction.java (revision 30738) @@ -5,14 +5,14 @@ public class CanvecHelperAction extends JosmAction { - private CanvecHelper parent_temp; - public CanvecHelperAction(CanvecHelper parent) { - super("CanVec Helper","layericon24",null,null,false); - parent_temp = parent; - } + private CanvecHelper parent_temp; + public CanvecHelperAction(CanvecHelper parent) { + super("CanVec Helper","layericon24",null,null,false); + parent_temp = parent; + } @Override - public void actionPerformed(java.awt.event.ActionEvent action) { - CanvecLayer layer; - layer = new CanvecLayer("canvec tile helper",parent_temp); - Main.main.addLayer(layer); - } + public void actionPerformed(java.awt.event.ActionEvent action) { + CanvecLayer layer; + layer = new CanvecLayer("canvec tile helper",parent_temp); + Main.main.addLayer(layer); + } } Index: applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecLayer.java =================================================================== --- applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecLayer.java (revision 30737) +++ applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecLayer.java (revision 30738) @@ -1,19 +1,22 @@ package org.openstreetmap.josm.plugins.canvec_helper; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.Color; import java.awt.Component; +import java.awt.Graphics2D; +import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; -import java.awt.Graphics2D; -import java.awt.Toolkit; import java.io.BufferedReader; +import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; + import javax.swing.AbstractAction; import javax.swing.Action; @@ -22,209 +25,212 @@ import javax.swing.JMenu; import javax.swing.JMenuItem; + +import org.openstreetmap.josm.Main; import org.openstreetmap.josm.data.Bounds; import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; +import org.openstreetmap.josm.gui.MapView; import org.openstreetmap.josm.gui.dialogs.LayerListDialog; import org.openstreetmap.josm.gui.dialogs.LayerListPopup; import org.openstreetmap.josm.gui.layer.Layer; -import org.openstreetmap.josm.gui.MapView; import org.openstreetmap.josm.io.CachedFile; -import static org.openstreetmap.josm.tools.I18n.tr; // most of the layout was copied from the openstreetbugs plugin to get things started public class CanvecLayer extends Layer implements MouseListener { - private Icon layerIcon = null; - private int max_zoom = 4; - public CanvecHelper plugin_self; - private ArrayList tiles = new ArrayList<>(); - public ArrayList downloadable = new ArrayList<>(); - public ArrayList openable = new ArrayList<>(); - - public CanvecLayer(String name,CanvecHelper self){ - super(name); - plugin_self = self; - this.setBackgroundLayer(true); -/* for (int i = 0; i < 119; i++) { - CanVecTile tile = new CanVecTile(i,"",0,"",plugin_self); - if (tile.isValid()) tiles.add(tile); - }*/ - layerIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(getClass().getResource("/images/layericon.png"))); - try { - long start = System.currentTimeMillis(); - Pattern p = Pattern.compile("(\\d\\d\\d)([A-Z]\\d\\d).*"); - InputStream index = new CachedFile("http://ftp2.cits.rncan.gc.ca/OSM/pub/ZippedOsm.txt").getInputStream(); - BufferedReader br = new BufferedReader(new InputStreamReader(index)); - String line; - int last_cell = -1; - ArrayList list = new ArrayList<>(); - while ((line = br.readLine()) != null) { - Matcher m = p.matcher(line); - if (m.find()) { - int cell = Integer.parseInt(m.group(1)); - if (cell == last_cell) { - list.add(m.group(0)); - } else if (last_cell != -1) { - CanVecTile tile = new CanVecTile(last_cell,"",0,"",this,list); - if (tile.isValid()) tiles.add(tile); - list = new ArrayList<>(); - list.add(m.group(0)); - } - last_cell = cell; - } else if (line.contains("Metadata.txt")) { - } else { - System.out.print("bad line '" + line + "'\n"); - } - } - br.close(); - CanVecTile tile = new CanVecTile(last_cell,"",0,"",this,list); - if (tile.isValid()) tiles.add(tile); - - long end = System.currentTimeMillis(); - System.out.println((end-start)+"ms spent"); - } catch (IOException e) { - System.out.println("exception getting index"); - e.printStackTrace(); - } - } - @Override - public Action[] getMenuEntries() { - return new Action[]{ - LayerListDialog.getInstance().createShowHideLayerAction(), - LayerListDialog.getInstance().createDeleteLayerAction(), - SeparatorLayerAction.INSTANCE, - new LayerListPopup.InfoAction(this), - new MaxZoomAction(this), - new DownloadCanvecAction(this), - new OpenOsmAction(this)}; - } - public class MaxZoomAction extends AbstractAction implements LayerAction { - private CanvecLayer parent; - public MaxZoomAction(CanvecLayer parent) { - this.parent = parent; - } - @Override - public void actionPerformed(ActionEvent e) {} - @Override - public boolean supportLayers(List layers) { - return false; - } - @Override - public Component createMenuComponent() { - JMenu max_zoom = new JMenu("max zoom"); - max_zoom.add(new JMenuItem(new SetMaxZoom(parent,1))); - max_zoom.add(new JMenuItem(new SetMaxZoom(parent,2))); - max_zoom.add(new JMenuItem(new SetMaxZoom(parent,3))); - max_zoom.add(new JMenuItem(new SetMaxZoom(parent,4))); - return max_zoom; - } - } - private class AllowDownload extends AbstractAction { - CanVecTile tile; - public AllowDownload(CanVecTile tile) { - super(tile.tileid); - this.tile = tile; - } - @Override - public void actionPerformed(ActionEvent arg0) { - tile.can_download = true; - } - } - private class OpenOsmAction extends AbstractAction implements LayerAction { - private CanvecLayer layer; - public OpenOsmAction(CanvecLayer layer) { - this.layer = layer; - } - @Override - public void actionPerformed(ActionEvent e) {} - @Override - public Component createMenuComponent() { - JMenu OpenOsm = new JMenu("Open tile"); - for (int i = 0; i < layer.openable.size(); i++) { - OpenOsm.add(new JMenuItem(new DoOpenOsm(layer.openable.get(i)))); - } - return OpenOsm; - } - @Override - public boolean supportLayers(List layers) { - return false; - } - } - private class DoOpenOsm extends AbstractAction { - CanVecTile tile; - public DoOpenOsm(CanVecTile tile) { - super(tile.tileid); - this.tile = tile; - } - @Override - public void actionPerformed(ActionEvent e) { - tile.load_raw_osm(); - } - } - private class DownloadCanvecAction extends AbstractAction implements LayerAction { - private CanvecLayer parent; - public DownloadCanvecAction(CanvecLayer parent) { - this.parent = parent; - } - @Override - public void actionPerformed(ActionEvent e) {} - @Override - public boolean supportLayers(List layers) { - return false; - } - @Override - public Component createMenuComponent() { - JMenu downloadCanvec = new JMenu("Download zip's"); - for (int i = 0; i < parent.downloadable.size(); i++) { - downloadCanvec.add(new JMenuItem(new AllowDownload(parent.downloadable.get(i)))); - } - return downloadCanvec; - } - } - public void setMaxZoom(int max_zoom) { - this.max_zoom = max_zoom; - } - @Override - public Object getInfoComponent() { - return getToolTipText(); - } - @Override - public String getToolTipText() { - return tr("canvec tile helper"); - } - @Override - public void visitBoundingBox(BoundingXYVisitor v) {} - @Override - public boolean isMergable(Layer other) { - return false; - } - @Override - public void mergeFrom(Layer from) {} - @Override - public Icon getIcon() { return layerIcon; } - @Override - public void paint(Graphics2D g, MapView mv, Bounds bounds) { - //long start = System.currentTimeMillis(); - //System.out.println("painting the area covered by "+bounds.toString()); - downloadable = new ArrayList<>(); - openable = new ArrayList<>(); - // loop over each canvec tile in the db and check bounds.intersects(Bounds) - g.setColor(Color.red); - for (int i = 0; i < tiles.size(); i++) { - CanVecTile tile = tiles.get(i); - tile.paint(g,mv,bounds,max_zoom); - } - //long end = System.currentTimeMillis(); - //System.out.println((end-start)+"ms spent"); - } - @Override - public void mouseExited(MouseEvent e) {} - @Override - public void mouseEntered(MouseEvent e) {} - @Override - public void mouseReleased(MouseEvent e) {} - @Override - public void mousePressed(MouseEvent e) {} - @Override - public void mouseClicked(MouseEvent e) { - System.out.println("click!"); - } + private Icon layerIcon = null; + private int max_zoom = 4; + public CanvecHelper plugin_self; + private ArrayList tiles = new ArrayList<>(); + public ArrayList downloadable = new ArrayList<>(); + public ArrayList openable = new ArrayList<>(); + + public CanvecLayer(String name,CanvecHelper self){ + super(name); + plugin_self = self; + this.setBackgroundLayer(true); +/* for (int i = 0; i < 119; i++) { + CanVecTile tile = new CanVecTile(i,"",0,"",plugin_self); + if (tile.isValid()) tiles.add(tile); + }*/ + layerIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(getClass().getResource("/images/layericon.png"))); + long start = System.currentTimeMillis(); + try ( + InputStream index = new CachedFile("http://ftp2.cits.rncan.gc.ca/OSM/pub/ZippedOsm.txt").getInputStream(); + BufferedReader br = new BufferedReader(new InputStreamReader(index)); + ) { + Pattern p = Pattern.compile("(\\d\\d\\d)([A-Z]\\d\\d).*"); + String line; + int last_cell = -1; + ArrayList list = new ArrayList<>(); + while ((line = br.readLine()) != null) { + Matcher m = p.matcher(line); + if (m.find()) { + int cell = Integer.parseInt(m.group(1)); + if (cell == last_cell) { + list.add(m.group(0)); + } else if (last_cell != -1) { + CanVecTile tile = new CanVecTile(last_cell,"",0,"",this,list); + if (tile.isValid()) tiles.add(tile); + list = new ArrayList<>(); + list.add(m.group(0)); + } + last_cell = cell; + } else if (line.contains("Metadata.txt")) { + } else { + System.out.print("bad line '" + line + "'\n"); + } + } + CanVecTile tile = new CanVecTile(last_cell,"",0,"",this,list); + if (tile.isValid()) tiles.add(tile); + + if (Main.isDebugEnabled()) { + long end = System.currentTimeMillis(); + Main.debug((end-start)+"ms spent"); + } + } catch (IOException e) { + Main.error("exception getting index"); + Main.error(e); + } + } + @Override + public Action[] getMenuEntries() { + return new Action[]{ + LayerListDialog.getInstance().createShowHideLayerAction(), + LayerListDialog.getInstance().createDeleteLayerAction(), + SeparatorLayerAction.INSTANCE, + new LayerListPopup.InfoAction(this), + new MaxZoomAction(this), + new DownloadCanvecAction(this), + new OpenOsmAction(this)}; + } + public class MaxZoomAction extends AbstractAction implements LayerAction { + private CanvecLayer parent; + public MaxZoomAction(CanvecLayer parent) { + this.parent = parent; + } + @Override + public void actionPerformed(ActionEvent e) {} + @Override + public boolean supportLayers(List layers) { + return false; + } + @Override + public Component createMenuComponent() { + JMenu max_zoom = new JMenu("max zoom"); + max_zoom.add(new JMenuItem(new SetMaxZoom(parent,1))); + max_zoom.add(new JMenuItem(new SetMaxZoom(parent,2))); + max_zoom.add(new JMenuItem(new SetMaxZoom(parent,3))); + max_zoom.add(new JMenuItem(new SetMaxZoom(parent,4))); + return max_zoom; + } + } + private class AllowDownload extends AbstractAction { + CanVecTile tile; + public AllowDownload(CanVecTile tile) { + super(tile.tileid); + this.tile = tile; + } + @Override + public void actionPerformed(ActionEvent arg0) { + tile.can_download = true; + } + } + private class OpenOsmAction extends AbstractAction implements LayerAction { + private CanvecLayer layer; + public OpenOsmAction(CanvecLayer layer) { + this.layer = layer; + } + @Override + public void actionPerformed(ActionEvent e) {} + @Override + public Component createMenuComponent() { + JMenu OpenOsm = new JMenu("Open tile"); + for (int i = 0; i < layer.openable.size(); i++) { + OpenOsm.add(new JMenuItem(new DoOpenOsm(layer.openable.get(i)))); + } + return OpenOsm; + } + @Override + public boolean supportLayers(List layers) { + return false; + } + } + private class DoOpenOsm extends AbstractAction { + CanVecTile tile; + public DoOpenOsm(CanVecTile tile) { + super(tile.tileid); + this.tile = tile; + } + @Override + public void actionPerformed(ActionEvent e) { + tile.load_raw_osm(); + } + } + private class DownloadCanvecAction extends AbstractAction implements LayerAction { + private CanvecLayer parent; + public DownloadCanvecAction(CanvecLayer parent) { + this.parent = parent; + } + @Override + public void actionPerformed(ActionEvent e) {} + @Override + public boolean supportLayers(List layers) { + return false; + } + @Override + public Component createMenuComponent() { + JMenu downloadCanvec = new JMenu("Download zip's"); + for (int i = 0; i < parent.downloadable.size(); i++) { + downloadCanvec.add(new JMenuItem(new AllowDownload(parent.downloadable.get(i)))); + } + return downloadCanvec; + } + } + public void setMaxZoom(int max_zoom) { + this.max_zoom = max_zoom; + } + @Override + public Object getInfoComponent() { + return getToolTipText(); + } + @Override + public String getToolTipText() { + return tr("canvec tile helper"); + } + @Override + public void visitBoundingBox(BoundingXYVisitor v) {} + @Override + public boolean isMergable(Layer other) { + return false; + } + @Override + public void mergeFrom(Layer from) {} + @Override + public Icon getIcon() { return layerIcon; } + @Override + public void paint(Graphics2D g, MapView mv, Bounds bounds) { + //long start = System.currentTimeMillis(); + //System.out.println("painting the area covered by "+bounds.toString()); + downloadable = new ArrayList<>(); + openable = new ArrayList<>(); + // loop over each canvec tile in the db and check bounds.intersects(Bounds) + g.setColor(Color.red); + for (int i = 0; i < tiles.size(); i++) { + CanVecTile tile = tiles.get(i); + tile.paint(g,mv,bounds,max_zoom); + } + //long end = System.currentTimeMillis(); + //System.out.println((end-start)+"ms spent"); + } + @Override + public void mouseExited(MouseEvent e) {} + @Override + public void mouseEntered(MouseEvent e) {} + @Override + public void mouseReleased(MouseEvent e) {} + @Override + public void mousePressed(MouseEvent e) {} + @Override + public void mouseClicked(MouseEvent e) { + System.out.println("click!"); + } } Index: applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/SetMaxZoom.java =================================================================== --- applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/SetMaxZoom.java (revision 30737) +++ applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/SetMaxZoom.java (revision 30738) @@ -5,14 +5,14 @@ class SetMaxZoom extends AbstractAction { - private CanvecLayer parent; - private int level; - public SetMaxZoom(CanvecLayer parent,int level) { - super(""+level); - this.level = level; - this.parent = parent; - } + private CanvecLayer parent; + private int level; + public SetMaxZoom(CanvecLayer parent,int level) { + super(""+level); + this.level = level; + this.parent = parent; + } @Override - public void actionPerformed(ActionEvent ev) { - parent.setMaxZoom(level); - } + public void actionPerformed(ActionEvent ev) { + parent.setMaxZoom(level); + } }