Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Slightly change multipolygons impl

Browse source
This commit is contained in:
Victor Shcherb 2012-09-14 23:01:58 +02:00
parent a7d0e8be6a
commit 8277d39a31
2 changed files with 35 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
DataExtractionOSM/src/net/osmand/data/Multipolygon.java
View file

@ -104,34 +104,24 @@ public class Multipolygon {
* @param longitude lon to check
* @return true if this multipolygon is correct and contains the point
*/
public boolean containsPoint(double latitude, double longitude){
TreeSet<Ring> outers = new TreeSet<Ring>();
TreeSet<Ring> inners = new TreeSet<Ring>();
for (Ring outer : getOuterRings()) {
if (outer.containsPoint(latitude, longitude)) {
outers.add(outer);
}
public boolean containsPoint(double latitude, double longitude) {
boolean outerContain = false;
for (Ring outer : getOuterRings()) {
if (outer.containsPoint(latitude, longitude)) {
outerContain = true;
break;
}
for(Ring inner : getInnerRings()) {
if (inner.containsPoint(latitude, longitude)) {
inners.add(inner);
}
}
if (!outerContain) {
return false;
}
for (Ring inner : getInnerRings()) {
if (inner.containsPoint(latitude, longitude)) {
return false;
}
if(outers.size() == 0) return false;
if(inners.size() == 0) return true;
Ring smallestOuter = outers.first();
Ring smallestInner = inners.first();
// if the smallest outer is in the smallest inner, the multiPolygon contains the point
return smallestOuter.isIn(smallestInner);
}
return true;
}
/**
@ -179,11 +169,8 @@ public class Multipolygon {
* @return
*/
public int countOuterPolygons() {
groupInRings();
return zeroSizeIfNull(getOuterRings());
}
/**
@ -285,14 +272,6 @@ public class Multipolygon {
return MapUtils.getWeightCenterForNodes(points);
}
/**
* check if a cache has been created
* @return true if the cache exists
*/
public boolean hasCache() {
return outerRings != null && innerRings != null;
}
/**
* Create the cache <br />
* The cache has to be null before it will be created
@ -315,10 +294,10 @@ public class Multipolygon {
//make a clone of the inners set
// this set will be changed through execution of the method
SortedSet<Ring> inners = new TreeSet<Ring>(getInnerRings());
ArrayList<Ring> inners = new ArrayList<Ring>(getInnerRings());
// get the set of outer rings in a variable. This set will not be changed
SortedSet<Ring> outers = new TreeSet<Ring>(getOuterRings());
ArrayList<Ring> outers = new ArrayList<Ring>(getOuterRings());
ArrayList<Multipolygon> multipolygons = new ArrayList<Multipolygon>();
// loop; start with the smallest outer ring
@ -329,7 +308,7 @@ public class Multipolygon {
m.addOuterWays(outer.getWays());
// Search the inners inside this outer ring
SortedSet<Ring> innersInsideOuter = new TreeSet<Ring>();
ArrayList<Ring> innersInsideOuter = new ArrayList<Ring>();
for (Ring inner : inners) {
if (inner.isIn(outer)) {
innersInsideOuter.add(inner);

72
DataExtractionOSM/src/net/osmand/data/Ring.java
View file

@ -17,12 +17,12 @@ import net.osmand.osm.Way;
* @author sander
*
*/
public class Ring implements Comparable<Ring>{
public class Ring {
/**
* This is a list of the ways added by the user
* The order can be changed with methods from this class
*/
private ArrayList<Way> ways;
private final ArrayList<Way> ways;
/**
* This is the closure of the ways added by the user
* So simple two-node ways are added to close the ring
@ -40,17 +40,10 @@ public class Ring implements Comparable<Ring>{
* Construct a Ring with a list of ways
* @param ways the ways that make up the Ring
*/
public Ring(List<Way> ways) {
this.ways = new ArrayList<Way>();
this.ways.addAll(ways);
private Ring(List<Way> ways) {
this.ways = new ArrayList<Way>(ways);
}
/**
* Construct an empty Ring
*/
public Ring() {
this.ways = new ArrayList<Way>();
}
/**
* Get the ways added to the Ring.
@ -61,19 +54,6 @@ public class Ring implements Comparable<Ring>{
public List<Way> getWays() {
return ways;
}
/**
* Add a way to the Ring
* @param w the way to add
*/
public void addWay(Way w) {
// Reset the cache
closedWays = null;
closedBorder = null;
// Add the way
ways.add(w);
}
/**
* Get the closed ways that make up the Ring
* This method will sort the ways, so it is CPU intensive
@ -178,38 +158,30 @@ public class Ring implements Comparable<Ring>{
closedWays = new ArrayList<Way>();
return;
}
ArrayList<ArrayList<Way>> multiLines = createMultiLines(ways);
closedWays = new ArrayList<Way>(ways);
// TODO try to close rings which consist out of multiple segments.
// This is a data fault, but it could be solved a bit by OsmAnd
if (multiLines.size() != 1) return;
ArrayList<Way> multiLine = multiLines.get(0);
closedWays = multiLine;
long[] endNodes = getMultiLineEndNodes(multiLine);
long[] endNodes = getMultiLineEndNodes(ways);
if (endNodes[0] != endNodes[1]) {
if(multiLine.get(0).getNodes() == null) {
if(ways.get(0).getNodes() == null) {
Way w = new Way(0L);
w.addNode(endNodes[0]);
w.addNode(endNodes[1]);
closedWays.add(w);
} else {
Node n1 = null, n2 = null;
if (multiLine.get(0).getFirstNodeId() == endNodes[0]) {
n1 = multiLine.get(0).getNodes().get(0);
if (ways.get(0).getFirstNodeId() == endNodes[0]) {
n1 = ways.get(0).getNodes().get(0);
} else {
int index = multiLine.get(0).getNodes().size() - 1;
n1 = multiLine.get(0).getNodes().get(index);
int index = ways.get(0).getNodes().size() - 1;
n1 = ways.get(0).getNodes().get(index);
}
int lastML = multiLine.size() - 1;
if (multiLine.get(lastML).getFirstNodeId() == endNodes[0]) {
n2 = multiLine.get(lastML).getNodes().get(0);
int lastML = ways.size() - 1;
if (ways.get(lastML).getFirstNodeId() == endNodes[0]) {
n2 = ways.get(lastML).getNodes().get(0);
} else {
int index = multiLine.get(lastML).getNodes().size() - 1;
n2 = multiLine.get(lastML).getNodes().get(index);
int index = ways.get(lastML).getNodes().size() - 1;
n2 = ways.get(lastML).getNodes().get(index);
}
Way w = new Way(0L);
@ -524,18 +496,6 @@ public class Ring implements Comparable<Ring>{
}
@Override
/**
* @return -1 if this Ring is inside r <br />
* 1 if r is inside this Ring <br />
* 0 otherwise (Rings are next to each other, Rings intersect or Rings are malformed)
*/
public int compareTo(Ring r) {
if (this.isIn(r)) return -1;
if (r.isIn(this)) return 1;
return 0;
}
/**
* If this Ring is not complete
* (some ways are not initialized