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

minor refactoring

Browse source
This commit is contained in:
Arndt Brenschede 2019-04-17 11:33:07 +02:00
parent 126c104bb3
commit 19e434facb
18 changed files with 138 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

16
brouter-core/src/test/java/btools/router/OsmNodeNamedTest.java
View file

@ -8,15 +8,15 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import btools.util.CheapRulerSingleton;
import btools.util.CheapRuler;
public class OsmNodeNamedTest {
static int toOsmLon(double lon) {
return (int)( ( lon + 180. ) / CheapRulerSingleton.ILATLNG_TO_LATLNG + 0.5);
return (int)( ( lon + 180. ) / CheapRuler.ILATLNG_TO_LATLNG + 0.5);
}
static int toOsmLat(double lat) {
return (int)( ( lat + 90. ) / CheapRulerSingleton.ILATLNG_TO_LATLNG + 0.5);
return (int)( ( lat + 90. ) / CheapRuler.ILATLNG_TO_LATLNG + 0.5);
}
@Test
@ -36,7 +36,7 @@ public class OsmNodeNamedTest {
lat1 = toOsmLat(48.823822);
lon2 = toOsmLon(2.335018);
lat2 = toOsmLat(48.824105);
double totalSegmentLength = CheapRulerSingleton.distance(lon1, lat1, lon2, lat2);
double totalSegmentLength = CheapRuler.distance(lon1, lat1, lon2, lat2);
assertEquals(
"Works for segment aligned with the nogo center",
2 * node.radius,
@ -65,7 +65,7 @@ public class OsmNodeNamedTest {
// Check distance within radius is correctly computed if a point is inside the circle
lon2 = toOsmLon(2.334495);
lat2 = toOsmLat(48.824045);
totalSegmentLength = CheapRulerSingleton.distance(lon1, lat1, lon2, lat2);
totalSegmentLength = CheapRuler.distance(lon1, lat1, lon2, lat2);
assertEquals(
"Works if last point is within the circle",
17,
@ -77,7 +77,7 @@ public class OsmNodeNamedTest {
lat1 = toOsmLat(48.824045);
lon2 = toOsmLon(2.335018);
lat2 = toOsmLat(48.824105);
totalSegmentLength = CheapRulerSingleton.distance(lon1, lat1, lon2, lat2);
totalSegmentLength = CheapRuler.distance(lon1, lat1, lon2, lat2);
assertEquals(
"Works if first point is within the circle",
9,
@ -89,7 +89,7 @@ public class OsmNodeNamedTest {
lat1 = toOsmLat(48.82402);
lon2 = toOsmLon(2.334587);
lat2 = toOsmLat(48.824061);
totalSegmentLength = CheapRulerSingleton.distance(lon1, lat1, lon2, lat2);
totalSegmentLength = CheapRuler.distance(lon1, lat1, lon2, lat2);
assertEquals(
"Works if both points are within the circle",
25,
@ -106,7 +106,7 @@ public class OsmNodeNamedTest {
lat1 = toOsmLat(48.823822);
lon2 = toOsmLon(2.33431);
lat2 = toOsmLat(48.824027);
totalSegmentLength = CheapRulerSingleton.distance(lon1, lat1, lon2, lat2);
totalSegmentLength = CheapRuler.distance(lon1, lat1, lon2, lat2);
assertEquals(
"Works if both points are on the same side of the circle center",
5,

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

@ -26,7 +26,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
import btools.router.OsmNogoPolygon.Point;
import btools.util.CheapRulerSingleton;
import btools.util.CheapRuler;
public class OsmNogoPolygonTest {
@ -65,7 +65,7 @@ public class OsmNogoPolygonTest {
@Test
public void testCalcBoundingCircle() {
double[] lonlat2m = CheapRulerSingleton.getLonLatToMeterScales( polygon.ilat );
double[] lonlat2m = CheapRuler.getLonLatToMeterScales( polygon.ilat );
double dlon2m = lonlat2m[0];
double dlat2m = lonlat2m[1];
@ -207,9 +207,9 @@ public class OsmNogoPolygonTest {
lat2 = toOsmLat(48.824091, 0);
assertEquals(
"Should give the correct length if the segment overlaps with an edge of the polygon",
CheapRulerSingleton.distance(lon1, lat1, lon2, lat2),
CheapRuler.distance(lon1, lat1, lon2, lat2),
polygon.distanceWithinPolygon(lon1, lat1, lon2, lat2),
0.05 * CheapRulerSingleton.distance(lon1, lat1, lon2, lat2)
0.05 * CheapRuler.distance(lon1, lat1, lon2, lat2)
);
lon1 = toOsmLon(2.333523, 0);
@ -218,9 +218,9 @@ public class OsmNogoPolygonTest {
lat2 = toOsmLat(48.8239345, 0);
assertEquals(
"Should give the correct length if the segment overlaps with a polyline",
CheapRulerSingleton.distance(lon1, lat1, lon2, lat2),
CheapRuler.distance(lon1, lat1, lon2, lat2),
polyline.distanceWithinPolygon(lon1, lat1, lon2, lat2),
0.05 * CheapRulerSingleton.distance(lon1, lat1, lon2, lat2)
0.05 * CheapRuler.distance(lon1, lat1, lon2, lat2)
);
}
}

8
brouter-core/src/test/java/btools/router/RoutingContextTest.java
View file

@ -8,15 +8,15 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import btools.util.CheapRulerSingleton;
import btools.util.CheapRuler;
public class RoutingContextTest {
static int toOsmLon(double lon) {
return (int)( ( lon + 180. ) / CheapRulerSingleton.ILATLNG_TO_LATLNG + 0.5);
return (int)( ( lon + 180. ) / CheapRuler.ILATLNG_TO_LATLNG + 0.5);
}
static int toOsmLat(double lat) {
return (int)( ( lat + 90. ) / CheapRulerSingleton.ILATLNG_TO_LATLNG + 0.5);
return (int)( ( lat + 90. ) / CheapRuler.ILATLNG_TO_LATLNG + 0.5);
}
@Test
@ -84,7 +84,7 @@ public class RoutingContextTest {
int lon1 = 8500000;
int lat1 = 49500000;
double[] lonlat2m = CheapRulerSingleton.getLonLatToMeterScales( lat1 );
double[] lonlat2m = CheapRuler.getLonLatToMeterScales( lat1 );
double lon2m = lonlat2m[0];
double lat2m = lonlat2m[1];