Update tests
This commit is contained in:
Victor Shcherb
parent
4e5f55959c
commit
e912612f77
7 changed files with 56 additions and 1212 deletions
|
|
@ -5,16 +5,66 @@ configurations {
|
|||
android
|
||||
}
|
||||
|
||||
task androidJar(type: Jar) {
|
||||
appendix = "android"
|
||||
from sourceSets.main.java.outputDir
|
||||
exclude("**/PlatformUtil.*")
|
||||
|
||||
|
||||
task collectRoutingResources(type: Sync) {
|
||||
from "../../resources/routing"
|
||||
into "src/main/resources/net/osmand/router"
|
||||
include "*.xml"
|
||||
}
|
||||
|
||||
task collectMiscResources(type: Copy) {
|
||||
into "src/main/resources/net/osmand/osm"
|
||||
from("../../resources/obf_creation") {
|
||||
include "rendering_types.xml"
|
||||
}
|
||||
from("../../resources/poi") {
|
||||
include "poi_types.xml"
|
||||
}
|
||||
}
|
||||
|
||||
task collectRenderingStylesResources(type: Sync) {
|
||||
from "../../resources/rendering_styles"
|
||||
into "src/main/resources/net/osmand/render"
|
||||
include "*.xml"
|
||||
}
|
||||
|
||||
task collectRegionsInfoResources(type: Copy) {
|
||||
from "../../resources/countries-info"
|
||||
into "src/main/resources/net/osmand/map"
|
||||
include "regions.ocbf"
|
||||
}
|
||||
|
||||
task collectTestResources(type: Copy) {
|
||||
from "../../resources/test-resources"
|
||||
into "src/main/test/resources/"
|
||||
include "regions.ocbf"
|
||||
}
|
||||
|
||||
|
||||
task collectExternalResources {
|
||||
dependsOn collectRoutingResources,
|
||||
collectRenderingStylesResources,
|
||||
collectRegionsInfoResources,
|
||||
collectTestResources,
|
||||
collectMiscResources
|
||||
}
|
||||
|
||||
task androidJar(type: Jar) {
|
||||
dependsOn collectExternalResources
|
||||
appendix = "android"
|
||||
from(sourceSets.main.java.outputDir) {
|
||||
exclude("**/PlatformUtil.*")
|
||||
}
|
||||
from sourceSets.main.resources
|
||||
}
|
||||
|
||||
|
||||
artifacts {
|
||||
android androidJar
|
||||
}
|
||||
|
||||
|
||||
dependencies {
|
||||
testImplementation 'junit:junit:4.12'
|
||||
testImplementation 'com.google.code.gson:gson:2.8.2'
|
||||
|
|
|
|||
|
|
@ -1,184 +0,0 @@
|
|||
<!-- build JAR libraty -->
|
||||
<project name="OsmAnd-core" default="build" basedir=".">
|
||||
|
||||
<property file="local.properties" />
|
||||
|
||||
<property name="src.dir" value="src" />
|
||||
<property name="src.absolute.dir" location="${src.dir}" />
|
||||
<property name="protobuf.src" location="protobuf-src" />
|
||||
<property name="bin.dir" value="bin" />
|
||||
<property name="bin.absolute.dir" location="${bin.dir}" />
|
||||
<property name="lib.dir" value="libs" />
|
||||
<property name="lib.absolute.dir" location="${lib.dir}" />
|
||||
<property name="unit.dir" value="test/java" />
|
||||
<property name="unit.absolute.dir" location="${unit.dir}" />
|
||||
<property name="test.lib.dir" value="test/libs" />
|
||||
<property name="test.lib.absolute.dir" location="${test.lib.dir}" />
|
||||
<property name="reports.tests" value="test-results" />
|
||||
<property name="srctests.dir" value="test/java"/>
|
||||
<property name="java.encoding" value="UTF-8" />
|
||||
|
||||
<path id="build.path">
|
||||
<fileset dir="${lib.absolute.dir}">
|
||||
<include name="*.jar" />
|
||||
</fileset>
|
||||
</path>
|
||||
|
||||
<path id="test-lib.path">
|
||||
<fileset dir="${test.lib.absolute.dir}">
|
||||
<include name="*.jar" />
|
||||
</fileset>
|
||||
</path>
|
||||
|
||||
|
||||
<path id="unit.test.path">
|
||||
<path refid="build.path"/>
|
||||
<pathelement path="test/java"/>
|
||||
</path>
|
||||
|
||||
<target name="-dirs">
|
||||
<mkdir dir="${bin.absolute.dir}" />
|
||||
</target>
|
||||
|
||||
<target name="clean">
|
||||
<delete dir="${bin.absolute.dir}" />
|
||||
<delete file="OsmAnd-core.jar" />
|
||||
</target>
|
||||
|
||||
<target name="compileUnitTests" depends="compile">
|
||||
<javac srcdir="test/" destdir="${bin.absolute.dir}">
|
||||
<classpath>
|
||||
<path refid="build.path"/>
|
||||
<path refid="test-lib.path" />
|
||||
</classpath>
|
||||
</javac>
|
||||
<copy todir="${bin.absolute.dir}">
|
||||
<fileset dir="test/resources">
|
||||
<include name="**/*" />
|
||||
</fileset>
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<target name="junits" >
|
||||
<junit printsummary="yes" showoutput="yes">
|
||||
<classpath>
|
||||
<pathelement path="bin"/>
|
||||
<path refid="build.path"/>
|
||||
<path refid="test-lib.path" />
|
||||
</classpath>
|
||||
<formatter type="xml" />
|
||||
<batchtest fork="false" todir="${reports.tests}" >
|
||||
<fileset dir="${srctests.dir}" >
|
||||
<include name="**/*Test.java" />
|
||||
<exclude name="**/AllTests.java" />
|
||||
<exclude name="**/*Suite*.java" />
|
||||
</fileset>
|
||||
</batchtest>
|
||||
</junit>
|
||||
</target>
|
||||
|
||||
<target name="copy_resources">
|
||||
<copy todir="${src.absolute.dir}/net/osmand/router/">
|
||||
<fileset dir="../../resources/routing/">
|
||||
<include name="*.xml" />
|
||||
</fileset>
|
||||
</copy>
|
||||
<copy todir="${src.absolute.dir}/net/osmand/render/">
|
||||
<fileset dir="../../resources/rendering_styles/">
|
||||
<include name="*.xml" />
|
||||
</fileset>
|
||||
</copy>
|
||||
<copy todir="${src.absolute.dir}/net/osmand/osm/">
|
||||
<fileset dir="../../resources/obf_creation/">
|
||||
<include name="rendering_types.xml" />
|
||||
</fileset>
|
||||
<fileset dir="../../resources/poi/">
|
||||
<include name="poi_types.xml" />
|
||||
</fileset>
|
||||
</copy>
|
||||
<copy todir="${src.absolute.dir}/net/osmand/map/">
|
||||
<fileset dir="../../resources/countries-info/">
|
||||
<include name="countries.reginfo" />
|
||||
<include name="regions.ocbf" />
|
||||
</fileset>
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
|
||||
<target name="patch-protobuf">
|
||||
<copy file="${protobuf.src}/com/google/protobuf/CodedInputStream.java"
|
||||
tofile="${protobuf.src}/com/google/protobuf/CodedInputStreamRAF.java" overwrite="yes">
|
||||
</copy>
|
||||
<copy todir="${src.absolute.dir}">
|
||||
<fileset dir="${protobuf.src}"/>
|
||||
</copy>
|
||||
<patch patchfile="protobuf.patch" dir=".."/>
|
||||
</target>
|
||||
<target name="compile" depends="-dirs,copy_resources">
|
||||
<copy todir="${bin.absolute.dir}">
|
||||
<fileset dir="${src.absolute.dir}">
|
||||
<exclude name="**/*.java" />
|
||||
</fileset>
|
||||
</copy>
|
||||
<javac srcdir="${src.absolute.dir}" destdir="${bin.absolute.dir}" encoding="${java.encoding}" classpathref="build.path" debug="on" source="1.7">
|
||||
<include name="**/*.java" />
|
||||
<exclude name="net/osmand/plus/**" />
|
||||
</javac>
|
||||
|
||||
</target>
|
||||
|
||||
<target name="native-libs-jar" depends="compile">
|
||||
<exec command="bash collect_libs.sh" failonerror="true">
|
||||
</exec>
|
||||
<antcall target="jar" />
|
||||
</target>
|
||||
|
||||
<target name="native-legacy-libs-jar" depends="compile">
|
||||
<exec command="bash collect_legacy_libs.sh" failonerror="true">
|
||||
</exec>
|
||||
<antcall target="jar" />
|
||||
</target>
|
||||
|
||||
<target name="jar" depends="compile, compileUnitTests">
|
||||
<manifestclasspath property="lib.list" jarfile="OsmAnd-core.jar">
|
||||
<classpath refid="build.path" />
|
||||
</manifestclasspath>
|
||||
<echo>list is ${lib.list}</echo>
|
||||
|
||||
<delete file="OsmAnd-core.jar" />
|
||||
<delete file="MANIFEST.MF" />
|
||||
<manifest file="MANIFEST.MF">
|
||||
<attribute name="Built-By" value="${user.name}" />
|
||||
<attribute name="Main-Class" value="net.osmand.swing.OsmExtractionUI" />
|
||||
<attribute name="Class-Path" value="${lib.list}" />
|
||||
</manifest>
|
||||
|
||||
<jar destfile="OsmAnd-core.jar" manifest="MANIFEST.MF">
|
||||
<fileset dir="${bin.absolute.dir}">
|
||||
<include name="**/*" />
|
||||
</fileset>
|
||||
<fileset dir="${src.absolute.dir}">
|
||||
<include name="**/*.java" />
|
||||
</fileset>
|
||||
<fileset dir="${unit.absolute.dir}">
|
||||
<include name="**/*.java" />
|
||||
</fileset>
|
||||
</jar>
|
||||
<jar destfile="OsmAnd-core-android.jar" manifest="MANIFEST.MF">
|
||||
<fileset dir="${bin.absolute.dir}">
|
||||
<include name="**/*.class" />
|
||||
<exclude name="**/PlatformUtil*"/>
|
||||
</fileset>
|
||||
<fileset dir="${src.absolute.dir}">
|
||||
<include name="**/*.java" />
|
||||
<exclude name="**/PlatformUtil*"/>
|
||||
</fileset>
|
||||
</jar>
|
||||
|
||||
|
||||
<delete file="MANIFEST.MF" />
|
||||
</target>
|
||||
|
||||
<target name="build" depends="jar">
|
||||
</target>
|
||||
</project>
|
||||
|
|
@ -45,7 +45,7 @@ public class RouteResultPreparationTest {
|
|||
|
||||
@BeforeClass
|
||||
public static void setUp() throws Exception {
|
||||
String fileName = "../../resources/test-resources/Turn_lanes_test.obf";
|
||||
String fileName = "src/test/resources/Turn_lanes_test.obf";
|
||||
|
||||
File fl = new File(fileName);
|
||||
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ public class RouteTestingTest {
|
|||
|
||||
@Test
|
||||
public void testRouting() throws Exception {
|
||||
String fl = "../../resources/test-resources/Routing_test.obf";
|
||||
String fl = "src/test/resources/Routing_test.obf";
|
||||
RandomAccessFile raf = new RandomAccessFile(fl, "r");
|
||||
RoutePlannerFrontEnd fe = new RoutePlannerFrontEnd(false);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,287 +0,0 @@
|
|||
[
|
||||
{
|
||||
"testName": "3.Different routes depending on start coordinates https://github.com/osmandapp/Osmand/issues/1197",
|
||||
"description": "При planRoadDirection='-1' маршрут неверный, при 0 - верный",
|
||||
"params": {
|
||||
"vehicle": "car",
|
||||
"short_way_": "",
|
||||
"planRoadDirection": "-1"
|
||||
},
|
||||
|
||||
"startPoint": {
|
||||
"latitude": 45.9081,
|
||||
"longitude": 35.2502
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.9095,
|
||||
"longitude": 35.2437
|
||||
},
|
||||
"expectedResults": {
|
||||
"30657405": "true",
|
||||
"178721843": "false"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "4.Penalty for traffic signals changes the route from tertiary road to service road https://github.com/osmandapp/Osmand/issues/3368",
|
||||
"description": "shortRoute=false",
|
||||
"params": {
|
||||
"vehicle": "car",
|
||||
"planRoadDirection": "-1"
|
||||
},
|
||||
|
||||
"startPoint": {
|
||||
"latitude": 45.90810929390909,
|
||||
"longitude": 35.25023227930072
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.90951460825728,
|
||||
"longitude": 35.24373865127566
|
||||
},
|
||||
"expectedResults": {
|
||||
"178721843": "false"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "5.Route depends on the distance to a junction, if routing engine takes the longer way https://github.com/osmandapp/Osmand/issues/1200",
|
||||
"description": "Подтверждается только неверный маршрут. От дистанции не зависит, но зависит от planRoadDirection. При -1 маршрут верный, при 0 - нет",
|
||||
"ignore" : "false",
|
||||
"params": {
|
||||
"vehicle": "car",
|
||||
"short_way": "true",
|
||||
"planRoadDirection": "0"
|
||||
},
|
||||
"startPoint": {
|
||||
"latitude": 45.897117500680615,
|
||||
"longitude": 35.3328966200352
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.89920161032259,
|
||||
"longitude": 35.335714280605345
|
||||
},
|
||||
"expectedResults": {
|
||||
"93014632": "false"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "5.Osmand occasionally routes on and off freeways at the same exit https://groups.google.com/forum/#!msg/osmand/g9qXEne4Ers/1M3t0hM394UJ",
|
||||
"description": "Не воспроизводится",
|
||||
"params": {
|
||||
"vehicle": "car",
|
||||
"short_way": "true",
|
||||
"planRoadDirection": "-1"
|
||||
},
|
||||
"startPoint": {
|
||||
"latitude": 45.931599776352,
|
||||
"longitude": 35.35250289738181
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.88367250724874,
|
||||
"longitude": 35.35755617916587
|
||||
},
|
||||
"expectedResults": {
|
||||
"5570541": "false"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "6.Intermediate destination is not routed on residential ways https://github.com/osmandapp/Osmand/issues/2362",
|
||||
"params": {
|
||||
"vehicle": "car",
|
||||
"short_way": "true",
|
||||
"planRoadDirection": "-1"
|
||||
},
|
||||
"startPoint": {
|
||||
"latitude": 45.897651835396935,
|
||||
"longitude": 35.38294060528281
|
||||
},
|
||||
"transitPoint1": {
|
||||
"latitude": 45.89895,
|
||||
"longitude": 35.3849
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.89756970218551,
|
||||
"longitude": 35.38740380108359
|
||||
},
|
||||
"expectedResults": {
|
||||
"44358491": "true"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "9.Routing problem: bypassing destination then backtracking to get there https://github.com/osmandapp/Osmand/issues/2182",
|
||||
"params": {
|
||||
"vehicle": "car",
|
||||
"short_way": "true",
|
||||
"planRoadDirection": "-1"
|
||||
},
|
||||
"startPoint": {
|
||||
"latitude": 45.89801665781154,
|
||||
"longitude": 35.43031065901761
|
||||
},
|
||||
"transitPoint": {
|
||||
"latitude": 45.892986,
|
||||
"longitude": 35.449814
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.88814493393098,
|
||||
"longitude": 35.451634220686
|
||||
},
|
||||
"expectedResults": {
|
||||
"368643371": "false"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "10.Longer route preferred? https://github.com/osmandapp/Osmand/issues/1941",
|
||||
"description": "short_way строит не самый короткий путь. Транзит через MEX 261 короче.",
|
||||
"ignore" : "false",
|
||||
"params": {
|
||||
"vehicle": "car",
|
||||
"short_way": "true",
|
||||
"planRoadDirection": "0"
|
||||
},
|
||||
"startPoint": {
|
||||
"latitude": 45.9011493841283,
|
||||
"longitude": 35.493414759635954
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.88636204636078,
|
||||
"longitude": 35.486109763383894
|
||||
},
|
||||
"expectedResults": {
|
||||
"53445": "true"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "12.Bizarre navigation at Sundance dr & Sentinel dr in Fremont, CA, USA https://github.com/osmandapp/Osmand/issues/1743",
|
||||
"ignore" : "false",
|
||||
"params": {
|
||||
"vehicle": "car",
|
||||
"short_way": "true",
|
||||
"planRoadDirection": "-1"
|
||||
},
|
||||
"startPoint": {
|
||||
"latitude": 45.84882743070033,
|
||||
"longitude": 35.2621882259846
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.847528944857174,
|
||||
"longitude": 35.27665740251544
|
||||
},
|
||||
"expectedResults": {
|
||||
"6344915": "false",
|
||||
"6346622": "true"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "12.1.Bizarre navigation at Sundance dr & Sentinel dr in Fremont, CA, USA (reverse) https://github.com/osmandapp/Osmand/issues/1743",
|
||||
"ignore" : "false",
|
||||
"params": {
|
||||
"vehicle": "car",
|
||||
"short_way": "true",
|
||||
"planRoadDirection": "-1"
|
||||
},
|
||||
"startPoint": {
|
||||
"latitude": 45.84747047681003,
|
||||
"longitude": 35.276624009925854
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.84886985240254,
|
||||
"longitude": 35.262113259155285
|
||||
},
|
||||
"expectedResults": {
|
||||
"6346622": "true"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "16.Offline Routing: maxheight not supported yet? https://github.com/osmandapp/Osmand/issues/1830",
|
||||
"params": {
|
||||
"vehicle": "car",
|
||||
"height": "4",
|
||||
"planRoadDirection": "0"
|
||||
},
|
||||
"startPoint": {
|
||||
"latitude": 45.8524068832173,
|
||||
"longitude": 35.40013790130615
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.8515661945522,
|
||||
"longitude": 35.39499878883362
|
||||
},
|
||||
"expectedResults": {
|
||||
"7423385": "false"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "17.Offline Routing: mysterious wrong routing in Leipzig, Germany https://github.com/osmandapp/Osmand/issues/2748",
|
||||
"params": {
|
||||
"vehicle": "car",
|
||||
"planRoadDirection": "-1"
|
||||
},
|
||||
"startPoint": {
|
||||
"latitude": 45.85080675366101,
|
||||
"longitude": 35.42325108489041
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.85135974896413,
|
||||
"longitude": 35.419131211843535
|
||||
},
|
||||
"expectedResults": {
|
||||
"28869574": "false"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "18.navi-problem by 'shortes' way https://github.com/osmandapp/Osmand/issues/1778",
|
||||
"params": {
|
||||
"vehicle": "car",
|
||||
"short_way": "true",
|
||||
"planRoadDirection": "-1"
|
||||
},
|
||||
"startPoint": {
|
||||
"latitude": 45.84411619580555,
|
||||
"longitude": 35.45498698195462
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.830605,
|
||||
"longitude": 35.441395
|
||||
},
|
||||
"expectedResults": {
|
||||
"181495": "false"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "19.Routing problem: OsmAnd fails to use the nearest link between two halves of a highway https://github.com/osmandapp/Osmand/issues/1970#issuecomment-209651749",
|
||||
"params": {
|
||||
"vehicle": "car",
|
||||
"short_way": "true",
|
||||
"planRoadDirection": "-1"
|
||||
},
|
||||
"startPoint": {
|
||||
"latitude": 45.84915380671208,
|
||||
"longitude": 35.496067695226714
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.849069733500244,
|
||||
"longitude": 35.49558221539502
|
||||
},
|
||||
"expectedResults": {
|
||||
"30783342": "false"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "20.Maxheight is ignored in offline routing https://github.com/osmandapp/Osmand/issues/3744",
|
||||
"params": {
|
||||
"vehicle": "car",
|
||||
"height": "4",
|
||||
"planRoadDirection": "-1"
|
||||
},
|
||||
"startPoint": {
|
||||
"latitude": 45.81900099233384,
|
||||
"longitude": 35.22841852903369
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.81680264657811,
|
||||
"longitude": 35.22845071554187
|
||||
},
|
||||
"expectedResults": {
|
||||
"93556707": "false"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
|
@ -1,705 +0,0 @@
|
|||
[
|
||||
{
|
||||
"testName": "1.Preston road TR Lorimar drive",
|
||||
"startPoint": {
|
||||
"latitude": 45.695213,
|
||||
"longitude": 35.438503
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.69567,
|
||||
"longitude": 35.440113
|
||||
},
|
||||
"expectedResults": {
|
||||
"26545": "TL|C|C|C|+TR"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "1.2.Preston road TL Lorimar drive",
|
||||
"startPoint": {
|
||||
"latitude": 45.69716379996895,
|
||||
"longitude": 35.43819894718172
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.69602851362186,
|
||||
"longitude": 35.44070949481966
|
||||
},
|
||||
"expectedResults": {
|
||||
"26557": "+TL|C|C|C|TR",
|
||||
"26517": "+TL|C|C|C",
|
||||
"26545": "TL|+C|+C"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "1.3.Baywater drive TR Preston road",
|
||||
"startPoint": {
|
||||
"latitude": 45.6960514631203,
|
||||
"longitude": 35.43735606299879
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.695624319890825,
|
||||
"longitude": 35.438198276629464
|
||||
},
|
||||
"expectedResults": {
|
||||
"26529": "TL|C|C|+TR"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "2. Valley View Lane TU Highway 161 Service Road",
|
||||
"startPoint": {
|
||||
"latitude": 45.694859388262195,
|
||||
"longitude": 35.467755138874054
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.694132477954575,
|
||||
"longitude": 35.46842032670975
|
||||
},
|
||||
"expectedResults": {
|
||||
"26789": "+TU|TL|C,TL|C|C,TR"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "2.1 Valley View Lane C Highway 161 Service Road",
|
||||
"startPoint": {
|
||||
"latitude": 45.694859388262195,
|
||||
"longitude": 35.467755138874054
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.692210341270474,
|
||||
"longitude": 35.462753385305405
|
||||
},
|
||||
"expectedResults": {
|
||||
"26705": "TU|TL|+C,TL|C|C,TR",
|
||||
"26897": "TL|+C,TL|C|C,TR",
|
||||
"26739": "TL|+C,TL|C|C"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "2.2 Valley View Lane TL Highway 161 Service Road",
|
||||
"startPoint": {
|
||||
"latitude": 45.694859388262195,
|
||||
"longitude": 35.467755138874054
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.69354592206,
|
||||
"longitude": 35.46670215889
|
||||
},
|
||||
"expectedResults": {
|
||||
"26705": "TU|+TL|+TL,C|C|C,TR",
|
||||
"26897": "+TL|+TL,C|C|C,TR",
|
||||
"26605": "TL:+TL|+TL,C|C|C"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "2.3. Highway 161 Service Road to Lyndon B Johnson Freeway (I 635) link",
|
||||
"startPoint": {
|
||||
"latitude": 45.69384114913531,
|
||||
"longitude": 35.46754793822765
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.69231235051791,
|
||||
"longitude": 35.49527125060558
|
||||
},
|
||||
"expectedResults": {
|
||||
"26717": "C:C,TSLL|+C|C",
|
||||
"26821": "TSLL:+TSLL,C|C|C",
|
||||
"29088": "C|C|C|C|+C"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "3. Motorway link from Ringweg Zuid TL Amstelveenseweg",
|
||||
"startPoint": {
|
||||
"latitude": 45.6971206184178,
|
||||
"longitude": 35.51630312204361
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.6952846638807,
|
||||
"longitude": 35.51303619146347
|
||||
},
|
||||
"expectedResults": {
|
||||
"27091": "+TL|+TL|+TL|C|TR|TR"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "3.2 Motorway link from Ringweg Zuid TL Amstelveenseweg",
|
||||
"startPoint": {
|
||||
"latitude": 45.6971206184178,
|
||||
"longitude": 35.51630312204361
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.69661945125,
|
||||
"longitude": 35.51219849021
|
||||
},
|
||||
"expectedResults": {
|
||||
"27091": "TL|TL|TL|+C|TR|TR"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "4.Tiefer TL Wilhelm-Kaisen-Brücke",
|
||||
"startPoint": {
|
||||
"latitude": 45.69999011335712,
|
||||
"longitude": 35.53932720422745
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.69952693897639,
|
||||
"longitude": 35.537424847483635
|
||||
},
|
||||
"expectedResults": {
|
||||
"27177": "+TL|+TL|C,TR"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "5.1.Fritz-Foerster-Platz (S 172) TR Bergstraße (B 170)",
|
||||
"startPoint": {
|
||||
"latitude": 45.69942484339974,
|
||||
"longitude": 35.552937403321266
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.698372030432985,
|
||||
"longitude": 35.553747430443764
|
||||
},
|
||||
"expectedResults": {
|
||||
"27231": "C|C|+TR|+TR"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "5.2.Zellescher Weg (S 172) TL Bergstraße (B 170)",
|
||||
"startPoint": {
|
||||
"latitude": 45.69887876939763,
|
||||
"longitude": 35.55432008206844
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.69869143574982,
|
||||
"longitude": 35.553684398531914
|
||||
},
|
||||
"expectedResults": {
|
||||
"27305": "+TL|+TL|C|C,TR",
|
||||
"27275": "+TL|+TL|C|C",
|
||||
"27231": "TL|+C|+C"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "6.Platz der Vereinten Nationen TR Platz der Vereinten Nationen",
|
||||
"startPoint": {
|
||||
"latitude": 45.69942016011204,
|
||||
"longitude": 35.568235382437706
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.70020132709422,
|
||||
"longitude": 35.56931899487972
|
||||
},
|
||||
"expectedResults": {
|
||||
"27411": "TL|C|+TR,C"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "7.1.Spindlersfelder Straße TR Oberspreestraße",
|
||||
"startPoint": {
|
||||
"latitude": 45.699817301524455,
|
||||
"longitude": 35.58391557633877
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.69793647478804,
|
||||
"longitude": 35.58106707036495
|
||||
},
|
||||
"expectedResults": {
|
||||
"27435": "TL|+TR,TL"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "7.2.Spindlersfelder Straße TL Oberspreestraße",
|
||||
"startPoint": {
|
||||
"latitude": 45.699817301524455,
|
||||
"longitude": 35.58391557633877
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.69657639532305,
|
||||
"longitude": 35.586447581
|
||||
},
|
||||
"expectedResults": {
|
||||
"27441": "+TL|+TL,TR",
|
||||
"27461": "TL|+C|+C"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "8.Luisenstraße TL Invalidenstraße (L 1008)",
|
||||
"startPoint": {
|
||||
"latitude": 45.698618375457045,
|
||||
"longitude": 35.59940265119076
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.698873149397336,
|
||||
"longitude": 35.597948893904686
|
||||
},
|
||||
"expectedResults": {
|
||||
"27581": "+TL|TR",
|
||||
"27591": "+C|+C,TR"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "9.Torstraße C",
|
||||
"startPoint": {
|
||||
"latitude": 45.69951195248144,
|
||||
"longitude": 35.61424867808819
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.699101695620705,
|
||||
"longitude": 35.61031924188137
|
||||
},
|
||||
"expectedResults": {
|
||||
"27611": "+C,TL|+C|TR"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "10.Ringweg Oost u-turn",
|
||||
"startPoint": {
|
||||
"latitude": 45.69722318654911,
|
||||
"longitude": 35.62708438868003
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.69793506976422,
|
||||
"longitude": 35.624509468025735
|
||||
},
|
||||
"expectedResults": {
|
||||
"14418": "TL|+TL|C|C|TR"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "11.Rembrandtlaan to Rubensstraat u-turn",
|
||||
"startPoint": {
|
||||
"latitude": 45.698570524678956,
|
||||
"longitude": 35.64198324084282
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.699327350398576,
|
||||
"longitude": 35.64244994521141
|
||||
},
|
||||
"expectedResults": {
|
||||
"7351364": null,
|
||||
"7351365": "+TL",
|
||||
"7351445": "+TL"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "13.Ira Lee Henderson Memorial Highway (US 75) u-turn",
|
||||
"startPoint": {
|
||||
"latitude": 45.691518814511134,
|
||||
"longitude": 35.66402764618397
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.69157314830206,
|
||||
"longitude": 35.66372522711754
|
||||
},
|
||||
"expectedResults": {
|
||||
"309115848": null,
|
||||
"309115858": "+TU|C|C",
|
||||
"309115891": null,
|
||||
"309115871": null,
|
||||
"309115849": null
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "14*.Figure 8 TL",
|
||||
"startPoint": {
|
||||
"latitude": 45.69816447596442,
|
||||
"longitude": 35.74885922431952
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.700075267731705,
|
||||
"longitude": 35.7467134571076
|
||||
},
|
||||
"expectedResults": {
|
||||
"43906": null,
|
||||
"43905": "+TL,C,TR"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "15.Каширское шоссе u-turn",
|
||||
"startPoint": {
|
||||
"latitude": 45.66869817293356,
|
||||
"longitude": 35.44163727760315
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.66882562819617,
|
||||
"longitude": 35.441980600357056
|
||||
},
|
||||
"expectedResults": {
|
||||
"96306": null,
|
||||
"96296": "TU:C|C|C|C|C"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "16.A10 TL Bos en Lommerweg",
|
||||
"startPoint": {
|
||||
"latitude": 45.67023519467668,
|
||||
"longitude": 35.46151900291443
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.66888943629539,
|
||||
"longitude": 35.47155582904816
|
||||
},
|
||||
"expectedResults": {
|
||||
"102992": "C|+C|TR",
|
||||
"102447": "TL|+C"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "17.Alt-Mahlsdorf S",
|
||||
"startPoint": {
|
||||
"latitude": 45.669848071308095,
|
||||
"longitude": 35.49515941739082
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.669818082408455,
|
||||
"longitude": 35.500362902879715
|
||||
},
|
||||
"expectedResults": {
|
||||
"7040281": "TL|+C|+C|TR"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "18.Stuttgarter Straße S",
|
||||
"startPoint": {
|
||||
"latitude": 45.66799997535318,
|
||||
"longitude": 35.52440086007118
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.67020418826295,
|
||||
"longitude": 35.5249265730381
|
||||
},
|
||||
"expectedResults": {
|
||||
"7057747": "TL|+C"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "19.L353 straight",
|
||||
"startPoint": {
|
||||
"latitude": 45.65874639488115,
|
||||
"longitude": 35.54377349972731
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.67263228320987,
|
||||
"longitude": 35.568321076631605
|
||||
},
|
||||
"expectedResults": {
|
||||
"328033376": "TL|+C|TR"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "20.Leimuiderweg (N207) TL Leidsestraat (N208)",
|
||||
"startPoint": {
|
||||
"latitude": 45.66587440212255,
|
||||
"longitude": 35.598875460624754
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.664455433977736,
|
||||
"longitude": 35.59152620792395
|
||||
},
|
||||
"expectedResults": {
|
||||
"385047566": "+TL|+TL,C|TR"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "21.Äußere Nürnberger Straße C",
|
||||
"startPoint": {
|
||||
"latitude": 45.66869323547558,
|
||||
"longitude": 35.61432629069333
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.668853960276834,
|
||||
"longitude": 35.61282157143597
|
||||
},
|
||||
"expectedResults": {
|
||||
"32493519": "TL|TL|+C|+C"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "22.Plaswijckweg TL Burgemeester van Reenensingel",
|
||||
"startPoint": {
|
||||
"latitude": 45.67016598220978,
|
||||
"longitude": 35.62939762314801
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.66791678292395,
|
||||
"longitude": 35.63232659539227
|
||||
},
|
||||
"expectedResults": {
|
||||
"202493001": "+TL,C|TR",
|
||||
"339767384": "+TL,C"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "23.Oranje Nassausingel TL Oostkanaalweg",
|
||||
"startPoint": {
|
||||
"latitude": 45.66099243044554,
|
||||
"longitude": 35.64553111037259
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.66301696427094,
|
||||
"longitude": 35.6475320382977
|
||||
},
|
||||
"expectedResults": {
|
||||
"176772179": "+TL|+TL,C|TR|TR"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "24.Alt-Mahlsdorf S",
|
||||
"startPoint": {
|
||||
"latitude": 45.665177901535905,
|
||||
"longitude": 35.69627156853679
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.66538830951218,
|
||||
"longitude": 35.673745706677465
|
||||
},
|
||||
"expectedResults": {
|
||||
"343841020": "TL|+C|+C|TR"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "25.Blumberger Damm TR Warener Straße",
|
||||
"startPoint": {
|
||||
"latitude": 45.633618533007024,
|
||||
"longitude": 35.43691737949851
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.63640923513949,
|
||||
"longitude": 35.439041689038305
|
||||
},
|
||||
"expectedResults": {
|
||||
"66218888": "TL|C|+TR,C"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "26.Spieringweg TL Kruisweg",
|
||||
"startPoint": {
|
||||
"latitude": 45.63933380187198,
|
||||
"longitude": 35.4753301003762
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.63545549083473,
|
||||
"longitude": 35.47344182522971
|
||||
},
|
||||
"expectedResults": {
|
||||
"7406182": "+TL,C|TR"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "27.TSLR Großer Stern (Berlin)",
|
||||
"startPoint": {
|
||||
"latitude": 45.64019080086255,
|
||||
"longitude": 35.5037784576416
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.63936941405474,
|
||||
"longitude": 35.5013644695282
|
||||
},
|
||||
"expectedResults": {
|
||||
"61820398":"C|+C|+C|+C|TSLR|TSLR",
|
||||
"4400154": "C|C|+TSLR,C|+TSLR|+TSLR"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "28.1.Link +TSLL,C",
|
||||
"startPoint": {
|
||||
"latitude": 45.64069524601371,
|
||||
"longitude": 35.541367523279234
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.63966758220834,
|
||||
"longitude": 35.54365276535992
|
||||
},
|
||||
"expectedResults": {
|
||||
"118669516": "TSLL:+TSLL,C"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "28.2.Link +TSLR,С",
|
||||
"startPoint": {
|
||||
"latitude": 45.64211106582103,
|
||||
"longitude": 35.54128705700879
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.640884649147,
|
||||
"longitude": 35.53820788105969
|
||||
},
|
||||
"expectedResults": {
|
||||
"118669511": "TSLR:+TSLR,C"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "29.1.Reichsstraße TR Steubenplatz",
|
||||
"startPoint": {
|
||||
"latitude": 45.641390502389285,
|
||||
"longitude": 35.57718708356862
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.641863065524895,
|
||||
"longitude": 35.57690276941304
|
||||
},
|
||||
"expectedResults": {
|
||||
"4515869": "TL,C|C|+TR"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "29.2.Reichsstraße TL Steubenplatz",
|
||||
"startPoint": {
|
||||
"latitude": 45.641390502389285,
|
||||
"longitude": 35.57718708356862
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.64190900895048,
|
||||
"longitude": 35.57607396682744
|
||||
},
|
||||
"expectedResults": {
|
||||
"4604862": "+TL|+TL,C|C"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "30.South Kent Des Moines Road straight",
|
||||
"startPoint": {
|
||||
"latitude": 45.63984413581538,
|
||||
"longitude": 35.607624174931516
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.64101806770461,
|
||||
"longitude": 35.60625088391589
|
||||
},
|
||||
"expectedResults": {
|
||||
"265002602": "TL|TL|+C|+C|TSLR",
|
||||
"362433819": "TL|TL|+C|+C"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "31.E19 to A9",
|
||||
"startPoint": {
|
||||
"latitude": 45.64749648785519,
|
||||
"longitude": 35.640286803245544
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.638630530702,
|
||||
"longitude": 35.63677579164505
|
||||
},
|
||||
"expectedResults": {
|
||||
"138581966": "C|C|C|+C|+C|C"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "32.Motorway TR South Kent Des Moines Road",
|
||||
"startPoint": {
|
||||
"latitude": 45.64518099200965,
|
||||
"longitude": 35.668448954820605
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.64374087245139,
|
||||
"longitude": 35.66181853413579
|
||||
},
|
||||
"expectedResults": {
|
||||
"222244": "TL|TL|+C,TR",
|
||||
"222243": "TL|TL|+C|+C|TSLR",
|
||||
"222164": "TL|TL|+C|+C"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "33.TR B51",
|
||||
"startPoint": {
|
||||
"latitude": 45.643927452535614,
|
||||
"longitude": 35.686421766877146
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.64018823173377,
|
||||
"longitude": 35.68512357771394
|
||||
},
|
||||
"expectedResults": {
|
||||
"320168795": "C,TL|+TR"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "34.Semmering-Schnellstraße TL Wiener Straße",
|
||||
"startPoint": {
|
||||
"latitude": 45.60877412952071,
|
||||
"longitude": 35.41727355122569
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.60809863951456,
|
||||
"longitude": 35.43970754742625
|
||||
},
|
||||
"expectedResults": {
|
||||
"32486314": "C|C|+TSLR"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "35.B 22 TR NEW 41",
|
||||
"params": {
|
||||
"vehicle": "car",
|
||||
"short_way": "true"
|
||||
},
|
||||
"startPoint": {
|
||||
"latitude": 45.61344391190965,
|
||||
"longitude": 35.47873288392847
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.60452753118045,
|
||||
"longitude": 35.47435551881617
|
||||
},
|
||||
"expectedResults": {
|
||||
"84975049": "TL|+TR,C"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "36.Bierweg TR Äußere Bayreuther Straße (B 2) ",
|
||||
"startPoint": {
|
||||
"latitude": 45.61486172708771,
|
||||
"longitude": 35.50859335064885
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.61364315690609,
|
||||
"longitude": 35.51007661223409
|
||||
},
|
||||
"expectedResults": {
|
||||
"35361252": "TL|+TR,C"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "37.Lingener Straße TR Osttangente",
|
||||
"startPoint": {
|
||||
"latitude": 45.61665251148337,
|
||||
"longitude": 35.534761190414315
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.6152041541823,
|
||||
"longitude": 35.53729453682888
|
||||
},
|
||||
"expectedResults": {
|
||||
"75576478": "TL|C|C|+TR"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "38.Freeway A20 TR",
|
||||
"startPoint": {
|
||||
"latitude": 45.614017077100364,
|
||||
"longitude": 35.56860889494419
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.61377692625833,
|
||||
"longitude": 35.57223255932331
|
||||
},
|
||||
"expectedResults": {
|
||||
"77729": "C|C|C|+TSLR"
|
||||
}
|
||||
},
|
||||
{
|
||||
"testName": "39.5003",
|
||||
"startPoint": {
|
||||
"latitude": 45.61561133366637,
|
||||
"longitude": 35.60593853890896
|
||||
},
|
||||
"endPoint": {
|
||||
"latitude": 45.615545669389455,
|
||||
"longitude": 35.6042527705431
|
||||
},
|
||||
"expectedResults": {
|
||||
"129459": "C|+C|+C"
|
||||
}
|
||||
}
|
||||
|
||||
]
|
||||
|
|
@ -288,33 +288,7 @@ task collectHelpContentsAssets(type: Copy) {
|
|||
into "assets/feature_articles"
|
||||
}
|
||||
|
||||
task collectRoutingResources(type: Sync) {
|
||||
from "../../resources/routing"
|
||||
into "src/net/osmand/router"
|
||||
include "*.xml"
|
||||
}
|
||||
|
||||
task collectMiscResources(type: Copy) {
|
||||
into "src/net/osmand/osm"
|
||||
from("../../resources/obf_creation") {
|
||||
include "rendering_types.xml"
|
||||
}
|
||||
from("../../resources/poi") {
|
||||
include "poi_types.xml"
|
||||
}
|
||||
}
|
||||
|
||||
task collectRenderingStylesResources(type: Sync) {
|
||||
from "../../resources/rendering_styles"
|
||||
into "src/net/osmand/render"
|
||||
include "*.xml"
|
||||
}
|
||||
|
||||
task collectRegionsInfoResources(type: Copy) {
|
||||
from "../../resources/countries-info"
|
||||
into "src/net/osmand/map"
|
||||
include "regions.ocbf"
|
||||
}
|
||||
|
||||
task copyStyleIcons(type: Copy) {
|
||||
from "../../resources/rendering_styles/style-icons/"
|
||||
|
|
@ -327,10 +301,6 @@ task collectExternalResources {
|
|||
collectFonts,
|
||||
collectHelpContentsAssets,
|
||||
collectHelpContentsStyle,
|
||||
collectRoutingResources,
|
||||
collectRenderingStylesResources,
|
||||
collectRegionsInfoResources,
|
||||
collectMiscResources,
|
||||
copyStyleIcons,
|
||||
updateNoTranslate,
|
||||
validateTranslate
|
||||
|
|
|
|||
Loading…
Reference in a new issue