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

Temporarily remove buildings from conflation 

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
pull/1/head
Taylor Smock 2019-11-11 17:43:16 -07:00
rodzic 220de3cb5d
commit 97c45649a7
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 625F6A74A3E4311A
38 zmienionych plików z 185 dodań i 727 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIPreferenceHelper.java
Wyświetl plik

@ -13,7 +13,7 @@ import org.openstreetmap.josm.plugins.mapwithai.MapWithAIPlugin;
import org.openstreetmap.josm.spi.preferences.Config;
public final class MapWithAIPreferenceHelper {
public static final String DEFAULT_MAPWITHAI_API = "https://www.facebook.com/maps/ml_roads?conflate_with_osm=true&theme=ml_road_vector&collaborator=josm&token=ASb3N5o9HbX8QWn8G_NtHIRQaYv3nuG2r7_f3vnGld3KhZNCxg57IsaQyssIaEw5rfRNsPpMwg4TsnrSJtIJms5m&hash=ASawRla3rBcwEjY4HIY&result_type=road_building_vector_xml&bbox={bbox}";
public static final String DEFAULT_MAPWITHAI_API = "https://www.facebook.com/maps/ml_roads?conflate_with_osm=true&theme=ml_road_vector&collaborator=josm&token=ASb3N5o9HbX8QWn8G_NtHIRQaYv3nuG2r7_f3vnGld3KhZNCxg57IsaQyssIaEw5rfRNsPpMwg4TsnrSJtIJms5m&hash=ASawRla3rBcwEjY4HIY&bbox={bbox}";
private static final int DEFAULT_MAXIMUM_ADDITION = 5;
private static final String AUTOSWITCHLAYERS = MapWithAIPlugin.NAME.concat(".autoswitchlayers");
private static final String MERGEBUILDINGADDRESSES = MapWithAIPlugin.NAME.concat(".mergebuildingaddresses");

25
test/resources/wiremock/mappings/06_nodes-982f4ad5-bf25-49aa-a616-f160e14eaed1.json
Wyświetl plik

@ -1,25 +0,0 @@
{
"id" : "982f4ad5-bf25-49aa-a616-f160e14eaed1",
"name" : "06_nodes",
"request" : {
"url" : "/0.6/nodes?nodes=6146500887",
"method" : "GET"
},
"response" : {
"status" : 200,
"body" : "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<osm version=\"0.6\" generator=\"CGImap 0.7.5 (3009 thorn-01.openstreetmap.org)\" copyright=\"OpenStreetMap and contributors\" attribution=\"http://www.openstreetmap.org/copyright\" license=\"http://opendatacommons.org/licenses/odbl/1-0/\">\n <node id=\"6146500887\" visible=\"true\" version=\"4\" changeset=\"66847511\" timestamp=\"2019-02-02T00:23:35Z\" user=\"vorpalblade\" uid=\"2078753\" lat=\"39.0674124\" lon=\"-108.5592645\">\n <tag k=\"couplings\" v=\"3\"/>\n <tag k=\"emergency\" v=\"fire_hydrant\"/>\n <tag k=\"fire_hydrant:awwa_class\" v=\"AA\"/>\n <tag k=\"fire_hydrant:position\" v=\"sidewalk\"/>\n <tag k=\"fire_hydrant:type\" v=\"pillar\"/>\n <tag k=\"manufacturer\" v=\"Clow Valve Company\"/>\n <tag k=\"model\" v=\"Iowa\"/>\n </node>\n</osm>\n",
"headers" : {
"Date" : "Mon, 14 Oct 2019 22:53:09 GMT",
"Server" : "Apache/2.4.29 (Ubuntu)",
"Strict-Transport-Security" : [ "max-age=31536000; includeSubDomains; preload", "max-age=31536000; includeSubDomains; preload" ],
"Expect-CT" : [ "max-age=0, report-uri=\"https://openstreetmap.report-uri.com/r/d/ct/reportOnly\"", "max-age=0, report-uri=\"https://openstreetmap.report-uri.com/r/d/ct/reportOnly\"" ],
"Cache-Control" : "private, max-age=0, must-revalidate",
"Content-Type" : "text/xml; charset=utf-8",
"Keep-Alive" : "timeout=5, max=99",
"Connection" : "Keep-Alive"
}
},
"uuid" : "982f4ad5-bf25-49aa-a616-f160e14eaed1",
"persistent" : true,
"insertionIndex" : 11
}

10
test/resources/wiremock/mappings/06_nodes-fa0deb8f-2ce4-46b2-9f12-2100ccafa0a6.json → test/resources/wiremock/mappings/06_nodes-ab5282eb-d4ab-4db9-97de-2c62528e865a.json
Wyświetl plik

@ -1,5 +1,5 @@
{
"id" : "fa0deb8f-2ce4-46b2-9f12-2100ccafa0a6",
"id" : "ab5282eb-d4ab-4db9-97de-2c62528e865a",
"name" : "06_nodes",
"request" : {
"url" : "/0.6/nodes?nodes=6151680832",
@ -7,9 +7,9 @@
},
"response" : {
"status" : 200,
"body" : "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<osm version=\"0.6\" generator=\"CGImap 0.7.5 (32264 thorn-02.openstreetmap.org)\" copyright=\"OpenStreetMap and contributors\" attribution=\"http://www.openstreetmap.org/copyright\" license=\"http://opendatacommons.org/licenses/odbl/1-0/\">\n <node id=\"6151680832\" visible=\"true\" version=\"3\" changeset=\"66841675\" timestamp=\"2019-02-01T19:05:18Z\" user=\"vorpalblade\" uid=\"2078753\" lat=\"39.0673990\" lon=\"-108.5608433\">\n <tag k=\"bonnet:colour\" v=\"blue\"/>\n <tag k=\"cap:colour\" v=\"blue\"/>\n <tag k=\"colour\" v=\"yellow\"/>\n <tag k=\"couplings\" v=\"3\"/>\n <tag k=\"emergency\" v=\"fire_hydrant\"/>\n <tag k=\"fire_hydrant:type\" v=\"pillar\"/>\n <tag k=\"pillar:type\" v=\"dry_barrel\"/>\n <tag k=\"water_source\" v=\"main\"/>\n </node>\n</osm>\n",
"body" : "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<osm version=\"0.6\" generator=\"CGImap 0.7.5 (32277 thorn-02.openstreetmap.org)\" copyright=\"OpenStreetMap and contributors\" attribution=\"http://www.openstreetmap.org/copyright\" license=\"http://opendatacommons.org/licenses/odbl/1-0/\">\n <node id=\"6151680832\" visible=\"true\" version=\"3\" changeset=\"66841675\" timestamp=\"2019-02-01T19:05:18Z\" user=\"vorpalblade\" uid=\"2078753\" lat=\"39.0673990\" lon=\"-108.5608433\">\n <tag k=\"bonnet:colour\" v=\"blue\"/>\n <tag k=\"cap:colour\" v=\"blue\"/>\n <tag k=\"colour\" v=\"yellow\"/>\n <tag k=\"couplings\" v=\"3\"/>\n <tag k=\"emergency\" v=\"fire_hydrant\"/>\n <tag k=\"fire_hydrant:type\" v=\"pillar\"/>\n <tag k=\"pillar:type\" v=\"dry_barrel\"/>\n <tag k=\"water_source\" v=\"main\"/>\n </node>\n</osm>\n",
"headers" : {
"Date" : "Mon, 14 Oct 2019 22:53:09 GMT",
"Date" : "Tue, 12 Nov 2019 16:33:03 GMT",
"Server" : "Apache/2.4.29 (Ubuntu)",
"Strict-Transport-Security" : [ "max-age=31536000; includeSubDomains; preload", "max-age=31536000; includeSubDomains; preload" ],
"Expect-CT" : [ "max-age=0, report-uri=\"https://openstreetmap.report-uri.com/r/d/ct/reportOnly\"", "max-age=0, report-uri=\"https://openstreetmap.report-uri.com/r/d/ct/reportOnly\"" ],
@ -19,7 +19,7 @@
"Connection" : "Keep-Alive"
}
},
"uuid" : "fa0deb8f-2ce4-46b2-9f12-2100ccafa0a6",
"uuid" : "ab5282eb-d4ab-4db9-97de-2c62528e865a",
"persistent" : true,
"insertionIndex" : 12
"insertionIndex" : 11
}

25
test/resources/wiremock/mappings/06_nodes-da4387b6-e545-4b93-961e-e869cbcab122.json 100644
Wyświetl plik

@ -0,0 +1,25 @@
{
"id" : "da4387b6-e545-4b93-961e-e869cbcab122",
"name" : "06_nodes",
"request" : {
"url" : "/0.6/nodes?nodes=6146500887",
"method" : "GET"
},
"response" : {
"status" : 200,
"body" : "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<osm version=\"0.6\" generator=\"CGImap 0.7.5 (32252 thorn-02.openstreetmap.org)\" copyright=\"OpenStreetMap and contributors\" attribution=\"http://www.openstreetmap.org/copyright\" license=\"http://opendatacommons.org/licenses/odbl/1-0/\">\n <node id=\"6146500887\" visible=\"true\" version=\"4\" changeset=\"66847511\" timestamp=\"2019-02-02T00:23:35Z\" user=\"vorpalblade\" uid=\"2078753\" lat=\"39.0674124\" lon=\"-108.5592645\">\n <tag k=\"couplings\" v=\"3\"/>\n <tag k=\"emergency\" v=\"fire_hydrant\"/>\n <tag k=\"fire_hydrant:awwa_class\" v=\"AA\"/>\n <tag k=\"fire_hydrant:position\" v=\"sidewalk\"/>\n <tag k=\"fire_hydrant:type\" v=\"pillar\"/>\n <tag k=\"manufacturer\" v=\"Clow Valve Company\"/>\n <tag k=\"model\" v=\"Iowa\"/>\n </node>\n</osm>\n",
"headers" : {
"Date" : "Tue, 12 Nov 2019 16:33:03 GMT",
"Server" : "Apache/2.4.29 (Ubuntu)",
"Strict-Transport-Security" : [ "max-age=31536000; includeSubDomains; preload", "max-age=31536000; includeSubDomains; preload" ],
"Expect-CT" : [ "max-age=0, report-uri=\"https://openstreetmap.report-uri.com/r/d/ct/reportOnly\"", "max-age=0, report-uri=\"https://openstreetmap.report-uri.com/r/d/ct/reportOnly\"" ],
"Cache-Control" : "private, max-age=0, must-revalidate",
"Content-Type" : "text/xml; charset=utf-8",
"Keep-Alive" : "timeout=5, max=99",
"Connection" : "Keep-Alive"
}
},
"uuid" : "da4387b6-e545-4b93-961e-e869cbcab122",
"persistent" : true,
"insertionIndex" : 10
}

12
test/resources/wiremock/mappings/capabilities-194658eb-e7bb-4e22-b278-2d23246f3ff1.json → test/resources/wiremock/mappings/capabilities-1931fb41-5009-49b6-a4e1-0069c3ca1d22.json
Wyświetl plik

@ -1,5 +1,5 @@
{
"id" : "194658eb-e7bb-4e22-b278-2d23246f3ff1",
"id" : "1931fb41-5009-49b6-a4e1-0069c3ca1d22",
"name" : "capabilities",
"request" : {
"url" : "/capabilities",
@ -9,15 +9,15 @@
"status" : 200,
"body" : "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<osm version=\"0.6\" generator=\"OpenStreetMap server\" copyright=\"OpenStreetMap and contributors\" attribution=\"http://www.openstreetmap.org/copyright\" license=\"http://opendatacommons.org/licenses/odbl/1-0/\">\n <api>\n <version minimum=\"0.6\" maximum=\"0.6\"/>\n <area maximum=\"0.25\"/>\n <note_area maximum=\"25\"/>\n <tracepoints per_page=\"5000\"/>\n <waynodes maximum=\"2000\"/>\n <changesets maximum_elements=\"10000\"/>\n <timeout seconds=\"300\"/>\n <status database=\"online\" api=\"online\" gpx=\"online\"/>\n </api>\n <policy>\n <imagery>\n <blacklist regex=\".*\\.google(apis)?\\..*/(vt|kh)[\\?/].*([xyz]=.*){3}.*\"/>\n <blacklist regex=\"http://xdworld\\.vworld\\.kr:8080/.*\"/>\n <blacklist regex=\".*\\.here\\.com[/:].*\"/>\n </imagery>\n </policy>\n</osm>\n",
"headers" : {
"Date" : "Mon, 14 Oct 2019 22:53:09 GMT",
"Date" : "Tue, 12 Nov 2019 16:33:02 GMT",
"Server" : "Apache/2.4.29 (Ubuntu)",
"Cache-Control" : "max-age=0, private, must-revalidate",
"Vary" : "Origin,Accept-Encoding",
"X-Permitted-Cross-Domain-Policies" : "none",
"X-XSS-Protection" : "1; mode=block",
"X-Request-Id" : "XaT8VcQns38EL-zq1jCQEAAAAAA",
"X-Request-Id" : "XcrevuZqZvsEtGBZ7@HMHwAAAY8",
"X-Download-Options" : "noopen",
"X-Runtime" : "0.006498",
"X-Runtime" : "0.010450",
"X-Frame-Options" : "sameorigin",
"X-Content-Type-Options" : "nosniff",
"Content-Security-Policy" : "default-src 'self'; child-src 'self'; connect-src 'self' piwik.openstreetmap.org; font-src 'none'; form-action 'self'; frame-ancestors 'self'; frame-src 'self'; img-src 'self' data: www.gravatar.com *.wp.com *.tile.openstreetmap.org *.tile.thunderforest.com *.openstreetmap.fr piwik.openstreetmap.org https://openstreetmap-user-avatars.s3.dualstack.eu-west-1.amazonaws.com; manifest-src 'self'; media-src 'none'; object-src 'self'; script-src 'self' piwik.openstreetmap.org; style-src 'self'; worker-src 'none'",
@ -32,7 +32,7 @@
"Content-Type" : "application/xml; charset=utf-8"
}
},
"uuid" : "194658eb-e7bb-4e22-b278-2d23246f3ff1",
"uuid" : "1931fb41-5009-49b6-a4e1-0069c3ca1d22",
"persistent" : true,
"insertionIndex" : 10
"insertionIndex" : 9
}

30
test/resources/wiremock/mappings/maps_ml_roads-0820226b-efdd-4613-9450-df8443102632.json
Wyświetl plik

File diff suppressed because one or more lines are too long

30
test/resources/wiremock/mappings/maps_ml_roads-0ad70fa4-0aa4-435b-9928-c6a039cd549e.json
Wyświetl plik

File diff suppressed because one or more lines are too long

30
test/resources/wiremock/mappings/maps_ml_roads-212d552d-ef46-4b1f-b367-90e9f56147a9.json
Wyświetl plik

File diff suppressed because one or more lines are too long

31
test/resources/wiremock/mappings/maps_ml_roads-4603e617-02c1-43a1-8fb9-72a519c62881.json
Wyświetl plik

File diff suppressed because one or more lines are too long

30
test/resources/wiremock/mappings/maps_ml_roads-4c7d5d5c-c028-443e-9775-29af172b3188.json
Wyświetl plik

File diff suppressed because one or more lines are too long

13
test/resources/wiremock/mappings/ml_roads-ae12b6fc-abf7-48e0-8e58-84bd81a6020e.json → test/resources/wiremock/mappings/maps_ml_roads-6009fed1-4c0d-4bc9-bb59-38f9e4e4075a.json
Wyświetl plik

@ -1,8 +1,8 @@
{
"id" : "ae12b6fc-abf7-48e0-8e58-84bd81a6020e",
"name" : "ml_roads",
"id" : "6009fed1-4c0d-4bc9-bb59-38f9e4e4075a",
"name" : "maps_ml_roads",
"request" : {
"url" : "/ml_roads?conflate_with_osm=true&theme=ml_road_vector&collaborator=josm&token=ASb3N5o9HbX8QWn8G_NtHIRQaYv3nuG2r7_f3vnGld3KhZNCxg57IsaQyssIaEw5rfRNsPpMwg4TsnrSJtIJms5m&hash=ASawRla3rBcwEjY4HIY&result_type=road_building_vector_xml&bbox=-108.5715723,39.0734162,-108.5707107,39.0738791&crop_bbox=-108.5711561,39.0735205,-108.5708568,39.0736682",
"url" : "/maps/ml_roads?conflate_with_osm=true&theme=ml_road_vector&collaborator=josm&token=ASb3N5o9HbX8QWn8G_NtHIRQaYv3nuG2r7_f3vnGld3KhZNCxg57IsaQyssIaEw5rfRNsPpMwg4TsnrSJtIJms5m&hash=ASawRla3rBcwEjY4HIY&bbox=-108.5715723,39.0734162,-108.5707107,39.0738791&crop_bbox=-108.5711561,39.0735205,-108.5708568,39.0736682",
"method" : "GET"
},
"response" : {
@ -16,12 +16,13 @@
"X-Frame-Options" : "DENY",
"X-XSS-Protection" : "0",
"Access-Control-Allow-Origin" : "https://facebook.com",
"X-FB-Debug" : "njP75TEBeXP11/GnRT0KaUlhrpHlAcRMp3T9ToG+9+ZYpOybozFwS7e8F3b0HpDM7GUHtv59awjRp4fhvSM2vg==",
"Date" : "Mon, 14 Oct 2019 21:48:04 GMT",
"X-FB-Debug" : "znCxafQnUn7WKB/uHKAUwQ/U7oUOp/huKmVU9zz10bthu+PL2ZY3CS32+YdPEdPbzv/TfDRWQ/KyKWssKiaikw==",
"Date" : "Tue, 12 Nov 2019 16:16:58 GMT",
"Alt-Svc" : "h3-23=\":443\"; ma=3600",
"Connection" : "keep-alive"
}
},
"uuid" : "ae12b6fc-abf7-48e0-8e58-84bd81a6020e",
"uuid" : "6009fed1-4c0d-4bc9-bb59-38f9e4e4075a",
"persistent" : true,
"insertionIndex" : 4
}

