Changeset 10992 in josm for trunk

Timestamp:

2016-09-11T02:27:03+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S00118 - Abstract class names should comply with a naming convention
sonar - squid:UndocumentedApi - Public types, methods and fields (API) should be documented with Javadoc
sonar - checkstyle:OverloadMethodsDeclarationOrderCheck - Overload Methods Declaration Order

File:

• trunk/src/org/openstreetmap/josm/data/imagery/AbstractWMSTileSource.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/AbstractWMSTileSource.java

@@ -20 +20 @@
  * @author Wiktor Niesiobędzki
  * @since 10990
- *
  */
-public class AbstractWMSTileSource extends TMSTileSource {
+public abstract class AbstractWMSTileSource extends TMSTileSource {
 
     private EastNorth anchorPosition;
@@ -32 +31 @@
     private static final float SCALE_DENOMINATOR_ZOOM_LEVEL_1 = 559082264.0287178f;
 
+    /**
+     * Constructs a new {@code AbstractWMSTileSource}.
+     * @param info tile source info
+     */
     public AbstractWMSTileSource(TileSourceInfo info) {
         super(info);
+    }
+
+    private void initAnchorPosition(Projection proj) {
+        Bounds worldBounds = proj.getWorldBoundsLatLon();
+        EastNorth min = proj.latlon2eastNorth(worldBounds.getMin());
+        EastNorth max = proj.latlon2eastNorth(worldBounds.getMax());
+        this.anchorPosition = new EastNorth(min.east(), max.north());
     }
 
@@ -41 +51 @@
     public void initProjection() {
         initProjection(Main.getProjection());
-    }
-
-    private void initAnchorPosition(Projection proj) {
-        Bounds worldBounds = proj.getWorldBoundsLatLon();
-        EastNorth min = proj.latlon2eastNorth(worldBounds.getMin());
-        EastNorth max = proj.latlon2eastNorth(worldBounds.getMax());
-        this.anchorPosition = new EastNorth(min.east(), max.north());
     }
 
@@ -97 +100 @@
     }
 
-    @Override
-    public TileXY latLonToTileXY(double lat, double lon, int zoom) {
-        Projection proj = Main.getProjection();
-        EastNorth enPoint = proj.latlon2eastNorth(new LatLon(lat, lon));
-        return eastNorthToTileXY(enPoint, zoom);
-    }
-
     private TileXY eastNorthToTileXY(EastNorth enPoint, int zoom) {
         double scale = getDegreesPerTile(zoom);
@@ -110 +106 @@
                 (anchorPosition.north() - enPoint.north()) / scale
                 );
+    }
+
+    @Override
+    public TileXY latLonToTileXY(double lat, double lon, int zoom) {
+        EastNorth enPoint = Main.getProjection().latlon2eastNorth(new LatLon(lat, lon));
+        return eastNorthToTileXY(enPoint, zoom);
     }