Index: /applications/editors/josm/plugins/canvec_helper/.checkstyle =================================================================== --- /applications/editors/josm/plugins/canvec_helper/.checkstyle (revision 32968) +++ /applications/editors/josm/plugins/canvec_helper/.checkstyle (revision 32968) @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + Index: /applications/editors/josm/plugins/canvec_helper/.project =================================================================== --- /applications/editors/josm/plugins/canvec_helper/.project (revision 32967) +++ /applications/editors/josm/plugins/canvec_helper/.project (revision 32968) @@ -16,7 +16,13 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.jdt.core.javanature + net.sf.eclipsecs.core.CheckstyleNature Index: /applications/editors/josm/plugins/canvec_helper/.settings/org.eclipse.jdt.ui.prefs =================================================================== --- /applications/editors/josm/plugins/canvec_helper/.settings/org.eclipse.jdt.ui.prefs (revision 32968) +++ /applications/editors/josm/plugins/canvec_helper/.settings/org.eclipse.jdt.ui.prefs (revision 32968) @@ -0,0 +1,59 @@ +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=true +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_methods=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_missing_override_annotations_interface_methods=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_functional_interfaces=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=false +sp_cleanup.format_source_code_changes_only=false +sp_cleanup.insert_inferred_type_arguments=false +sp_cleanup.make_local_variable_final=true +sp_cleanup.make_parameters_final=false +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=false +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.organize_imports=true +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_redundant_type_arguments=true +sp_cleanup.remove_trailing_whitespaces=true +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=true +sp_cleanup.remove_unnecessary_nls_tags=false +sp_cleanup.remove_unused_imports=true +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.use_anonymous_class_creation=false +sp_cleanup.use_blocks=false +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_lambda=true +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true 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 32967) +++ /applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanVecTile.java (revision 32968) @@ -1,29 +1,25 @@ -// License: GPL +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.canvec_helper; -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.List; -import java.util.zip.ZipEntry; -import java.util.zip.ZipFile; -import java.util.regex.Pattern; -import java.util.regex.Matcher; - -import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.data.Bounds; - +import java.awt.Graphics2D; import java.awt.Point; - -import org.openstreetmap.josm.data.coor.LatLon; -import org.openstreetmap.josm.gui.MapView; -import org.openstreetmap.josm.io.IllegalDataException; -import org.openstreetmap.josm.io.CachedFile; - -import java.awt.Graphics2D; import java.awt.Polygon; import java.io.File; import java.io.IOException; import java.io.InputStream; - +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.Bounds; +import org.openstreetmap.josm.data.coor.LatLon; +import org.openstreetmap.josm.gui.MapView; +import org.openstreetmap.josm.io.CachedFile; +import org.openstreetmap.josm.io.IllegalDataException; import org.openstreetmap.josm.io.OsmImporter; import org.openstreetmap.josm.io.OsmImporter.OsmImporterData; @@ -34,5 +30,5 @@ private List subTileIds = new ArrayList<>(); private boolean zipScanned = false; - + private List subTiles = new ArrayList<>(); private boolean subTilesMade = false; @@ -40,5 +36,5 @@ private List index; private int depth; - + private int corda; private int cordc; @@ -49,18 +45,20 @@ String tileid; CanVecTile(String tileid, CanvecLayer layer) { - String parta,partb,partc,partd; - parta = tileid.substring(0,3); + 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; + int a, c; a = Integer.parseInt(parta); c = Integer.parseInt(partc); - realInit(a,partb,c,partd,layer,new ArrayList()); - } - CanVecTile(int a,String b,int c,String d,CanvecLayer layer, List index) { - realInit(a,b,c,d,layer,index); - } - private void realInit(int a,String b,int c,String d,CanvecLayer layer, List index) { + realInit(a, partb, c, partd, layer, new ArrayList()); + } + + CanVecTile(int a, String b, int c, String d, CanvecLayer layer, List index) { + realInit(a, b, c, d, layer, index); + } + + private void realInit(int a, String b, int c, String d, CanvecLayer layer, List index) { this.index = index; this.layer = layer; @@ -81,5 +79,5 @@ zeroPointLat = 40 + 4 * row; zeroPointLon = -56 - 8 * column; - + // size of each grid if (row <= 6) { @@ -100,6 +98,6 @@ if (b.isEmpty()) 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 }; + 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 = zeroPointLat + (latSpan/4)*rows1[grid2]; lon2 = zeroPointLon + (lonSpan/4)*cols1[grid2]; @@ -111,7 +109,7 @@ } - int[] rows3 = { 0, 0,0,0,0, 1,1,1,1, 2,2,2,2, 3,3,3,3 }; + int[] rows3 = {0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3}; lat2 = lat2 + (latSpan/4)*rows3[c]; - int[] cols3 = { 0, 3,2,1,0, 0,1,2,3, 3,2,1,0, 0,1,2,3 }; + int[] cols3 = {0, 3, 2, 1, 0, 0, 1, 2, 3, 3, 2, 1, 0, 0, 1, 2, 3}; lon2 = lon2 + (lonSpan/4)*cols3[c]; @@ -121,5 +119,5 @@ depth = 3; } - + if (!cordd.isEmpty()) { depth = 4; @@ -153,25 +151,29 @@ } - bounds = new Bounds(lat2,lon2,lat2+latSpan,lon2+lonSpan); - if (cordb.isEmpty()) this.tileid = String.format("%03d",corda); - else if (cordc == 0) this.tileid = String.format("%03d%s",corda,cordb); - else if (cordd.isEmpty()) this.tileid = String.format("%03d%s%02d",corda,cordb,cordc); - else this.tileid = String.format("%03d%s%02d%s",corda,cordb,cordc,cordd); + bounds = new Bounds(lat2, lon2, lat2+latSpan, lon2+lonSpan); + if (cordb.isEmpty()) this.tileid = String.format("%03d", corda); + else if (cordc == 0) this.tileid = String.format("%03d%s", corda, cordb); + else if (cordd.isEmpty()) 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; } + boolean isValid() { return valid; } + String getTileId() { return this.tileid; } + boolean isVisible(Bounds view) { return view.intersects(bounds); } + 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()); + LatLon x1 = new LatLon(min.lat(), max.lon()); + LatLon x2 = new LatLon(max.lat(), min.lon()); return new Point[] { mv.getPoint(min), // south west @@ -181,7 +183,9 @@ }; } + 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 openZip() throws IOException { File downloadPath = new File(layer.plugin.getPluginDir() + File.separator); @@ -192,4 +196,5 @@ return new ZipFile(tileZip.getFile()); } + void downloadSelf() { if (zipScanned) return; @@ -207,5 +212,5 @@ subTileIds.add(entry.getName()); zipScanned = true; - CanVecTile finalTile = new CanVecTile(entry.getName(),layer); + CanVecTile finalTile = new CanVecTile(entry.getName(), layer); if (finalTile.isValid()) { subTiles.add(finalTile); @@ -213,4 +218,5 @@ } } + void loadRawOsm() { ZipFile zipFile; @@ -234,4 +240,5 @@ } } + private void makeSubTiles(int layer) { List buffer = new ArrayList<>(); @@ -252,5 +259,5 @@ buffer.add(m.group(0)); } else { - subTiles.add(new CanVecTile(corda,lastCell,0,"",this.layer,buffer)); + subTiles.add(new CanVecTile(corda, lastCell, 0, "", this.layer, buffer)); buffer = new ArrayList<>(); buffer.add(m.group(0)); @@ -258,5 +265,5 @@ lastCell = cell; } - subTiles.add(new CanVecTile(corda,lastCell,0,"",this.layer,buffer)); + subTiles.add(new CanVecTile(corda, lastCell, 0, "", this.layer, buffer)); break; case 2: @@ -273,5 +280,5 @@ buffer.add(m.group(0)); } else { - subTiles.add(new CanVecTile(corda,cordb,lastCell2,"",this.layer,buffer)); + subTiles.add(new CanVecTile(corda, cordb, lastCell2, "", this.layer, buffer)); buffer = new ArrayList<>(); buffer.add(m.group(0)); @@ -279,9 +286,10 @@ lastCell2 = cell; } - if (lastCell2 != -1) subTiles.add(new CanVecTile(corda,cordb,lastCell2,"",this.layer,buffer)); + if (lastCell2 != -1) subTiles.add(new CanVecTile(corda, cordb, lastCell2, "", this.layer, buffer)); break; } subTilesMade = true; } + void paint(Graphics2D g, MapView mv, Bounds bounds, int maxZoom) { boolean showSubTiles = false; @@ -310,13 +318,13 @@ for (int i = 0; i < subTiles.size(); i++) { CanVecTile tile = subTiles.get(i); - tile.paint(g,mv,bounds,maxZoom); + tile.paint(g, mv, bounds, maxZoom); } } 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); + 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); + 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 32967) +++ /applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecHelper.java (revision 32968) @@ -1,3 +1,3 @@ -// License: GPL +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.canvec_helper; 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 32967) +++ /applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecHelperAction.java (revision 32968) @@ -1,12 +1,12 @@ -// License: GPL +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.canvec_helper; +import org.openstreetmap.josm.Main; import org.openstreetmap.josm.actions.JosmAction; -import org.openstreetmap.josm.Main; class CanvecHelperAction extends JosmAction { private CanvecHelper parentTemp; CanvecHelperAction(CanvecHelper parent) { - super("CanVec Helper","layericon24",null,null,false); + super("CanVec Helper", "layericon24", null, null, false); parentTemp = parent; } @@ -14,5 +14,5 @@ @Override public void actionPerformed(java.awt.event.ActionEvent action) { - Main.getLayerManager().addLayer(new CanvecLayer("canvec tile helper",parentTemp)); + Main.getLayerManager().addLayer(new CanvecLayer("canvec tile helper", parentTemp)); } } 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 32967) +++ /applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecLayer.java (revision 32968) @@ -1,3 +1,3 @@ -// License: GPL +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.canvec_helper; @@ -44,5 +44,5 @@ List openable = new ArrayList<>(); - CanvecLayer(String name, CanvecHelper self){ + CanvecLayer(String name, CanvecHelper self) { super(name); plugin = self; @@ -65,5 +65,5 @@ list.add(m.group(0)); } else if (lastCell != -1) { - CanVecTile tile = new CanVecTile(lastCell,"",0,"",this,list); + CanVecTile tile = new CanVecTile(lastCell, "", 0, "", this, list); if (tile.isValid()) tiles.add(tile); list = new ArrayList<>(); @@ -75,5 +75,5 @@ } } - CanVecTile tile = new CanVecTile(lastCell,"",0,"",this,list); + CanVecTile tile = new CanVecTile(lastCell, "", 0, "", this, list); if (tile.isValid()) tiles.add(tile); @@ -87,4 +87,5 @@ } } + @Override public Action[] getMenuEntries() { @@ -98,28 +99,33 @@ new OpenOsmAction(this)}; } - private static class MaxZoomAction extends AbstractAction implements LayerAction { + + private static final class MaxZoomAction extends AbstractAction implements LayerAction { private final CanvecLayer parent; private MaxZoomAction(CanvecLayer parent) { this.parent = parent; } + @Override public void actionPerformed(ActionEvent e) { // Do nothing } + @Override public boolean supportLayers(List layers) { return false; } + @Override public Component createMenuComponent() { JMenu maxZoomMenu = new JMenu("max zoom"); - maxZoomMenu.add(new JMenuItem(new SetMaxZoom(parent,1))); - maxZoomMenu.add(new JMenuItem(new SetMaxZoom(parent,2))); - maxZoomMenu.add(new JMenuItem(new SetMaxZoom(parent,3))); - maxZoomMenu.add(new JMenuItem(new SetMaxZoom(parent,4))); + maxZoomMenu.add(new JMenuItem(new SetMaxZoom(parent, 1))); + maxZoomMenu.add(new JMenuItem(new SetMaxZoom(parent, 2))); + maxZoomMenu.add(new JMenuItem(new SetMaxZoom(parent, 3))); + maxZoomMenu.add(new JMenuItem(new SetMaxZoom(parent, 4))); return maxZoomMenu; } } - private static class AllowDownload extends AbstractAction { + + private static final class AllowDownload extends AbstractAction { private final CanVecTile tile; private AllowDownload(CanVecTile tile) { @@ -127,4 +133,5 @@ this.tile = tile; } + @Override public void actionPerformed(ActionEvent arg0) { @@ -132,13 +139,16 @@ } } - private class OpenOsmAction extends AbstractAction implements LayerAction { + + private final class OpenOsmAction extends AbstractAction implements LayerAction { private CanvecLayer layer; private OpenOsmAction(CanvecLayer layer) { this.layer = layer; } + @Override public void actionPerformed(ActionEvent e) { // Do nothing } + @Override public Component createMenuComponent() { @@ -149,4 +159,5 @@ return openOsm; } + @Override public boolean supportLayers(List layers) { @@ -154,5 +165,6 @@ } } - private static class DoOpenOsm extends AbstractAction { + + private static final class DoOpenOsm extends AbstractAction { private final CanVecTile tile; private DoOpenOsm(CanVecTile tile) { @@ -160,4 +172,5 @@ this.tile = tile; } + @Override public void actionPerformed(ActionEvent e) { @@ -165,17 +178,21 @@ } } - private class DownloadCanvecAction extends AbstractAction implements LayerAction { + + private final class DownloadCanvecAction extends AbstractAction implements LayerAction { private CanvecLayer parent; private DownloadCanvecAction(CanvecLayer parent) { this.parent = parent; } + @Override public void actionPerformed(ActionEvent e) { // Do nothing } + @Override public boolean supportLayers(List layers) { return false; } + @Override public Component createMenuComponent() { @@ -187,31 +204,39 @@ } } + void setMaxZoom(int maxZoom) { this.maxZoom = maxZoom; } + @Override public Object getInfoComponent() { return getToolTipText(); } + @Override public String getToolTipText() { return tr("canvec tile helper"); } + @Override public void visitBoundingBox(BoundingXYVisitor v) { // Do nothing } + @Override public boolean isMergable(Layer other) { return false; } + @Override public void mergeFrom(Layer from) { // Do nothing } + @Override public Icon getIcon() { return layerIcon; } + @Override public void paint(Graphics2D g, MapView mv, Bounds bounds) { @@ -222,5 +247,5 @@ for (int i = 0; i < tiles.size(); i++) { CanVecTile tile = tiles.get(i); - tile.paint(g,mv,bounds,maxZoom); + tile.paint(g, mv, bounds, maxZoom); } } 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 32967) +++ /applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/SetMaxZoom.java (revision 32968) @@ -1,6 +1,7 @@ -// License: GPL +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.canvec_helper; import java.awt.event.ActionEvent; + import javax.swing.AbstractAction; @@ -8,9 +9,10 @@ private CanvecLayer parent; private int level; - SetMaxZoom(CanvecLayer parent,int level) { + SetMaxZoom(CanvecLayer parent, int level) { super(""+level); this.level = level; this.parent = parent; } + @Override public void actionPerformed(ActionEvent ev) {