13
test/resources/wiremock/mappings/ml_roads-75d62b89-cbe5-4125-bab5-7e9d66472ebb.json → test/resources/wiremock/mappings/maps_ml_roads-652ba7c2-465d-47df-b2a3-a3388ea825f0.json
Wyświetl plik

@ -1,8 +1,8 @@
{
"id" : "75d62b89-cbe5-4125-bab5-7e9d66472ebb",
"name" : "ml_roads",
"id" : "652ba7c2-465d-47df-b2a3-a3388ea825f0",
"name" : "maps_ml_roads",
"request" : {
"url" : "/ml_roads?conflate_with_osm=true&theme=ml_road_vector&collaborator=josm&token=ASb3N5o9HbX8QWn8G_NtHIRQaYv3nuG2r7_f3vnGld3KhZNCxg57IsaQyssIaEw5rfRNsPpMwg4TsnrSJtIJms5m&hash=ASawRla3rBcwEjY4HIY&result_type=road_building_vector_xml&bbox=-0.001,-0.001,0.0,0.0",
"url" : "/maps/ml_roads?conflate_with_osm=true&theme=ml_road_vector&collaborator=josm&token=ASb3N5o9HbX8QWn8G_NtHIRQaYv3nuG2r7_f3vnGld3KhZNCxg57IsaQyssIaEw5rfRNsPpMwg4TsnrSJtIJms5m&hash=ASawRla3rBcwEjY4HIY&bbox=-0.001,-0.001,0.0,0.0",
"method" : "GET"
},
"response" : {
@ -16,12 +16,13 @@
"X-Frame-Options" : "DENY",
"X-XSS-Protection" : "0",
"Access-Control-Allow-Origin" : "https://facebook.com",
"X-FB-Debug" : "oGEpJaHuX49aJ9sNRVyaFmxkz8lZP0Ohpjl3p1BFAHFxuFKst2xB9GCWjMpqj6tjK7WXmPo9DPzWb8L2LXWcTQ==",
"Date" : "Mon, 14 Oct 2019 21:48:11 GMT",
"X-FB-Debug" : "plFuCEMYK94NKE/73/DZzkeYuySsey+BnVLWWD07YUOCLEjJTjiH5McGU+h41N9bQFwUFI5E8c3in47r1SQ4kA==",
"Date" : "Tue, 12 Nov 2019 16:20:36 GMT",
"Alt-Svc" : "h3-23=\":443\"; ma=3600",
"Connection" : "keep-alive"
}
},
"uuid" : "75d62b89-cbe5-4125-bab5-7e9d66472ebb",
"uuid" : "652ba7c2-465d-47df-b2a3-a3388ea825f0",
"persistent" : true,
"insertionIndex" : 6
}

