Changeset 6841 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2014-02-12T00:55:05+01:00 (9 years ago)

Author:

Don-vip

Message:

see #9680 - Boost multipolygon computation performance by caching Areas

File:

• trunk/src/org/openstreetmap/josm/tools/Geometry.java (modified) (2 diffs)

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

@@ -441 +441 @@
     }
 
-    private static Area getArea(List<Node> polygon) {
+    /**
+     * Returns the Area of a polygon, from its list of nodes.
+     * @param polygon List of nodes forming polygon
+     * @return Area for the given list of nodes
+     * @since 6841
+     */
+    public static Area getArea(List<Node> polygon) {
         Path2D path = new Path2D.Double();
 
@@ -462 +468 @@
     /**
      * Tests if two polygons intersect.
-     * @param first
-     * @param second
+     * @param first List of nodes forming first polygon
+     * @param second List of nodes forming second polygon
      * @return intersection kind
      */
     public static PolygonIntersection polygonIntersection(List<Node> first, List<Node> second) {
-
         Area a1 = getArea(first);
         Area a2 = getArea(second);
+        return polygonIntersection(a1, a2);
+    }
+
+    /**
+     * Tests if two polygons intersect.
+     * @param a1 Area of first polygon
+     * @param a2 Area of second polygon
+     * @return intersection kind
+     * @since 6841
+     */
+    public static PolygonIntersection polygonIntersection(Area a1, Area a2) {
 
         Area inter = new Area(a1);