ben/brouter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

rewrite calculation of bounding circle using coslat-transformed lon-values.

Browse source
This commit is contained in:
ntruchsess 2018-01-22 15:39:38 +01:00
parent c1048ab62a
commit 1fd973daf2
2 changed files with 322 additions and 241 deletions
Download patch file Download diff file Expand all files Collapse all files

79
brouter-core/src/test/java/btools/router/OsmNogoPolygonTest.java
View file

@ -1,3 +1,20 @@
/**********************************************************************************************
Copyright (C) 2018 Norbert Truchsess norbert.truchsess@t-online.de
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
**********************************************************************************************/
package btools.router;
import static org.junit.Assert.*;
@ -8,40 +25,60 @@ import org.junit.Test;
public class OsmNogoPolygonTest {
OsmNogoPolygon p;
final double[] lons = { 1.0, 1.0, 0.5, 0.5, 1.0, 1.0, -1.0, -1.0 };
final double[] lats = { -1.0, -0.1, -0.1, 0.1, 0.1, 1.0, 1.0, -1.0 };
int toOsmLon(double lon) {
return (int)( ( lon + 180. ) *1000000. + 0.5); // see ServerHandler.readPosition()
}
int toOsmLat(double lat) {
return (int)( ( lat + 90. ) *1000000. + 0.5);
}
double coslat(int lat) // see RoutingContext.calcDistance()
{
final double l = (lat - 90000000) * 0.00000001234134; // 0.01234134 = Pi/(sqrt(2)*180)
final double l2 = l*l;
final double l4 = l2*l2;
// final double l6 = l4*l2;
return 1.- l2 + l4 / 6.; // - l6 / 90;
}
@Before
public void setUp() throws Exception {
p = new OsmNogoPolygon();
p.addVertex(1000, 1000);
p.addVertex(2001, 1000);
p.addVertex(2001, 1250);
p.addVertex(1750, 1250);
p.addVertex(1750, 1750);
p.addVertex(2001, 1750);
p.addVertex(2001, 2001);
p.addVertex(1000, 2001);
for (int i = 0; i<lons.length; i++) {
p.addVertex(toOsmLon(lons[i]),toOsmLat(lats[i]));
}
}
@Test
public void testCalcBoundingCircle() {
p.calcBoundingCircle();
assertEquals(1501,p.ilat);
assertEquals(1501,p.ilon);
assertEquals(707.813887968,p.radius,0.5);
double r = p.radius;
for (int i=0; i<lons.length; i++) {
double py = toOsmLat(lats[i]);
double dpx = (toOsmLon(lons[i]) - p.ilon) * coslat(p.ilat);
double dpy = py - p.ilat;
double r1 = Math.sqrt(dpx * dpx + dpy * dpy);
double diff = r-r1;
assertTrue("i: "+i+" r("+r+") >= r1("+r1+")", diff >= 0);
}
}
@Test
public void testIntersectsOrIsWithin() {
assertFalse(p.intersectsOrIsWithin(0,0, 0,0));
assertFalse(p.intersectsOrIsWithin(1800,1500, 1800,1500));
assertFalse(p.intersectsOrIsWithin(1500,2002, 1500,2002));
assertTrue(p.intersectsOrIsWithin(1750, 1500, 1800,1500));
assertTrue(p.intersectsOrIsWithin(1500, 2001, 1500,2002));
assertTrue(p.intersectsOrIsWithin(1100, 1000, 1900, 1000));
assertTrue(p.intersectsOrIsWithin(0, 0, 1500,1500));
assertTrue(p.intersectsOrIsWithin(500, 1500, 1500, 1500));
assertTrue(p.intersectsOrIsWithin(500, 1500, 2000, 1500));
assertTrue(p.intersectsOrIsWithin(1400, 1500, 1500, 1500));
double[] p0lons = { 0.0, 1.0, -0.5, 0.5, 0.7, 0.7, 0.7, -1.5, };
double[] p0lats = { 0.0, 0.0, 0.5, 0.5, 0.5, 0.05, 0.05, -1.5, };
double[] p1lons = { 0.0, 1.0, 0.5, 1.0, 0.7, 0.7, 0.7, -0.5, };
double[] p1lats = { 0.0, 0.0, 0.5, 0.5, -0.5, -0.5, -0.05, -0.5, };
boolean[] within = { true, false, true, true, true, true, false, true, };
for (int i=0; i<p0lons.length; i++) {
assertEquals("("+p0lons[i]+","+p0lats[i]+")-("+p1lons[i]+","+p1lats[i]+")",within[i],p.intersectsOrIsWithin(toOsmLon(p0lons[i]), toOsmLat(p0lats[i]), toOsmLon(p1lons[i]), toOsmLat(p1lats[i])));
}
}
}