31
test/resources/wiremock/mappings/maps_ml_roads-74791778-8304-4d87-8c69-2beafb85226e.json
Wyświetl plik

File diff suppressed because one or more lines are too long

31
test/resources/wiremock/mappings/maps_ml_roads-9611e54d-7a15-449f-9702-2e4c741ff333.json
Wyświetl plik

File diff suppressed because one or more lines are too long

13
test/resources/wiremock/mappings/ml_roads-ee32c13b-a85b-49d7-ac53-338b3c37ebdf.json → test/resources/wiremock/mappings/maps_ml_roads-b8d51a0d-76b7-4805-b72e-61dda7951bb7.json
Wyświetl plik

@ -1,8 +1,8 @@
{
"id" : "ee32c13b-a85b-49d7-ac53-338b3c37ebdf",
"name" : "ml_roads",
"id" : "b8d51a0d-76b7-4805-b72e-61dda7951bb7",
"name" : "maps_ml_roads",
"request" : {
"url" : "/ml_roads?conflate_with_osm=true&theme=ml_road_vector&collaborator=josm&token=ASb3N5o9HbX8QWn8G_NtHIRQaYv3nuG2r7_f3vnGld3KhZNCxg57IsaQyssIaEw5rfRNsPpMwg4TsnrSJtIJms5m&hash=ASawRla3rBcwEjY4HIY&result_type=road_building_vector_xml&bbox=0.0,0.0,0.001,0.001",
"url" : "/maps/ml_roads?conflate_with_osm=true&theme=ml_road_vector&collaborator=josm&token=ASb3N5o9HbX8QWn8G_NtHIRQaYv3nuG2r7_f3vnGld3KhZNCxg57IsaQyssIaEw5rfRNsPpMwg4TsnrSJtIJms5m&hash=ASawRla3rBcwEjY4HIY&bbox=0.0,0.0,0.001,0.001",
"method" : "GET"
},
"response" : {
@ -16,12 +16,13 @@
"X-Frame-Options" : "DENY",
"X-XSS-Protection" : "0",
"Access-Control-Allow-Origin" : "https://facebook.com",
"X-FB-Debug" : "EslmENNZ6865gLeA/vlgj06w6NmF2zRhiK98druS1qBEWtE3juhoFcXnlUsryhz7dh7CuRIrkI6db6J2kCCGTw==",
"Date" : "Mon, 14 Oct 2019 21:48:11 GMT",
"X-FB-Debug" : "JepMhi9THt+anWgV2bD3AUwkBCmQHcAf93a5Sxr4w4tC4ggxVGdfCmpPbnFKM7jxb9q8elehQuf78I2KZCn6KQ==",
"Date" : "Tue, 12 Nov 2019 16:20:36 GMT",
"Alt-Svc" : "h3-23=\":443\"; ma=3600",
"Connection" : "keep-alive"
}
},
"uuid" : "ee32c13b-a85b-49d7-ac53-338b3c37ebdf",
"uuid" : "b8d51a0d-76b7-4805-b72e-61dda7951bb7",
"persistent" : true,
"insertionIndex" : 5
}

30
test/resources/wiremock/mappings/maps_ml_roads-d478d743-0386-4cd3-8adb-9513cc087616.json
Wyświetl plik

File diff suppressed because one or more lines are too long

31
test/resources/wiremock/mappings/maps_ml_roads-da2507d7-b197-4f82-b5d2-169bf6c421ae.json 100644
Wyświetl plik

