Changeset 11852 in josm for trunk/src/org/openstreetmap/josm/data/validation/util/ValUtil.java

Timestamp:

2017-04-08T01:08:59+02:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S1444 - "public static" fields should be constant

File:

• trunk/src/org/openstreetmap/josm/data/validation/util/ValUtil.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/util/ValUtil.java

@@ -43 +43 @@
         Set<Point2D> cellNodes = new HashSet<>();
         Point2D cell;
+        double griddetail = OsmValidator.getGridDetail();
 
         // First, round coordinates
         // CHECKSTYLE.OFF: SingleSpaceSeparator
-        long x0 = Math.round(n1.getEastNorth().east()  * OsmValidator.griddetail);
-        long y0 = Math.round(n1.getEastNorth().north() * OsmValidator.griddetail);
-        long x1 = Math.round(n2.getEastNorth().east()  * OsmValidator.griddetail);
-        long y1 = Math.round(n2.getEastNorth().north() * OsmValidator.griddetail);
+        long x0 = Math.round(n1.getEastNorth().east()  * griddetail);
+        long y0 = Math.round(n1.getEastNorth().north() * griddetail);
+        long x1 = Math.round(n2.getEastNorth().east()  * griddetail);
+        long y1 = Math.round(n2.getEastNorth().north() * griddetail);
         // CHECKSTYLE.ON: SingleSpaceSeparator
 
@@ -76 +77 @@
         // Then floor coordinates, in case the way is in the border of the cell.
         // CHECKSTYLE.OFF: SingleSpaceSeparator
-        x0 = (long) Math.floor(n1.getEastNorth().east()  * OsmValidator.griddetail);
-        y0 = (long) Math.floor(n1.getEastNorth().north() * OsmValidator.griddetail);
-        x1 = (long) Math.floor(n2.getEastNorth().east()  * OsmValidator.griddetail);
-        y1 = (long) Math.floor(n2.getEastNorth().north() * OsmValidator.griddetail);
+        x0 = (long) Math.floor(n1.getEastNorth().east()  * griddetail);
+        y0 = (long) Math.floor(n1.getEastNorth().north() * griddetail);
+        x1 = (long) Math.floor(n2.getEastNorth().east()  * griddetail);
+        y1 = (long) Math.floor(n2.getEastNorth().north() * griddetail);
         // CHECKSTYLE.ON: SingleSpaceSeparator