Ignore:
Timestamp:
2014-08-14T11:27:38+02:00 (8 years ago)
Author:
Don-vip
Message:

code cleanup, javadoc update

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/tools/Geometry.java

    r7193 r7392  
    2424import org.openstreetmap.josm.data.coor.LatLon;
    2525import org.openstreetmap.josm.data.osm.BBox;
    26 import org.openstreetmap.josm.data.osm.MultipolygonCreate;
     26import org.openstreetmap.josm.data.osm.MultipolygonBuilder;
    2727import org.openstreetmap.josm.data.osm.Node;
    2828import org.openstreetmap.josm.data.osm.NodePositionComparator;
     
    899899        final MultiPolygonMembers mpm = new MultiPolygonMembers(multiPolygon);
    900900        // Construct complete rings for the inner/outer members
    901         final List<MultipolygonCreate.JoinedPolygon> outerRings;
    902         final List<MultipolygonCreate.JoinedPolygon> innerRings;
     901        final List<MultipolygonBuilder.JoinedPolygon> outerRings;
     902        final List<MultipolygonBuilder.JoinedPolygon> innerRings;
    903903        try {
    904             outerRings = MultipolygonCreate.joinWays(mpm.outers);
    905             innerRings = MultipolygonCreate.joinWays(mpm.inners);
    906         } catch (MultipolygonCreate.JoinedPolygonCreationException ex) {
     904            outerRings = MultipolygonBuilder.joinWays(mpm.outers);
     905            innerRings = MultipolygonBuilder.joinWays(mpm.inners);
     906        } catch (MultipolygonBuilder.JoinedPolygonCreationException ex) {
    907907            Main.debug("Invalid multipolygon " + multiPolygon);
    908908            return false;
    909909        }
    910910        // Test if object is inside an outer member
    911         for (MultipolygonCreate.JoinedPolygon out : outerRings) {
     911        for (MultipolygonBuilder.JoinedPolygon out : outerRings) {
    912912            if (nodes.size() == 1
    913913                    ? nodeInsidePolygon(nodes.get(0), out.getNodes())
     
    915915                boolean insideInner = false;
    916916                // If inside an outer, check it is not inside an inner
    917                 for (MultipolygonCreate.JoinedPolygon in : innerRings) {
     917                for (MultipolygonBuilder.JoinedPolygon in : innerRings) {
    918918                    if (polygonIntersection(in.getNodes(), out.getNodes()) == PolygonIntersection.FIRST_INSIDE_SECOND
    919919                            && (nodes.size() == 1
Note: See TracChangeset for help on using the changeset viewer.