@ -0,0 +1,31 @@
{
"id" : "da2507d7-b197-4f82-b5d2-169bf6c421ae",
"name" : "maps_ml_roads",
"request" : {
"url" : "/maps/ml_roads?conflate_with_osm=true&theme=ml_road_vector&collaborator=josm&token=ASb3N5o9HbX8QWn8G_NtHIRQaYv3nuG2r7_f3vnGld3KhZNCxg57IsaQyssIaEw5rfRNsPpMwg4TsnrSJtIJms5m&hash=ASawRla3rBcwEjY4HIY&bbox=-108.4625,39.0621,-108.4594,39.0633",
"method" : "GET"
},
"response" : {
"status" : 200,
"body" : "<?xml version=\"1.0\"?>\n<osm attribution=\"http://www.openstreetmap.org/copyright\" copyright=\"OpenStreetMap and contributors\" generator=\"fb_conflation_service\" version=\"0.6\">\n <bounds maxlat=\"39.06329\" maxlon=\"-108.45941287902\" minlat=\"39.06211\" minlon=\"-108.46248712098\"/>\n <node action=\"modify\" id=\"-507451533360537\" lat=\"39.0627986\" lon=\"-108.4607434\" visible=\"true\">\n <tag k=\"conn\" v=\"w489117884,n1337868173,n2390205409\"/>\n </node>\n <node action=\"modify\" id=\"-447607076088874\" lat=\"39.0627944\" lon=\"-108.4614409\" visible=\"true\">\n <tag k=\"conn\" v=\"w489117884,n176212515,n1337868173\"/>\n </node>\n <node action=\"modify\" id=\"-367646030587413\" lat=\"39.0621490\" lon=\"-108.4614409\" visible=\"true\"/>\n <node action=\"modify\" id=\"-512424752862157\" lat=\"39.0621073\" lon=\"-108.4614624\" visible=\"true\"/>\n <node action=\"modify\" id=\"-2661924864034455\" lat=\"39.0618533\" lon=\"-108.4614677\" visible=\"true\"/>\n <node action=\"modify\" id=\"-1359413207542142\" lat=\"39.0624696\" lon=\"-108.4607273\" visible=\"true\"/>\n <node action=\"modify\" id=\"-480100986137751\" lat=\"39.0624363\" lon=\"-108.4607434\" visible=\"true\"/>\n <node action=\"modify\" id=\"-2324123227677172\" lat=\"39.0618533\" lon=\"-108.4607542\" visible=\"true\"/>\n <node action=\"modify\" id=\"-1665763650222613\" lat=\"39.0621573\" lon=\"-108.4610439\" visible=\"true\"/>\n <node action=\"modify\" id=\"-516655755810722\" lat=\"39.0624530\" lon=\"-108.4599172\" visible=\"true\"/>\n <way action=\"modify\" id=\"-3490187867011827995\" orig_id=\"-487611782050068\" visible=\"true\">\n <nd ref=\"-367646030587413\"/>\n <nd ref=\"-512424752862157\"/>\n <nd ref=\"-2661924864034455\"/>\n <tag k=\"highway\" v=\"residential\"/>\n <tag k=\"source\" v=\"digitalglobe\"/>\n </way>\n <way action=\"modify\" id=\"-580832622321925\" visible=\"true\">\n <nd ref=\"-367646030587413\"/>\n <nd ref=\"-1665763650222613\"/>\n <tag k=\"highway\" v=\"residential\"/>\n <tag k=\"source\" v=\"digitalglobe\"/>\n </way>\n <way action=\"modify\" id=\"-3490187867011827994\" orig_id=\"-487611782050068\" visible=\"true\">\n <nd ref=\"-367646030587413\"/>\n <nd ref=\"-447607076088874\"/>\n <tag k=\"highway\" v=\"residential\"/>\n <tag k=\"source\" v=\"digitalglobe\"/>\n </way>\n <way action=\"modify\" id=\"-414732926053825\" visible=\"true\">\n <nd ref=\"-507451533360537\"/>\n <nd ref=\"-1359413207542142\"/>\n <nd ref=\"-480100986137751\"/>\n <nd ref=\"-2324123227677172\"/>\n <tag k=\"highway\" v=\"residential\"/>\n <tag k=\"source\" v=\"digitalglobe\"/>\n </way>\n <way action=\"modify\" id=\"-2431015640267087\" visible=\"true\">\n <nd ref=\"-1359413207542142\"/>\n <nd ref=\"-516655755810722\"/>\n <tag k=\"highway\" v=\"residential\"/>\n <tag k=\"source\" v=\"digitalglobe\"/>\n </way>\n</osm>\n",
"headers" : {
"Content-Type" : "text/xml; charset=UTF-8",
"Strict-Transport-Security" : "max-age=15552000; preload",
"Vary" : "Accept-Encoding",
"X-Content-Type-Options" : "nosniff",
"X-Frame-Options" : "DENY",
"X-XSS-Protection" : "0",
"Access-Control-Allow-Origin" : "https://facebook.com",
"X-FB-Debug" : "5m2aCuU5aJv0DTZ+uMY/kpc9FlgXx1/xKEPCM4RvrITwXVFP4Ula5R3wSaGj2PM696Yjo4IUH01FsyUNHq5l0w==",
"Date" : "Tue, 12 Nov 2019 16:28:50 GMT",
"Alt-Svc" : "h3-23=\":443\"; ma=3600",
"Connection" : "keep-alive"
}
},
"uuid" : "da2507d7-b197-4f82-b5d2-169bf6c421ae",
"persistent" : true,
"scenarioName" : "scenario-1-maps-ml_roads",
"requiredScenarioState" : "Started",
"newScenarioState" : "scenario-1-maps-ml_roads-2",
"insertionIndex" : 7
}

31
test/resources/wiremock/mappings/maps_ml_roads-e06062d3-47f4-473d-a00c-6dce02b74922.json
Wyświetl plik

File diff suppressed because one or more lines are too long

31
test/resources/wiremock/mappings/maps_ml_roads-e0adc167-e89f-44ce-aad3-2b9cc940ab70.json
Wyświetl plik

File diff suppressed because one or more lines are too long

30
test/resources/wiremock/mappings/maps_ml_roads-e206ff4e-e352-4194-920c-38aca8739118.json
Wyświetl plik

File diff suppressed because one or more lines are too long

30
test/resources/wiremock/mappings/maps_ml_roads-e6ed7cbd-602c-4412-b333-17cae514ed37.json 100644
Wyświetl plik

@ -0,0 +1,30 @@
{
"id" : "e6ed7cbd-602c-4412-b333-17cae514ed37",
"name" : "maps_ml_roads",
"request" : {
"url" : "/maps/ml_roads?conflate_with_osm=true&theme=ml_road_vector&collaborator=josm&token=ASb3N5o9HbX8QWn8G_NtHIRQaYv3nuG2r7_f3vnGld3KhZNCxg57IsaQyssIaEw5rfRNsPpMwg4TsnrSJtIJms5m&hash=ASawRla3rBcwEjY4HIY&bbox=-108.5715723,39.0734162,-108.5707107,39.0738791",
"method" : "GET"
},
"response" : {
"status" : 200,
"body" : "<?xml version=\"1.0\"?>\n<osm attribution=\"http://www.openstreetmap.org/copyright\" copyright=\"OpenStreetMap and contributors\" generator=\"fb_conflation_service\" version=\"0.6\">\n <bounds maxlat=\"39.0738691\" maxlon=\"-108.57072358101\" minlat=\"39.0734262\" minlon=\"-108.57155941899\"/>\n <node action=\"modify\" id=\"-3625810361941368501\" lat=\"39.0736017\" lon=\"-108.5707451\" visible=\"true\">\n <tag k=\"conn\" v=\"w626760817,n5917002841,n5917002155\"/>\n </node>\n <node action=\"modify\" id=\"-373066400259132\" lat=\"39.0735933\" lon=\"-108.5709927\" visible=\"true\"/>\n <way action=\"modify\" id=\"-4444230471161502072\" orig_id=\"-1203473873173507\" visible=\"true\">\n <nd ref=\"-710999622096597555\"/>\n <nd ref=\"-373066400259132\"/>\n <nd ref=\"-3625810361941368501\"/>\n <tag k=\"highway\" v=\"residential\"/>\n <tag k=\"source\" v=\"digitalglobe\"/>\n </way>\n <node action=\"modify\" id=\"-710999622096597555\" lat=\"39.0736112\" lon=\"-108.5710852\" visible=\"true\">\n <tag k=\"dupe\" v=\"n6815623346\"/>\n </node>\n <node action=\"modify\" id=\"-2406517166226748\" lat=\"39.0736540\" lon=\"-108.5718322\" visible=\"true\">\n <tag k=\"dupe\" v=\"n5907055578\"/>\n </node>\n <node action=\"modify\" id=\"-2406517166226748\" lat=\"39.0736540\" lon=\"-108.5718322\" visible=\"true\">\n <tag k=\"dupe\" v=\"n6815623345\"/>\n </node>\n <way action=\"modify\" id=\"-4444230471161502073\" orig_id=\"-1203473873173507\" visible=\"true\">\n <nd ref=\"-2406517166226748\"/>\n <nd ref=\"-2406517166226748\"/>\n <tag k=\"highway\" v=\"service\"/>\n <tag k=\"source\" v=\"digitalglobe\"/>\n </way>\n</osm>\n",
"headers" : {
"Content-Type" : "text/xml; charset=UTF-8",
"Strict-Transport-Security" : "max-age=15552000; preload",
"Vary" : "Accept-Encoding",
"X-Content-Type-Options" : "nosniff",
"X-Frame-Options" : "DENY",
"X-XSS-Protection" : "0",
"Access-Control-Allow-Origin" : "https://facebook.com",
"X-FB-Debug" : "qAP1zpZ/LA6QjHFfN3g0qsHl40Oqc5lLB0yHBP5TjQc/SZmJ0YYk4+ZAgDFVwLZ6cJm4r40gQApG6Vhx/QfHVg==",
"Date" : "Tue, 12 Nov 2019 16:16:57 GMT",
"Alt-Svc" : "h3-23=\":443\"; ma=3600",
"Connection" : "keep-alive"
}
},
"uuid" : "e6ed7cbd-602c-4412-b333-17cae514ed37",
"persistent" : true,
"scenarioName" : "scenario-1-maps-ml_roads",
"requiredScenarioState" : "scenario-1-maps-ml_roads-2",
"insertionIndex" : 3
}

30
test/resources/wiremock/mappings/maps_ml_roads-ebb72571-b88c-418e-995d-52c144c2b082.json 100644
Wyświetl plik

