mirror
/
MapWithAI
kopia lustrzana https://github.com/JOSM/MapWithAI
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix availability due to change in JSON file 

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
pull/1/head v0.1.7
Taylor Smock 2019-10-24 10:40:31 -06:00
rodzic f55a161b29
commit a81bc7a62b
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 625F6A74A3E4311A
5 zmienionych plików z 50 dodań i 47 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIAvailability.java
Wyświetl plik

@ -42,6 +42,9 @@ public final class MapWithAIAvailability {
static {
COUNTRY_NAME_FIX.put("Egypt", "Egypt, Arab Rep.");
COUNTRY_NAME_FIX.put("Dem. Rep. Congo", "Congo, Dem. Rep.");
COUNTRY_NAME_FIX.put("Democratic Republic of the Congo", "Congo, Dem. Rep.");
COUNTRY_NAME_FIX.put("eSwatini", "Swaziland");
COUNTRY_NAME_FIX.put("Gambia", "Gambia, The");
POSSIBLE_DATA_POINTS.put("roads", "RapiD roads available");
POSSIBLE_DATA_POINTS.put("buildings", "MS buildings available");
}
@ -56,7 +59,7 @@ public final class MapWithAIAvailability {
.filter(entry -> "objects".equals(entry.getKey())).findFirst();
if (objects.isPresent()) {
final JsonObject value = objects.get().getValue().asJsonObject();
final JsonObject centroid = value.getJsonObject("rapid_releases_1011_centroid");
final JsonObject centroid = value.getJsonObject("rapid_releases_points");
final JsonArray countries = centroid.getJsonArray("geometries");
COUNTRIES.clear();
COUNTRIES.putAll(parseForCountries(countries));

40
test/resources/wiremock/mappings/facebookmicrosites_open-mapping-at-facebook_master_data_rapid_realeasesgeojson-d624c425-7142-4c4b-ab08-4e60812fc3bb.json
Wyświetl plik

File diff suppressed because one or more lines are too long

40
test/resources/wiremock/mappings/facebookmicrosites_open-mapping-at-facebook_master_data_rapid_releasesgeojson-61441fba-0610-488e-bda0-006c9f14021d.json 100644
Wyświetl plik

File diff suppressed because one or more lines are too long

10
test/resources/wiremock/mappings/facebookmicrosites_open-mapping-at-facebook_raw_master_data_rapid_releasesgeojson-7ee35a58-3272-4e21-ad72-fe7b63cdfcd9.json → test/resources/wiremock/mappings/facebookmicrosites_open-mapping-at-facebook_raw_master_data_rapid_releasesgeojson-c23bbc7a-641a-4cdb-abf0-d9b4e5a4e36f.json
Wyświetl plik

@ -1,5 +1,5 @@
{
"id" : "7ee35a58-3272-4e21-ad72-fe7b63cdfcd9",
"id" : "c23bbc7a-641a-4cdb-abf0-d9b4e5a4e36f",
"name" : "facebookmicrosites_open-mapping-at-facebook_raw_master_data_rapid_releasesgeojson",
"request" : {
"url" : "/facebookmicrosites/Open-Mapping-At-Facebook/raw/master/data/rapid_releases.geojson",
@ -10,7 +10,7 @@
"body" : "<html><body>You are being <a href=\"https://raw.githubusercontent.com/facebookmicrosites/Open-Mapping-At-Facebook/master/data/rapid_releases.geojson\">redirected</a>.</body></html>",
"headers" : {
"Server" : "GitHub.com",
"Date" : "Tue, 22 Oct 2019 13:34:08 GMT",
"Date" : "Thu, 24 Oct 2019 16:54:29 GMT",
"Content-Type" : "text/html; charset=utf-8",
"Status" : "302 Found",
"Vary" : "X-PJAX",
@ -24,10 +24,10 @@
"Expect-CT" : "max-age=2592000, report-uri=\"https://api.github.com/_private/browser/errors\"",
"Content-Security-Policy" : "default-src 'none'; base-uri 'self'; block-all-mixed-content; connect-src 'self' uploads.github.com www.githubstatus.com collector.githubapp.com api.github.com www.google-analytics.com github-cloud.s3.amazonaws.com github-production-repository-file-5c1aeb.s3.amazonaws.com github-production-upload-manifest-file-7fdce7.s3.amazonaws.com github-production-user-asset-6210df.s3.amazonaws.com wss://live.github.com; font-src github.githubassets.com; form-action 'self' github.com gist.github.com; frame-ancestors 'none'; frame-src render.githubusercontent.com; img-src 'self' data: github.githubassets.com identicons.github.com collector.githubapp.com github-cloud.s3.amazonaws.com *.githubusercontent.com; manifest-src 'self'; media-src 'none'; script-src github.githubassets.com; style-src 'unsafe-inline' github.githubassets.com",
"Age" : "0",
"X-GitHub-Request-Id" : "C480:131C:47E9FC:88EC79:5DAF0550"
"X-GitHub-Request-Id" : "CA53:239D:1BDBEC:33B854:5DB1D745"
}
},
"uuid" : "7ee35a58-3272-4e21-ad72-fe7b63cdfcd9",
"uuid" : "c23bbc7a-641a-4cdb-abf0-d9b4e5a4e36f",
"persistent" : true,
"insertionIndex" : 12
"insertionIndex" : 31
}

2
test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIAvailabilityTest.java
Wyświetl plik

@ -32,7 +32,7 @@ public class MapWithAIAvailabilityTest {
@Before
public void setUp() {
MapWithAIAvailability.setReleaseUrl(wireMockRule.baseUrl()
+ "/facebookmicrosites/Open-Mapping-At-Facebook/master/data/rapid_realeases.geojson");
+ "/facebookmicrosites/Open-Mapping-At-Facebook/master/data/rapid_releases.geojson");
Territories.initialize();
instance = MapWithAIAvailability.getInstance();
LatLon temp = new LatLon(40, -100);