Changeset 14587 in josm for trunk/src/org

Timestamp:

2018-12-22T16:17:33+01:00 (6 years ago)

Author:

GerdP

Message:

• fix more findbugs warnings
• change varible names from lon,lat to x,y

File:

• trunk/src/org/openstreetmap/josm/tools/ShapeClipper.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/tools/ShapeClipper.java

@@ -127 +127 @@
         for (int i = 2; i < num;) {
             double x = points[i++], y = points[i++];
-            if (x != lastX || y != lastY) {
+            if (Double.compare(x, lastX) != 0 || Double.compare(y, lastY) != 0) {
                 path.lineTo(x, y);
                 lastX = x;
@@ -190 +190 @@
             input = outputList;
             outputList = new double[countVals + 16];
-            double sLon = 0, sLat = 0;
-            double pLon = 0, pLat = 0; // intersection
+            double sx = 0, sy = 0;
+            double px = 0, py = 0; // intersection
             int posIn = countVals - 2;
             int posOut = 0;
@@ -197 +197 @@
                 if (posIn >= countVals)
                     posIn = 0;
-                double eLon = input[posIn++];
-                double eLat = input[posIn++];
+                double ex = input[posIn++];
+                double ey = input[posIn++];
                 switch (side) {
                 case LEFT:
-                    eIsIn = (eLon >= leftX);
+                    eIsIn = (ex >= leftX);
                     break;
                 case TOP:
-                    eIsIn = (eLat < upperY);
+                    eIsIn = (ey < upperY);
                     break;
                 case RIGHT:
-                    eIsIn = (eLon < rightX);
+                    eIsIn = (ex < rightX);
                     break;
                 default:
-                    eIsIn = (eLat >= lowerY);
+                    eIsIn = (ey >= lowerY);
                 }
                 if (i > 0) {
@@ -216 +216 @@
                         // compute intersection
                         double slope;
-                        if (eLon != sLon)
-                            slope = (eLat - sLat) / (eLon - sLon);
+                        boolean isNotZero = Math.abs(ex - sx) > 1e-12;
+                        if (isNotZero)
+                            slope = (ey - sy) / (ex - sx);
                         else
                             slope = 1;
@@ -223 +224 @@
                         switch (side) {
                         case LEFT:
-                            pLon = leftX;
-                            pLat = slope * (leftX - sLon) + sLat;
+                            px = leftX;
+                            py = slope * (leftX - sx) + sy;
                             break;
                         case RIGHT:
-                            pLon = rightX;
-                            pLat = slope * (rightX - sLon) + sLat;
+                            px = rightX;
+                            py = slope * (rightX - sx) + sy;
                             break;
 
                         case TOP:
-                            if (eLon != sLon)
-                                pLon = sLon + (upperY - sLat) / slope;
+                            if (isNotZero)
+                                px = sx + (upperY - sy) / slope;
                             else
-                                pLon = sLon;
-                            pLat = upperY;
+                                px = sx;
+                            py = upperY;
                             break;
                         default: // BOTTOM
-                            if (eLon != sLon)
-                                pLon = sLon + (lowerY - sLat) / slope;
+                            if (isNotZero)
+                                px = sx + (lowerY - sy) / slope;
                             else
-                                pLon = sLon;
-                            pLat = lowerY;
+                                px = sx;
+                            py = lowerY;
                             break;
 
@@ -265 +266 @@
                     if (eIsIn) {
                         if (!sIsIn) {
-                            outputList[posOut++] = pLon;
-                            outputList[posOut++] = pLat;
-                        }
-                        outputList[posOut++] = eLon;
-                        outputList[posOut++] = eLat;
+                            outputList[posOut++] = px;
+                            outputList[posOut++] = py;
+                        }
+                        outputList[posOut++] = ex;
+                        outputList[posOut++] = ey;
                     } else {
                         if (sIsIn) {
-                            outputList[posOut++] = pLon;
-                            outputList[posOut++] = pLat;
+                            outputList[posOut++] = px;
+                            outputList[posOut++] = py;
                         }
                     }
                 }
                 // S = E
-                sLon = eLon;
-                sLat = eLat;
+                sx = ex;
+                sy = ey;
                 sIsIn = eIsIn;
             }