@ -0,0 +1,30 @@
{
"id" : "ebb72571-b88c-418e-995d-52c144c2b082",
"name" : "maps_ml_roads",
"request" : {
"url" : "/maps/ml_roads?conflate_with_osm=true&theme=ml_road_vector&collaborator=josm&token=ASb3N5o9HbX8QWn8G_NtHIRQaYv3nuG2r7_f3vnGld3KhZNCxg57IsaQyssIaEw5rfRNsPpMwg4TsnrSJtIJms5m&hash=ASawRla3rBcwEjY4HIY&bbox=-108.4625,39.0621,-108.4594,39.0633",
"method" : "GET"
},
"response" : {
"status" : 200,
"body" : "<?xml version=\"1.0\"?>\n<osm attribution=\"http://www.openstreetmap.org/copyright\" copyright=\"OpenStreetMap and contributors\" generator=\"fb_conflation_service\" version=\"0.6\">\n <bounds maxlat=\"39.06329\" maxlon=\"-108.45941287902\" minlat=\"39.06211\" minlon=\"-108.46248712098\"/>\n <node action=\"modify\" id=\"-507451533360537\" lat=\"39.0627986\" lon=\"-108.4607434\" visible=\"true\">\n <tag k=\"conn\" v=\"w489117884,n1337868173,n2390205409\"/>\n </node>\n <node action=\"modify\" id=\"-447607076088874\" lat=\"39.0627944\" lon=\"-108.4614409\" visible=\"true\">\n <tag k=\"conn\" v=\"w489117884,n176212515,n1337868173\"/>\n </node>\n <node action=\"modify\" id=\"-367646030587413\" lat=\"39.0621490\" lon=\"-108.4614409\" visible=\"true\"/>\n <node action=\"modify\" id=\"-512424752862157\" lat=\"39.0621073\" lon=\"-108.4614624\" visible=\"true\"/>\n <node action=\"modify\" id=\"-2661924864034455\" lat=\"39.0618533\" lon=\"-108.4614677\" visible=\"true\"/>\n <node action=\"modify\" id=\"-1359413207542142\" lat=\"39.0624696\" lon=\"-108.4607273\" visible=\"true\"/>\n <node action=\"modify\" id=\"-480100986137751\" lat=\"39.0624363\" lon=\"-108.4607434\" visible=\"true\"/>\n <node action=\"modify\" id=\"-2324123227677172\" lat=\"39.0618533\" lon=\"-108.4607542\" visible=\"true\"/>\n <node action=\"modify\" id=\"-1665763650222613\" lat=\"39.0621573\" lon=\"-108.4610439\" visible=\"true\"/>\n <node action=\"modify\" id=\"-516655755810722\" lat=\"39.0624530\" lon=\"-108.4599172\" visible=\"true\"/>\n <way action=\"modify\" id=\"-3490187867011827995\" orig_id=\"-487611782050068\" visible=\"true\">\n <nd ref=\"-367646030587413\"/>\n <nd ref=\"-512424752862157\"/>\n <nd ref=\"-2661924864034455\"/>\n <tag k=\"highway\" v=\"residential\"/>\n <tag k=\"source\" v=\"digitalglobe\"/>\n </way>\n <way action=\"modify\" id=\"-580832622321925\" visible=\"true\">\n <nd ref=\"-367646030587413\"/>\n <nd ref=\"-1665763650222613\"/>\n <tag k=\"highway\" v=\"residential\"/>\n <tag k=\"source\" v=\"digitalglobe\"/>\n </way>\n <way action=\"modify\" id=\"-3490187867011827994\" orig_id=\"-487611782050068\" visible=\"true\">\n <nd ref=\"-367646030587413\"/>\n <nd ref=\"-447607076088874\"/>\n <tag k=\"highway\" v=\"residential\"/>\n <tag k=\"source\" v=\"digitalglobe\"/>\n </way>\n <way action=\"modify\" id=\"-414732926053825\" visible=\"true\">\n <nd ref=\"-507451533360537\"/>\n <nd ref=\"-1359413207542142\"/>\n <nd ref=\"-480100986137751\"/>\n <nd ref=\"-2324123227677172\"/>\n <tag k=\"highway\" v=\"residential\"/>\n <tag k=\"source\" v=\"digitalglobe\"/>\n </way>\n <way action=\"modify\" id=\"-2431015640267087\" visible=\"true\">\n <nd ref=\"-1359413207542142\"/>\n <nd ref=\"-516655755810722\"/>\n <tag k=\"highway\" v=\"residential\"/>\n <tag k=\"source\" v=\"digitalglobe\"/>\n </way>\n</osm>\n",
"headers" : {
"Content-Type" : "text/xml; charset=UTF-8",
"Strict-Transport-Security" : "max-age=15552000; preload",
"Vary" : "Accept-Encoding",
"X-Content-Type-Options" : "nosniff",
"X-Frame-Options" : "DENY",
"X-XSS-Protection" : "0",
"Access-Control-Allow-Origin" : "https://facebook.com",
"X-FB-Debug" : "kayV6PYG7MG6UL+8yuuVoWxszZ3ttPbco8/2VshX5cHfbDNgvB4l8H2fg2oe4AqeypaYl7iaan02+/2inXwbkg==",
"Date" : "Tue, 12 Nov 2019 16:28:53 GMT",
"Alt-Svc" : "h3-23=\":443\"; ma=3600",
"Connection" : "keep-alive"
}
},
"uuid" : "ebb72571-b88c-418e-995d-52c144c2b082",
"persistent" : true,
"scenarioName" : "scenario-1-maps-ml_roads",
"requiredScenarioState" : "scenario-1-maps-ml_roads-2",
"insertionIndex" : 8
}

30
test/resources/wiremock/mappings/maps_ml_roads-f33e21fb-6700-43b6-bbf8-c0883836639d.json
Wyświetl plik

File diff suppressed because one or more lines are too long

31
test/resources/wiremock/mappings/maps_ml_roads-f66c918b-6280-4062-8477-d121b3ad4aa2.json
Wyświetl plik

File diff suppressed because one or more lines are too long

31
test/resources/wiremock/mappings/maps_ml_roads-f849fb53-61c8-42f7-a55a-ddb568e84eb1.json
Wyświetl plik

File diff suppressed because one or more lines are too long

30
test/resources/wiremock/mappings/maps_ml_roads-f89cca0a-e67a-406e-b423-a1b5c2cec9af.json
Wyświetl plik

File diff suppressed because one or more lines are too long

30
test/resources/wiremock/mappings/maps_ml_roads-fb367fba-4384-45e9-b1c5-ebc099361d5a.json
Wyświetl plik

File diff suppressed because one or more lines are too long

31
test/resources/wiremock/mappings/maps_ml_roads-fc66e0ab-ec99-435c-a20a-b0e0a84e9ca2.json
Wyświetl plik

File diff suppressed because one or more lines are too long

31
test/resources/wiremock/mappings/maps_ml_roads-fd1f337b-7890-4e68-be29-169e6b4a96ea.json
Wyświetl plik

File diff suppressed because one or more lines are too long

31
test/resources/wiremock/mappings/maps_ml_roads-fd7ca9de-a654-43eb-889e-c19de0fdc4db.json 100644
Wyświetl plik

@ -0,0 +1,31 @@
{
"id" : "fd7ca9de-a654-43eb-889e-c19de0fdc4db",
"name" : "maps_ml_roads",
"request" : {
"url" : "/maps/ml_roads?conflate_with_osm=true&theme=ml_road_vector&collaborator=josm&token=ASb3N5o9HbX8QWn8G_NtHIRQaYv3nuG2r7_f3vnGld3KhZNCxg57IsaQyssIaEw5rfRNsPpMwg4TsnrSJtIJms5m&hash=ASawRla3rBcwEjY4HIY&bbox=-108.5715723,39.0734162,-108.5707107,39.0738791",
"method" : "GET"
},
"response" : {
"status" : 200,
"body" : "<?xml version=\"1.0\"?>\n<osm attribution=\"http://www.openstreetmap.org/copyright\" copyright=\"OpenStreetMap and contributors\" generator=\"fb_conflation_service\" version=\"0.6\">\n <bounds maxlat=\"39.0738691\" maxlon=\"-108.57072358101\" minlat=\"39.0734262\" minlon=\"-108.57155941899\"/>\n <node action=\"modify\" id=\"-3625810361941368501\" lat=\"39.0736017\" lon=\"-108.5707451\" visible=\"true\">\n <tag k=\"conn\" v=\"w626760817,n5917002841,n5917002155\"/>\n </node>\n <node action=\"modify\" id=\"-373066400259132\" lat=\"39.0735933\" lon=\"-108.5709927\" visible=\"true\"/>\n <way action=\"modify\" id=\"-4444230471161502072\" orig_id=\"-1203473873173507\" visible=\"true\">\n <nd ref=\"-710999622096597555\"/>\n <nd ref=\"-373066400259132\"/>\n <nd ref=\"-3625810361941368501\"/>\n <tag k=\"highway\" v=\"residential\"/>\n <tag k=\"source\" v=\"digitalglobe\"/>\n </way>\n <node action=\"modify\" id=\"-710999622096597555\" lat=\"39.0736112\" lon=\"-108.5710852\" visible=\"true\">\n <tag k=\"dupe\" v=\"n6815623346\"/>\n </node>\n <node action=\"modify\" id=\"-2406517166226748\" lat=\"39.0736540\" lon=\"-108.5718322\" visible=\"true\">\n <tag k=\"dupe\" v=\"n5907055578\"/>\n </node>\n <node action=\"modify\" id=\"-2406517166226748\" lat=\"39.0736540\" lon=\"-108.5718322\" visible=\"true\">\n <tag k=\"dupe\" v=\"n6815623345\"/>\n </node>\n <way action=\"modify\" id=\"-4444230471161502073\" orig_id=\"-1203473873173507\" visible=\"true\">\n <nd ref=\"-2406517166226748\"/>\n <nd ref=\"-2406517166226748\"/>\n <tag k=\"highway\" v=\"service\"/>\n <tag k=\"source\" v=\"digitalglobe\"/>\n </way>\n</osm>\n",
"headers" : {
"Content-Type" : "text/xml; charset=UTF-8",
"Strict-Transport-Security" : "max-age=15552000; preload",
"Vary" : "Accept-Encoding",
"X-Content-Type-Options" : "nosniff",
"X-Frame-Options" : "DENY",
"X-XSS-Protection" : "0",
"Access-Control-Allow-Origin" : "https://facebook.com",
"X-FB-Debug" : "6LzE9HkTr3XeQcACVn4IeJUNcjXpcXDsrPorIxJK2ZuSxwqF9tAOl74SL79sIVigZJALV+wh62KNq9xKLh2gqA==",
"Date" : "Tue, 12 Nov 2019 16:16:53 GMT",
"Alt-Svc" : "h3-23=\":443\"; ma=3600",
"Connection" : "keep-alive"
}
},
"uuid" : "fd7ca9de-a654-43eb-889e-c19de0fdc4db",
"persistent" : true,
"scenarioName" : "scenario-1-maps-ml_roads",
"requiredScenarioState" : "Started",
"newScenarioState" : "scenario-1-maps-ml_roads-2",
"insertionIndex" : 2
}

