diff --git a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIDataUtils.java b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIDataUtils.java index d32661c..3e1b3c5 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIDataUtils.java +++ b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIDataUtils.java @@ -49,7 +49,8 @@ import org.openstreetmap.josm.tools.Utils; */ public final class MapWithAIDataUtils { /** THe maximum dimensions for MapWithAI data (in kilometers) */ - public static final int MAXIMUM_SIDE_DIMENSIONS = 10_000; // RapiD is about 1km, max is 10km + public static final int MAXIMUM_SIDE_DIMENSIONS = 5_000; // RapiD is about 1km, max is 10km, but 10km causes + // timeouts private static final int TOO_MANY_BBOXES = 4; private static ForkJoinPool forkJoinPool; static final Object LAYER_LOCK = new Object(); @@ -73,7 +74,7 @@ public final class MapWithAIDataUtils { "https://gitlab.com/smocktaylor/rapid/raw/master/src/resources/styles/standard/rapid.mapcss", "resource://styles/standard/mapwithai.mapcss"); new ArrayList<>(MapPaintStyles.getStyles().getStyleSources()).parallelStream() - .filter(style -> oldUrls.contains(style.url)).forEach(MapPaintStyles::removeStyle); + .filter(style -> oldUrls.contains(style.url)).forEach(MapPaintStyles::removeStyle); if (!checkIfMapWithAIPaintStyleExists()) { final MapCSSStyleSource style = new MapCSSStyleSource(paintStyleResourceUrl, MapWithAIPlugin.NAME, @@ -95,8 +96,8 @@ public final class MapWithAIDataUtils { */ public static void removeMapWithAIPaintStyles() { new ArrayList<>(MapPaintStyles.getStyles().getStyleSources()).parallelStream() - .filter(source -> paintStyleResourceUrl.equals(source.url)) - .forEach(style -> SwingUtilities.invokeLater(() -> MapPaintStyles.removeStyle(style))); + .filter(source -> paintStyleResourceUrl.equals(source.url)) + .forEach(style -> SwingUtilities.invokeLater(() -> MapPaintStyles.removeStyle(style))); } /** @@ -163,8 +164,7 @@ public final class MapWithAIDataUtils { final List realBBoxes = bbox.stream().filter(BBox::isValid).distinct().collect(Collectors.toList()); final List realBounds = realBBoxes.stream() .flatMap(tBBox -> MapWithAIDataUtils.reduceBBoxSize(tBBox).stream()) - .map(MapWithAIDataUtils::bboxToBounds) - .collect(Collectors.toList()); + .map(MapWithAIDataUtils::bboxToBounds).collect(Collectors.toList()); if (MapWithAIPreferenceHelper.getMapWithAIUrl().parallelStream() .anyMatch(map -> Boolean.valueOf(map.getOrDefault("enabled", "false")))) { if ((realBBoxes.size() < TOO_MANY_BBOXES) || ConditionalOptionPaneUtil.showConfirmationDialog( @@ -175,35 +175,35 @@ public final class MapWithAIDataUtils { final PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor(); monitor.beginTask(tr("Downloading {0} Data", MapWithAIPlugin.NAME), realBounds.size()); realBounds.parallelStream() - .forEach(bound -> MapWithAIPreferenceHelper.getMapWithAIUrl().parallelStream() - .filter(map -> map.containsKey("url")).map(MapWithAIDataUtils::getUrl) - .filter(string -> !string.trim().isEmpty()).forEach(url -> { - BoundingBoxMapWithAIDownloader downloader = new BoundingBoxMapWithAIDownloader( - bound, url, DetectTaskingManagerUtils.hasTaskingManagerLayer()); - try { - DataSet ds = downloader.parseOsm(monitor.createSubTaskMonitor(1, false)); - synchronized (MapWithAIDataUtils.class) { - dataSet.mergeFrom(ds); - } - } catch (OsmTransferException e) { - Logging.error(e); - } - })); + .forEach(bound -> MapWithAIPreferenceHelper.getMapWithAIUrl().parallelStream() + .filter(map -> map.containsKey("url")).map(MapWithAIDataUtils::getUrl) + .filter(string -> !string.trim().isEmpty()).forEach(url -> { + BoundingBoxMapWithAIDownloader downloader = new BoundingBoxMapWithAIDownloader( + bound, url, DetectTaskingManagerUtils.hasTaskingManagerLayer()); + try { + DataSet ds = downloader.parseOsm(monitor.createSubTaskMonitor(1, false)); + synchronized (MapWithAIDataUtils.class) { + dataSet.mergeFrom(ds); + } + } catch (OsmTransferException e) { + Logging.error(e); + } + })); monitor.finishTask(); monitor.close(); } } else { final Notification noUrls = MapWithAIPreferenceHelper.getMapWithAIURLs().isEmpty() ? new Notification(tr("There are no defined URLs. To get the defaults, restart JOSM")) - : new Notification(tr("No URLS are enabled")); - noUrls.setDuration(Notification.TIME_DEFAULT); - noUrls.setIcon(JOptionPane.INFORMATION_MESSAGE); - noUrls.setHelpTopic(ht("Plugin/MapWithAI#Preferences")); - if (SwingUtilities.isEventDispatchThread()) { - noUrls.show(); - } else { - SwingUtilities.invokeLater(noUrls::show); - } + : new Notification(tr("No URLS are enabled")); + noUrls.setDuration(Notification.TIME_DEFAULT); + noUrls.setIcon(JOptionPane.INFORMATION_MESSAGE); + noUrls.setHelpTopic(ht("Plugin/MapWithAI#Preferences")); + if (SwingUtilities.isEventDispatchThread()) { + noUrls.show(); + } else { + SwingUtilities.invokeLater(noUrls::show); + } } return dataSet; } diff --git a/test/resources/wiremock/mappings/maps_ml_roads-33985fdf-cf15-493a-b928-ee3fdbcbfdf0.json b/test/resources/wiremock/mappings/maps_ml_roads-33985fdf-cf15-493a-b928-ee3fdbcbfdf0.json new file mode 100644 index 0000000..6eab8f8 --- /dev/null +++ b/test/resources/wiremock/mappings/maps_ml_roads-33985fdf-cf15-493a-b928-ee3fdbcbfdf0.json @@ -0,0 +1,28 @@ +{ + "id" : "33985fdf-cf15-493a-b928-ee3fdbcbfdf0", + "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=-5.7400005,34.5183563,-5.7043009,34.5513153&result_type=road_building_vector_xml", + "method" : "GET" + }, + "response" : { + "status" : 200, + "body" : "\n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n\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" : "bqxPaCd2/GK8PIU7Hr6DslDMp3/F+ll8B7EaeLa/XZbDGxLsb/lwY3xVffSu05Ei2vxRJYkyxOfFkCE8X6VM1A==", + "Date" : "Thu, 09 Jan 2020 22:32:03 GMT", + "Alt-Svc" : "h3-24=\":443\"; ma=3600", + "Connection" : "keep-alive" + } + }, + "uuid" : "33985fdf-cf15-493a-b928-ee3fdbcbfdf0", + "persistent" : true, + "insertionIndex" : 20 +} \ No newline at end of file diff --git a/test/resources/wiremock/mappings/maps_ml_roads-53133862-d606-4976-b016-a35be71df3fb.json b/test/resources/wiremock/mappings/maps_ml_roads-53133862-d606-4976-b016-a35be71df3fb.json new file mode 100644 index 0000000..88cc8c4 --- /dev/null +++ b/test/resources/wiremock/mappings/maps_ml_roads-53133862-d606-4976-b016-a35be71df3fb.json @@ -0,0 +1,28 @@ +{ + "id" : "53133862-d606-4976-b016-a35be71df3fb", + "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=-5.7400005,34.4853974,-5.7043009,34.5183563&result_type=road_building_vector_xml", + "method" : "GET" + }, + "response" : { + "status" : 200, + "body" : "\n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n\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" : "rZgAVHsgMidbc1qG6uZ1HnY8AZong/MMSmxfqF5F2dIS13VTzs9pj0jHwSGPEXbrUdvC1JetW7YaojRdoZAtyg==", + "Date" : "Thu, 09 Jan 2020 22:32:05 GMT", + "Alt-Svc" : "h3-24=\":443\"; ma=3600", + "Connection" : "keep-alive" + } + }, + "uuid" : "53133862-d606-4976-b016-a35be71df3fb", + "persistent" : true, + "insertionIndex" : 24 +} \ No newline at end of file diff --git a/test/resources/wiremock/mappings/maps_ml_roads-84a26ecb-1af0-462c-8564-18fa01fac8ab.json b/test/resources/wiremock/mappings/maps_ml_roads-84a26ecb-1af0-462c-8564-18fa01fac8ab.json new file mode 100644 index 0000000..f0ebfc5 --- /dev/null +++ b/test/resources/wiremock/mappings/maps_ml_roads-84a26ecb-1af0-462c-8564-18fa01fac8ab.json @@ -0,0 +1,28 @@ +{ + "id" : "84a26ecb-1af0-462c-8564-18fa01fac8ab", + "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=-5.7043009,34.4524384,-5.6686014,34.4853974&result_type=road_building_vector_xml", + "method" : "GET" + }, + "response" : { + "status" : 200, + "body" : "\n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n\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" : "6SNk8LjeWecQ7fVDls1/ppOHNlT5InAzk8ncicPEJumxPVINolytqRf43uEWpzoZ7y/X6wV4BtosSAMjFHWhOQ==", + "Date" : "Thu, 09 Jan 2020 22:32:03 GMT", + "Alt-Svc" : "h3-24=\":443\"; ma=3600", + "Connection" : "keep-alive" + } + }, + "uuid" : "84a26ecb-1af0-462c-8564-18fa01fac8ab", + "persistent" : true, + "insertionIndex" : 23 +} \ No newline at end of file diff --git a/test/resources/wiremock/mappings/maps_ml_roads-87aff313-a8ee-4c4d-bd1b-1227560bc942.json b/test/resources/wiremock/mappings/maps_ml_roads-87aff313-a8ee-4c4d-bd1b-1227560bc942.json new file mode 100644 index 0000000..6994cbf --- /dev/null +++ b/test/resources/wiremock/mappings/maps_ml_roads-87aff313-a8ee-4c4d-bd1b-1227560bc942.json @@ -0,0 +1,28 @@ +{ + "id" : "87aff313-a8ee-4c4d-bd1b-1227560bc942", + "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=-5.7400005,34.4524384,-5.7043009,34.4853974&result_type=road_building_vector_xml", + "method" : "GET" + }, + "response" : { + "status" : 200, + "body" : "\n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n\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" : "0kS9nttkVneXlDeQlXCjt4E2i6EZWr/x567jhUZsqWfRXmQJn85lKhtbJkWycN+f1wqtSLt8eJhEDT8k7M6T8Q==", + "Date" : "Thu, 09 Jan 2020 22:32:02 GMT", + "Alt-Svc" : "h3-24=\":443\"; ma=3600", + "Connection" : "keep-alive" + } + }, + "uuid" : "87aff313-a8ee-4c4d-bd1b-1227560bc942", + "persistent" : true, + "insertionIndex" : 19 +} \ No newline at end of file diff --git a/test/resources/wiremock/mappings/maps_ml_roads-cd10fa4e-9002-4efd-a02d-f4ceaea1be5b.json b/test/resources/wiremock/mappings/maps_ml_roads-cd10fa4e-9002-4efd-a02d-f4ceaea1be5b.json new file mode 100644 index 0000000..de9af96 --- /dev/null +++ b/test/resources/wiremock/mappings/maps_ml_roads-cd10fa4e-9002-4efd-a02d-f4ceaea1be5b.json @@ -0,0 +1,28 @@ +{ + "id" : "cd10fa4e-9002-4efd-a02d-f4ceaea1be5b", + "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=-5.7043009,34.5183563,-5.6686014,34.5513153&result_type=road_building_vector_xml", + "method" : "GET" + }, + "response" : { + "status" : 200, + "body" : "\n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n\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" : "Ft0ll0W2ycTCP5jaTkDy14IHzuXnZCGmjpFirBchw4w+siZd7XPdwkkS/LSNfP8DTg8lrRe1eM4AjD5gVvRnGA==", + "Date" : "Thu, 09 Jan 2020 22:32:03 GMT", + "Alt-Svc" : "h3-24=\":443\"; ma=3600", + "Connection" : "keep-alive" + } + }, + "uuid" : "cd10fa4e-9002-4efd-a02d-f4ceaea1be5b", + "persistent" : true, + "insertionIndex" : 22 +} \ No newline at end of file diff --git a/test/resources/wiremock/mappings/maps_ml_roads-d3f25407-315d-432c-a603-0a8703d3493e.json b/test/resources/wiremock/mappings/maps_ml_roads-d3f25407-315d-432c-a603-0a8703d3493e.json new file mode 100644 index 0000000..e04f78b --- /dev/null +++ b/test/resources/wiremock/mappings/maps_ml_roads-d3f25407-315d-432c-a603-0a8703d3493e.json @@ -0,0 +1,28 @@ +{ + "id" : "d3f25407-315d-432c-a603-0a8703d3493e", + "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=-5.7043009,34.4853974,-5.6686014,34.5183563&result_type=road_building_vector_xml", + "method" : "GET" + }, + "response" : { + "status" : 200, + "body" : "\n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n\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" : "I/qwhIQ1HbCPP1b/G4YcbCF1wnO2HLJFEkEVXvObz6TvCU7pJfWpyQOxc/WjdtLOLgdINfvB3uS+BWNJrCUDqA==", + "Date" : "Thu, 09 Jan 2020 22:32:03 GMT", + "Alt-Svc" : "h3-24=\":443\"; ma=3600", + "Connection" : "keep-alive" + } + }, + "uuid" : "d3f25407-315d-432c-a603-0a8703d3493e", + "persistent" : true, + "insertionIndex" : 21 +} \ No newline at end of file diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIUploadHookTest.java b/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIUploadHookTest.java index c391ab9..a0da778 100644 --- a/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIUploadHookTest.java +++ b/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIUploadHookTest.java @@ -38,7 +38,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; public class MapWithAIUploadHookTest { @Rule @SuppressFBWarnings("URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules().main().projection(); + public JOSMTestRules test = new JOSMTestRules().main().projection().preferences(); /** * Test method for {@link MapWithAIUploadHook#modifyChangesetTags(Map)}.