Changeset 7392 in josm for trunk/src/org/openstreetmap/josm/tools/Geometry.java

Timestamp:

2014-08-14T11:27:38+02:00 (10 years ago)

Author:

Don-vip

Message:

code cleanup, javadoc update

File:

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

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

@@ -24 +24 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.BBox;
-import org.openstreetmap.josm.data.osm.MultipolygonCreate;
+import org.openstreetmap.josm.data.osm.MultipolygonBuilder;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.NodePositionComparator;
@@ -899 +899 @@
         final MultiPolygonMembers mpm = new MultiPolygonMembers(multiPolygon);
         // Construct complete rings for the inner/outer members
-        final List<MultipolygonCreate.JoinedPolygon> outerRings;
-        final List<MultipolygonCreate.JoinedPolygon> innerRings;
+        final List<MultipolygonBuilder.JoinedPolygon> outerRings;
+        final List<MultipolygonBuilder.JoinedPolygon> innerRings;
         try {
-            outerRings = MultipolygonCreate.joinWays(mpm.outers);
-            innerRings = MultipolygonCreate.joinWays(mpm.inners);
-        } catch (MultipolygonCreate.JoinedPolygonCreationException ex) {
+            outerRings = MultipolygonBuilder.joinWays(mpm.outers);
+            innerRings = MultipolygonBuilder.joinWays(mpm.inners);
+        } catch (MultipolygonBuilder.JoinedPolygonCreationException ex) {
             Main.debug("Invalid multipolygon " + multiPolygon);
             return false;
         }
         // Test if object is inside an outer member
-        for (MultipolygonCreate.JoinedPolygon out : outerRings) {
+        for (MultipolygonBuilder.JoinedPolygon out : outerRings) {
             if (nodes.size() == 1
                     ? nodeInsidePolygon(nodes.get(0), out.getNodes())
@@ -915 +915 @@
                 boolean insideInner = false;
                 // If inside an outer, check it is not inside an inner
-                for (MultipolygonCreate.JoinedPolygon in : innerRings) {
+                for (MultipolygonBuilder.JoinedPolygon in : innerRings) {
                     if (polygonIntersection(in.getNodes(), out.getNodes()) == PolygonIntersection.FIRST_INSIDE_SECOND
                             && (nodes.size() == 1