30
test/resources/wiremock/mappings/ml_roads-6a626be9-e423-4fd9-aa16-13b1262d8edb.json
Wyświetl plik

@ -1,30 +0,0 @@
{
"id" : "6a626be9-e423-4fd9-aa16-13b1262d8edb",
"name" : "ml_roads",
"request" : {
"url" : "/ml_roads?conflate_with_osm=true&theme=ml_road_vector&collaborator=josm&token=ASb3N5o9HbX8QWn8G_NtHIRQaYv3nuG2r7_f3vnGld3KhZNCxg57IsaQyssIaEw5rfRNsPpMwg4TsnrSJtIJms5m&hash=ASawRla3rBcwEjY4HIY&result_type=road_building_vector_xml&bbox=-108.4625,39.0621,-108.4594,39.0633",
"method" : "GET"
},
"response" : {
"status" : 200,
"body" : "<?xml version=\"1.0\"?>\n<osm attribution=\"http://www.openstreetmap.org/copyright\" copyright=\"OpenStreetMap and contributors\" generator=\"fb_conflation_service\" version=\"0.6\">\n <bounds maxlat=\"39.06329\" maxlon=\"-108.45941287902\" minlat=\"39.06211\" minlon=\"-108.46248712098\"/>\n <node action=\"modify\" id=\"-507451533360537\" lat=\"39.0627979\" lon=\"-108.4607428\" visible=\"true\">\n <tag k=\"conn\" v=\"w489117884,n1337868173,n2390205409\"/>\n </node>\n <node action=\"modify\" id=\"-447607076088874\" lat=\"39.0627937\" lon=\"-108.4614400\" visible=\"true\">\n <tag k=\"conn\" v=\"w489117884,n176212515,n1337868173\"/>\n </node>\n <node action=\"modify\" id=\"-512424752862157\" lat=\"39.0621071\" lon=\"-108.4614615\" visible=\"true\"/>\n <node action=\"modify\" id=\"-2661924864034455\" lat=\"39.0618533\" lon=\"-108.4614668\" visible=\"true\"/>\n <node action=\"modify\" id=\"-1359413207542142\" lat=\"39.0624692\" lon=\"-108.4607268\" visible=\"true\"/>\n <node action=\"modify\" id=\"-480100986137751\" lat=\"39.0624359\" lon=\"-108.4607428\" visible=\"true\"/>\n <node action=\"modify\" id=\"-516655755810722\" lat=\"39.0624525\" lon=\"-108.4599170\" visible=\"true\"/>\n <node action=\"modify\" id=\"-367646030587413\" lat=\"39.0621487\" lon=\"-108.4614400\" visible=\"true\"/>\n <node action=\"modify\" id=\"-1665763650222613\" lat=\"39.0621571\" lon=\"-108.4610432\" visible=\"true\"/>\n <node action=\"modify\" id=\"-2324123227677172\" lat=\"39.0618533\" lon=\"-108.4607536\" visible=\"true\"/>\n <way action=\"modify\" id=\"-487611782050068\" visible=\"true\">\n <nd ref=\"-2661924864034455\"/>\n <nd ref=\"-512424752862157\"/>\n <nd ref=\"-367646030587413\"/>\n <nd ref=\"-447607076088874\"/>\n <tag k=\"highway\" v=\"residential\"/>\n <tag k=\"source\" v=\"digitalglobe\"/>\n </way>\n <way action=\"modify\" id=\"-607051847951386979\" orig_id=\"-414732926053825\" visible=\"true\">\n <nd ref=\"-1359413207542142\"/>\n <nd ref=\"-480100986137751\"/>\n <nd ref=\"-2324123227677172\"/>\n <tag k=\"highway\" v=\"residential\"/>\n <tag k=\"source\" v=\"digitalglobe\"/>\n </way>\n <way action=\"modify\" id=\"-607051847951386978\" orig_id=\"-414732926053825\" visible=\"true\">\n <nd ref=\"-1359413207542142\"/>\n <nd ref=\"-507451533360537\"/>\n <tag k=\"highway\" v=\"residential\"/>\n <tag k=\"source\" v=\"digitalglobe\"/>\n </way>\n <way action=\"modify\" id=\"-2431015640267087\" visible=\"true\">\n <nd ref=\"-1359413207542142\"/>\n <nd ref=\"-516655755810722\"/>\n <tag k=\"highway\" v=\"residential\"/>\n <tag k=\"source\" v=\"digitalglobe\"/>\n </way>\n <way action=\"modify\" id=\"-580832622321925\" visible=\"true\">\n <nd ref=\"-367646030587413\"/>\n <nd ref=\"-1665763650222613\"/>\n <tag k=\"highway\" v=\"residential\"/>\n <tag k=\"source\" v=\"digitalglobe\"/>\n </way>\n <node id=\"-825422876905935714\" lat=\"39.062422\" lon=\"-108.461698\" source=\"microsoft\" visible=\"true\"/>\n <node id=\"-1870090824197945931\" lat=\"39.062422\" lon=\"-108.461835\" source=\"microsoft\" visible=\"true\"/>\n <node id=\"-2311326059727567166\" lat=\"39.062341\" lon=\"-108.461835\" source=\"microsoft\" visible=\"true\"/>\n <node id=\"-3237410471007433804\" lat=\"39.062341\" lon=\"-108.461698\" source=\"microsoft\" visible=\"true\"/>\n <way action=\"modify\" id=\"-3811549318070132106\" source=\"microsoft\" visible=\"true\">\n <nd ref=\"-825422876905935714\"/>\n <nd ref=\"-1870090824197945931\"/>\n <nd ref=\"-2311326059727567166\"/>\n <nd ref=\"-3237410471007433804\"/>\n <nd ref=\"-825422876905935714\"/>\n <tag k=\"building\" v=\"yes\"/>\n </way>\n <node id=\"-1612927083720338934\" lat=\"39.06218\" lon=\"-108.460179\" source=\"microsoft\" visible=\"true\"/>\n <node id=\"-297264572487637546\" lat=\"39.062184\" lon=\"-108.460581\" source=\"microsoft\" visible=\"true\"/>\n <node id=\"-2189477319764664972\" lat=\"39.061986\" lon=\"-108.460584\" source=\"microsoft\" visible=\"true\"/>\n <node id=\"-2965280592153399968\" lat=\"39.061982\" lon=\"-108.460182\" source=\"microsoft\" visible=\"true\"/>\n <way action=\"modify\" id=\"-2949770679498650644\" source=\"microsoft\" visible=\"true\">\n <nd ref=\"-1612927083720338934\"/>\n <nd ref=\"-297264572487637546\"/>\n <nd ref=\"-2189477319764664972\"/>\n <nd ref=\"-2965280592153399968\"/>\n <nd ref=\"-1612927083720338934\"/>\n <tag k=\"building\" v=\"yes\"/>\n </way>\n</osm>\n",
"headers" : {
"Content-Type" : "text/xml; charset=UTF-8",
"Strict-Transport-Security" : "max-age=15552000; preload",
"Vary" : "Accept-Encoding",
"X-Content-Type-Options" : "nosniff",
"X-Frame-Options" : "DENY",
"X-XSS-Protection" : "0",
"Access-Control-Allow-Origin" : "https://facebook.com",
"X-FB-Debug" : "63knydpqj3PUajqLTk1YJktu0kMZ6NyOvsXQJAV8vK7e9GABLqNRtRlBcO1Rml+2EUzQPMwb4MC8cwOa/fRClw==",
"Date" : "Mon, 14 Oct 2019 21:48:15 GMT",
"Connection" : "keep-alive"
}
},
"uuid" : "6a626be9-e423-4fd9-aa16-13b1262d8edb",
"persistent" : true,
"scenarioName" : "scenario-2-ml_roads",
"requiredScenarioState" : "Started",
"newScenarioState" : "scenario-2-ml_roads-2",
"insertionIndex" : 7
}

29
test/resources/wiremock/mappings/ml_roads-a4fdd7a5-d9b2-4d8a-a057-e52a8d5f1f86.json
Wyświetl plik

@ -1,29 +0,0 @@
{
"id" : "a4fdd7a5-d9b2-4d8a-a057-e52a8d5f1f86",
"name" : "ml_roads",
"request" : {
"url" : "/ml_roads?conflate_with_osm=true&theme=ml_road_vector&collaborator=josm&token=ASb3N5o9HbX8QWn8G_NtHIRQaYv3nuG2r7_f3vnGld3KhZNCxg57IsaQyssIaEw5rfRNsPpMwg4TsnrSJtIJms5m&hash=ASawRla3rBcwEjY4HIY&result_type=road_building_vector_xml&bbox=-108.4625,39.0621,-108.4594,39.0633",
"method" : "GET"
},
"response" : {
"status" : 200,
"body" : "<?xml version=\"1.0\"?>\n<osm attribution=\"http://www.openstreetmap.org/copyright\" copyright=\"OpenStreetMap and contributors\" generator=\"fb_conflation_service\" version=\"0.6\">\n <bounds maxlat=\"39.06329\" maxlon=\"-108.45941287902\" minlat=\"39.06211\" minlon=\"-108.46248712098\"/>\n <node action=\"modify\" id=\"-507451533360537\" lat=\"39.0627979\" lon=\"-108.4607428\" visible=\"true\">\n <tag k=\"conn\" v=\"w489117884,n1337868173,n2390205409\"/>\n </node>\n <node action=\"modify\" id=\"-447607076088874\" lat=\"39.0627937\" lon=\"-108.4614400\" visible=\"true\">\n <tag k=\"conn\" v=\"w489117884,n176212515,n1337868173\"/>\n </node>\n <node action=\"modify\" id=\"-512424752862157\" lat=\"39.0621071\" lon=\"-108.4614615\" visible=\"true\"/>\n <node action=\"modify\" id=\"-2661924864034455\" lat=\"39.0618533\" lon=\"-108.4614668\" visible=\"true\"/>\n <node action=\"modify\" id=\"-1359413207542142\" lat=\"39.0624692\" lon=\"-108.4607268\" visible=\"true\"/>\n <node action=\"modify\" id=\"-480100986137751\" lat=\"39.0624359\" lon=\"-108.4607428\" visible=\"true\"/>\n <node action=\"modify\" id=\"-516655755810722\" lat=\"39.0624525\" lon=\"-108.4599170\" visible=\"true\"/>\n <node action=\"modify\" id=\"-367646030587413\" lat=\"39.0621487\" lon=\"-108.4614400\" visible=\"true\"/>\n <node action=\"modify\" id=\"-1665763650222613\" lat=\"39.0621571\" lon=\"-108.4610432\" visible=\"true\"/>\n <node action=\"modify\" id=\"-2324123227677172\" lat=\"39.0618533\" lon=\"-108.4607536\" visible=\"true\"/>\n <way action=\"modify\" id=\"-487611782050068\" visible=\"true\">\n <nd ref=\"-2661924864034455\"/>\n <nd ref=\"-512424752862157\"/>\n <nd ref=\"-367646030587413\"/>\n <nd ref=\"-447607076088874\"/>\n <tag k=\"highway\" v=\"residential\"/>\n <tag k=\"source\" v=\"digitalglobe\"/>\n </way>\n <way action=\"modify\" id=\"-607051847951386978\" orig_id=\"-414732926053825\" visible=\"true\">\n <nd ref=\"-1359413207542142\"/>\n <nd ref=\"-480100986137751\"/>\n <nd ref=\"-2324123227677172\"/>\n <tag k=\"highway\" v=\"residential\"/>\n <tag k=\"source\" v=\"digitalglobe\"/>\n </way>\n <way action=\"modify\" id=\"-607051847951386979\" orig_id=\"-414732926053825\" visible=\"true\">\n <nd ref=\"-1359413207542142\"/>\n <nd ref=\"-507451533360537\"/>\n <tag k=\"highway\" v=\"residential\"/>\n <tag k=\"source\" v=\"digitalglobe\"/>\n </way>\n <way action=\"modify\" id=\"-2431015640267087\" visible=\"true\">\n <nd ref=\"-1359413207542142\"/>\n <nd ref=\"-516655755810722\"/>\n <tag k=\"highway\" v=\"residential\"/>\n <tag k=\"source\" v=\"digitalglobe\"/>\n </way>\n <way action=\"modify\" id=\"-580832622321925\" visible=\"true\">\n <nd ref=\"-367646030587413\"/>\n <nd ref=\"-1665763650222613\"/>\n <tag k=\"highway\" v=\"residential\"/>\n <tag k=\"source\" v=\"digitalglobe\"/>\n </way>\n <node id=\"-825422876905935714\" lat=\"39.062422\" lon=\"-108.461698\" source=\"microsoft\" visible=\"true\"/>\n <node id=\"-1870090824197945931\" lat=\"39.062422\" lon=\"-108.461835\" source=\"microsoft\" visible=\"true\"/>\n <node id=\"-2311326059727567166\" lat=\"39.062341\" lon=\"-108.461835\" source=\"microsoft\" visible=\"true\"/>\n <node id=\"-3237410471007433804\" lat=\"39.062341\" lon=\"-108.461698\" source=\"microsoft\" visible=\"true\"/>\n <way action=\"modify\" id=\"-3811549318070132106\" source=\"microsoft\" visible=\"true\">\n <nd ref=\"-825422876905935714\"/>\n <nd ref=\"-1870090824197945931\"/>\n <nd ref=\"-2311326059727567166\"/>\n <nd ref=\"-3237410471007433804\"/>\n <nd ref=\"-825422876905935714\"/>\n <tag k=\"building\" v=\"yes\"/>\n </way>\n <node id=\"-1612927083720338934\" lat=\"39.06218\" lon=\"-108.460179\" source=\"microsoft\" visible=\"true\"/>\n <node id=\"-297264572487637546\" lat=\"39.062184\" lon=\"-108.460581\" source=\"microsoft\" visible=\"true\"/>\n <node id=\"-2189477319764664972\" lat=\"39.061986\" lon=\"-108.460584\" source=\"microsoft\" visible=\"true\"/>\n <node id=\"-2965280592153399968\" lat=\"39.061982\" lon=\"-108.460182\" source=\"microsoft\" visible=\"true\"/>\n <way action=\"modify\" id=\"-2949770679498650644\" source=\"microsoft\" visible=\"true\">\n <nd ref=\"-1612927083720338934\"/>\n <nd ref=\"-297264572487637546\"/>\n <nd ref=\"-2189477319764664972\"/>\n <nd ref=\"-2965280592153399968\"/>\n <nd ref=\"-1612927083720338934\"/>\n <tag k=\"building\" v=\"yes\"/>\n </way>\n</osm>\n",
"headers" : {
"Content-Type" : "text/xml; charset=UTF-8",
"Strict-Transport-Security" : "max-age=15552000; preload",
"Vary" : "Accept-Encoding",
"X-Content-Type-Options" : "nosniff",
"X-Frame-Options" : "DENY",
"X-XSS-Protection" : "0",
"Access-Control-Allow-Origin" : "https://facebook.com",
"X-FB-Debug" : "SmwuV6my0klO6rrOzd5CLqqmHf/2sstTMpgbmIcKKlhVqNMf7zR1jevJ/WVwkXD5wzp/nhM7xNApsr9Ujd+Fww==",
"Date" : "Mon, 14 Oct 2019 21:48:18 GMT",
"Connection" : "keep-alive"
}
},
"uuid" : "a4fdd7a5-d9b2-4d8a-a057-e52a8d5f1f86",
"persistent" : true,
"scenarioName" : "scenario-2-ml_roads",
"requiredScenarioState" : "scenario-2-ml_roads-2",
"insertionIndex" : 8
}

29
test/resources/wiremock/mappings/ml_roads-d36d0865-8422-40f7-8fdb-c683d1f05f0d.json
Wyświetl plik

@ -1,29 +0,0 @@
{
"id" : "d36d0865-8422-40f7-8fdb-c683d1f05f0d",
"name" : "ml_roads",
"request" : {
"url" : "/ml_roads?conflate_with_osm=true&theme=ml_road_vector&collaborator=josm&token=ASb3N5o9HbX8QWn8G_NtHIRQaYv3nuG2r7_f3vnGld3KhZNCxg57IsaQyssIaEw5rfRNsPpMwg4TsnrSJtIJms5m&hash=ASawRla3rBcwEjY4HIY&result_type=road_building_vector_xml&bbox=-108.5715723,39.0734162,-108.5707107,39.0738791",
"method" : "GET"
},
"response" : {
"status" : 200,
"body" : "<?xml version=\"1.0\"?>\n<osm attribution=\"http://www.openstreetmap.org/copyright\" copyright=\"OpenStreetMap and contributors\" generator=\"fb_conflation_service\" version=\"0.6\">\n <bounds maxlat=\"39.0738691\" maxlon=\"-108.57072358101\" minlat=\"39.0734262\" minlon=\"-108.57155941899\"/>\n <node action=\"modify\" id=\"-2115501659910767206\" lat=\"39.0735990\" lon=\"-108.5707442\" visible=\"true\">\n <tag k=\"conn\" v=\"w626760817,n5917002841,n5917002155\"/>\n </node>\n <node action=\"modify\" id=\"-373066400259132\" lat=\"39.0735906\" lon=\"-108.5709913\" visible=\"true\">\n <tag k=\"conn\" v=\"w676695801,n5917002119,n5917002154\"/>\n </node>\n <node action=\"modify\" id=\"-1944810158953697\" lat=\"39.0735948\" lon=\"-108.5708516\" visible=\"true\">\n <tag k=\"conn\" v=\"w630961276,n176213658,n5907055576\"/>\n </node>\n <node action=\"modify\" id=\"-710999622096597555\" lat=\"39.0736112\" lon=\"-108.5710852\" visible=\"true\">\n <tag k=\"dupe\" v=\"n6815623346\"/>\n </node>\n <way action=\"modify\" id=\"-1203473873173507\" visible=\"true\">\n <nd ref=\"-710999622096597555\"/>\n <nd ref=\"-373066400259132\"/>\n <nd ref=\"-1944810158953697\"/>\n <nd ref=\"-2115501659910767206\"/>\n <tag k=\"highway\" v=\"residential\"/>\n <tag k=\"source\" v=\"digitalglobe\"/>\n </way>\n</osm>\n",
"headers" : {
"Content-Type" : "text/xml; charset=UTF-8",
"Strict-Transport-Security" : "max-age=15552000; preload",
"Vary" : "Accept-Encoding",
"X-Content-Type-Options" : "nosniff",
"X-Frame-Options" : "DENY",
"X-XSS-Protection" : "0",
"Access-Control-Allow-Origin" : "https://facebook.com",
"X-FB-Debug" : "aVFiJSWAL1DuwxZ3xy0r7kz2/Z8y9FsGpK/y34APwCHgc+MFqOzGysy4StVtW8Vs+hFglYo+CrVtGqequk0s/Q==",
"Date" : "Mon, 14 Oct 2019 21:48:02 GMT",
"Connection" : "keep-alive"
}
},
"uuid" : "d36d0865-8422-40f7-8fdb-c683d1f05f0d",
"persistent" : true,
"scenarioName" : "scenario-1-ml_roads",
"requiredScenarioState" : "scenario-1-ml_roads-2",
"insertionIndex" : 3
}

30
test/resources/wiremock/mappings/ml_roads-f3356ac5-5d99-456b-8fb6-90dca6f7c766.json
Wyświetl plik

@ -1,30 +0,0 @@
{
"id" : "f3356ac5-5d99-456b-8fb6-90dca6f7c766",
"name" : "ml_roads",
"request" : {
"url" : "/ml_roads?conflate_with_osm=true&theme=ml_road_vector&collaborator=josm&token=ASb3N5o9HbX8QWn8G_NtHIRQaYv3nuG2r7_f3vnGld3KhZNCxg57IsaQyssIaEw5rfRNsPpMwg4TsnrSJtIJms5m&hash=ASawRla3rBcwEjY4HIY&result_type=road_building_vector_xml&bbox=-108.5715723,39.0734162,-108.5707107,39.0738791",
"method" : "GET"
},
"response" : {
"status" : 200,
"body" : "<?xml version=\"1.0\"?>\n<osm attribution=\"http://www.openstreetmap.org/copyright\" copyright=\"OpenStreetMap and contributors\" generator=\"fb_conflation_service\" version=\"0.6\">\n <bounds maxlat=\"39.0738691\" maxlon=\"-108.57072358101\" minlat=\"39.0734262\" minlon=\"-108.57155941899\"/>\n <node action=\"modify\" id=\"-2115501659910767206\" lat=\"39.0735990\" lon=\"-108.5707442\" visible=\"true\">\n <tag k=\"conn\" v=\"w626760817,n5917002841,n5917002155\"/>\n </node>\n <node action=\"modify\" id=\"-373066400259132\" lat=\"39.0735906\" lon=\"-108.5709913\" visible=\"true\">\n <tag k=\"conn\" v=\"w676695801,n5917002119,n5917002154\"/>\n </node>\n <node action=\"modify\" id=\"-1944810158953697\" lat=\"39.0735948\" lon=\"-108.5708516\" visible=\"true\">\n <tag k=\"conn\" v=\"w630961276,n176213658,n5907055576\"/>\n </node>\n <node action=\"modify\" id=\"-710999622096597555\" lat=\"39.0736112\" lon=\"-108.5710852\" visible=\"true\">\n <tag k=\"dupe\" v=\"n6815623346\"/>\n </node>\n <way action=\"modify\" id=\"-1203473873173507\" visible=\"true\">\n <nd ref=\"-710999622096597555\"/>\n <nd ref=\"-373066400259132\"/>\n <nd ref=\"-1944810158953697\"/>\n <nd ref=\"-2115501659910767206\"/>\n <tag k=\"highway\" v=\"residential\"/>\n <tag k=\"source\" v=\"digitalglobe\"/>\n </way>\n</osm>\n",
"headers" : {
"Content-Type" : "text/xml; charset=UTF-8",
"Strict-Transport-Security" : "max-age=15552000; preload",
"Vary" : "Accept-Encoding",
"X-Content-Type-Options" : "nosniff",
"X-Frame-Options" : "DENY",
"X-XSS-Protection" : "0",
"Access-Control-Allow-Origin" : "https://facebook.com",
"X-FB-Debug" : "uSJWx0e/RUvkCnIK8Mx8XNzMqBvPzu5eJapcrhsCE8pMjClTkvvJ23R6qIxFXpzLAr7C8eeDl3nvTCsi5JlsVg==",
"Date" : "Mon, 14 Oct 2019 21:47:59 GMT",
"Connection" : "keep-alive"
}
},
"uuid" : "f3356ac5-5d99-456b-8fb6-90dca6f7c766",
"persistent" : true,
"scenarioName" : "scenario-1-ml_roads",
"requiredScenarioState" : "Started",
"newScenarioState" : "scenario-1-ml_roads-2",
"insertionIndex" : 2
}

BIN
test/resources/wiremock/wiremock-standalone-2.25.1.jar 100644
Wyświetl plik

Plik binarny nie jest wyświetlany.

6
test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIDataUtilsTest.java
Wyświetl plik

@ -42,7 +42,7 @@ public class MapWithAIDataUtilsTest {
@Before
public void setUp() {
String URL = MapWithAIPreferenceHelper.getMapWithAIUrl().replace("https://www.facebook.com/maps",
String URL = MapWithAIPreferenceHelper.getMapWithAIUrl().replace("https://www.facebook.com",
wireMockRule.baseUrl());
MapWithAIPreferenceHelper.setMapWithAIUrl(URL, true);
}
@ -55,7 +55,7 @@ public class MapWithAIDataUtilsTest {
public void testGetData() {
final BBox testBBox = getTestBBox();
final DataSet ds = new DataSet(MapWithAIDataUtils.getData(testBBox));
Assert.assertEquals(1, ds.getWays().size());
Assert.assertEquals(2, ds.getWays().size());
}
/**
@ -74,7 +74,7 @@ public class MapWithAIDataUtilsTest {
final DataSet ds = MapWithAIDataUtils.getData(testBBox);
Assert.assertEquals(1, ds.getWays().size());
Assert.assertEquals(3, ds.getNodes().size());
Assert.assertEquals(1, originalData.getWays().size());
Assert.assertEquals(2, originalData.getWays().size());
Assert.assertEquals(4, originalData.getNodes().size());
}

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

@ -53,7 +53,7 @@ public class MapWithAILayerTest {
@Before
public void setUp() {
String URL = MapWithAIPreferenceHelper.getMapWithAIUrl().replace("https://www.facebook.com/maps",
String URL = MapWithAIPreferenceHelper.getMapWithAIUrl().replace("https://www.facebook.com",
wireMockRule.baseUrl());
MapWithAIPreferenceHelper.setMapWithAIUrl(URL, true);
layer = new MapWithAILayer(new DataSet(), "test", null);

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

@ -45,7 +45,7 @@ public class MapWithAIRemoteControlTest {
@Before
public void setUp() {
String URL = MapWithAIPreferenceHelper.getMapWithAIUrl().replace("https://www.facebook.com/maps",
String URL = MapWithAIPreferenceHelper.getMapWithAIUrl().replace("https://www.facebook.com",
wireMockRule.baseUrl());
MapWithAIPreferenceHelper.setMapWithAIUrl(URL, true);
}