kopia lustrzana https://github.com/JOSM/MapWithAI
Enable buildings by default
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>pull/1/head
Taylor Smock
rodzic
5209f07aa7
commit
b3444c7254
|
|
@ -139,7 +139,7 @@ public class GetDataRunnable extends RecursiveTask<DataSet> implements CancelLis
|
|||
public static void cleanup(DataSet dataSet) {
|
||||
synchronized (LOCK) {
|
||||
/* Microsoft buildings don't have a source, so we add one */
|
||||
MapWithAIDataUtils.addSourceTags(dataSet, "building", "microsoft");
|
||||
MapWithAIDataUtils.addSourceTags(dataSet, "building", "microsoft/BuildingFootprints");
|
||||
replaceTags(dataSet);
|
||||
removeCommonTags(dataSet);
|
||||
mergeNodes(dataSet);
|
||||
|
|
|
|||
|
|
@ -50,7 +50,10 @@ public final class MapWithAIDataUtils {
|
|||
private static ForkJoinPool forkJoinPool;
|
||||
static final Object LAYER_LOCK = new Object();
|
||||
|
||||
private static final String PAINT_STYLE_RESOURCE_URL = "https://josm.openstreetmap.de/josmfile?page=Styles/MapWithAI&zip=1";
|
||||
/** The default url for the MapWithAI paint style */
|
||||
public static final String DEFAULT_PAINT_STYLE_RESOURCE_URL = "https://josm.openstreetmap.de/josmfile?page=Styles/MapWithAI&zip=1";
|
||||
|
||||
private static String paintStyleResourceUrl = DEFAULT_PAINT_STYLE_RESOURCE_URL;
|
||||
|
||||
private MapWithAIDataUtils() {
|
||||
// Hide the constructor
|
||||
|
|
@ -69,7 +72,7 @@ public final class MapWithAIDataUtils {
|
|||
.filter(style -> oldUrls.contains(style.url)).forEach(MapPaintStyles::removeStyle);
|
||||
|
||||
if (!checkIfMapWithAIPaintStyleExists()) {
|
||||
final MapCSSStyleSource style = new MapCSSStyleSource(PAINT_STYLE_RESOURCE_URL, MapWithAIPlugin.NAME,
|
||||
final MapCSSStyleSource style = new MapCSSStyleSource(paintStyleResourceUrl, MapWithAIPlugin.NAME,
|
||||
"MapWithAI");
|
||||
MapPaintStyles.addStyle(style);
|
||||
}
|
||||
|
|
@ -80,7 +83,7 @@ public final class MapWithAIDataUtils {
|
|||
*/
|
||||
public static boolean checkIfMapWithAIPaintStyleExists() {
|
||||
return MapPaintStyles.getStyles().getStyleSources().parallelStream().filter(MapCSSStyleSource.class::isInstance)
|
||||
.map(MapCSSStyleSource.class::cast).anyMatch(source -> PAINT_STYLE_RESOURCE_URL.equals(source.url));
|
||||
.map(MapCSSStyleSource.class::cast).anyMatch(source -> paintStyleResourceUrl.equals(source.url));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -88,7 +91,7 @@ public final class MapWithAIDataUtils {
|
|||
*/
|
||||
public static void removeMapWithAIPaintStyles() {
|
||||
new ArrayList<>(MapPaintStyles.getStyles().getStyleSources()).parallelStream()
|
||||
.filter(source -> PAINT_STYLE_RESOURCE_URL.equals(source.url))
|
||||
.filter(source -> paintStyleResourceUrl.equals(source.url))
|
||||
.forEach(style -> SwingUtilities.invokeLater(() -> MapPaintStyles.removeStyle(style)));
|
||||
}
|
||||
|
||||
|
|
@ -97,7 +100,7 @@ public final class MapWithAIDataUtils {
|
|||
*/
|
||||
public static StyleSource getMapWithAIPaintStyle() {
|
||||
return MapPaintStyles.getStyles().getStyleSources().parallelStream()
|
||||
.filter(source -> PAINT_STYLE_RESOURCE_URL.equals(source.url)).findAny().orElse(null);
|
||||
.filter(source -> paintStyleResourceUrl.equals(source.url)).findAny().orElse(null);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -445,4 +448,22 @@ public final class MapWithAIDataUtils {
|
|||
.filter(MapWithAIAddCommand.class::isInstance).map(MapWithAIAddCommand.class::cast)
|
||||
.flatMap(com -> com.getSourceTags().stream()).distinct().collect(Collectors.toList());
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the URL for the MapWithAI paint style
|
||||
*
|
||||
* @param paintUrl The paint style for MapWithAI
|
||||
*/
|
||||
public static void setPaintStyleUrl(String paintUrl) {
|
||||
paintStyleResourceUrl = paintUrl;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the url for the paint style for MapWithAI
|
||||
*
|
||||
* @return The url for the paint style
|
||||
*/
|
||||
public static String getPaintStyleUrl() {
|
||||
return paintStyleResourceUrl;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ public final class MapWithAIPreferenceHelper {
|
|||
* These are the default parameters for
|
||||
* {@link MapWithAIPreferenceHelper#DEFAULT_MAPWITHAI_API}
|
||||
*/
|
||||
public static final String DEFAULT_MAPWITHAI_API_PARAMETERS = "[{\"parameter\": \"result_type=road_building_vector_xml\", \"description\": \"buildings\", \"enabled\": false}]";
|
||||
public static final String DEFAULT_MAPWITHAI_API_PARAMETERS = "[{\"parameter\": \"result_type=road_building_vector_xml\", \"description\": \"buildings\", \"enabled\": true}]";
|
||||
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");
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"id" : "dc4006d6-1db6-48f9-a047-b0885fc88d2a",
|
||||
"id" : "5f086efd-b8fa-4340-b368-cd4fa7626e0b",
|
||||
"name" : "06_nodes",
|
||||
"request" : {
|
||||
"url" : "/0.6/nodes?nodes=176232378",
|
||||
|
|
@ -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 (31803 thorn-03.openstreetmap.org)\" copyright=\"OpenStreetMap and contributors\" attribution=\"http://www.openstreetmap.org/copyright\" license=\"http://opendatacommons.org/licenses/odbl/1-0/\">\n <node id=\"176232378\" visible=\"true\" version=\"3\" changeset=\"8548635\" timestamp=\"2011-06-26T05:36:58Z\" user=\"nm7s9\" uid=\"12434\" lat=\"39.0292629\" lon=\"-108.4875117\"/>\n</osm>\n",
|
||||
"body" : "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<osm version=\"0.6\" generator=\"CGImap 0.7.5 (21426 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=\"176232378\" visible=\"true\" version=\"3\" changeset=\"8548635\" timestamp=\"2011-06-26T05:36:58Z\" user=\"nm7s9\" uid=\"12434\" lat=\"39.0292629\" lon=\"-108.4875117\"/>\n</osm>\n",
|
||||
"headers" : {
|
||||
"Date" : "Fri, 22 Nov 2019 15:30:17 GMT",
|
||||
"Date" : "Thu, 05 Dec 2019 14:51:57 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" : "dc4006d6-1db6-48f9-a047-b0885fc88d2a",
|
||||
"uuid" : "5f086efd-b8fa-4340-b368-cd4fa7626e0b",
|
||||
"persistent" : true,
|
||||
"insertionIndex" : 18
|
||||
"insertionIndex" : 9
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"id" : "b2cf8a41-bcb3-4275-890b-8ca5a16180b4",
|
||||
"id" : "7938c30e-bd58-4c8c-a716-49e434123ccb",
|
||||
"name" : "06_nodes",
|
||||
"request" : {
|
||||
"url" : "/0.6/nodes?nodes=176220609",
|
||||
|
|
@ -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 (31804 thorn-03.openstreetmap.org)\" copyright=\"OpenStreetMap and contributors\" attribution=\"http://www.openstreetmap.org/copyright\" license=\"http://opendatacommons.org/licenses/odbl/1-0/\">\n <node id=\"176220609\" visible=\"true\" version=\"3\" changeset=\"8532383\" timestamp=\"2011-06-24T12:36:19Z\" user=\"nm7s9\" uid=\"12434\" lat=\"39.0339521\" lon=\"-108.4874581\"/>\n</osm>\n",
|
||||
"body" : "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<osm version=\"0.6\" generator=\"CGImap 0.7.5 (31809 thorn-03.openstreetmap.org)\" copyright=\"OpenStreetMap and contributors\" attribution=\"http://www.openstreetmap.org/copyright\" license=\"http://opendatacommons.org/licenses/odbl/1-0/\">\n <node id=\"176220609\" visible=\"true\" version=\"3\" changeset=\"8532383\" timestamp=\"2011-06-24T12:36:19Z\" user=\"nm7s9\" uid=\"12434\" lat=\"39.0339521\" lon=\"-108.4874581\"/>\n</osm>\n",
|
||||
"headers" : {
|
||||
"Date" : "Fri, 22 Nov 2019 15:30:17 GMT",
|
||||
"Date" : "Thu, 05 Dec 2019 14:51:57 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" : "b2cf8a41-bcb3-4275-890b-8ca5a16180b4",
|
||||
"uuid" : "7938c30e-bd58-4c8c-a716-49e434123ccb",
|
||||
"persistent" : true,
|
||||
"insertionIndex" : 19
|
||||
"insertionIndex" : 10
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"id" : "ab5282eb-d4ab-4db9-97de-2c62528e865a",
|
||||
"id" : "98af8a28-e882-4d58-a828-f149ef8b3913",
|
||||
"name" : "06_nodes",
|
||||
"request" : {
|
||||
"url" : "/0.6/nodes?nodes=6151680832",
|
||||
|
|
@ -7,19 +7,19 @@
|
|||
},
|
||||
"response" : {
|
||||
"status" : 200,
|
||||
"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",
|
||||
"body" : "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<osm version=\"0.6\" generator=\"CGImap 0.7.5 (31820 thorn-03.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" : "Tue, 12 Nov 2019 16:33:03 GMT",
|
||||
"Date" : "Thu, 05 Dec 2019 14:57:43 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=98",
|
||||
"Keep-Alive" : "timeout=5, max=100",
|
||||
"Connection" : "Keep-Alive"
|
||||
}
|
||||
},
|
||||
"uuid" : "ab5282eb-d4ab-4db9-97de-2c62528e865a",
|
||||
"uuid" : "98af8a28-e882-4d58-a828-f149ef8b3913",
|
||||
"persistent" : true,
|
||||
"insertionIndex" : 11
|
||||
"insertionIndex" : 13
|
||||
}
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
{
|
||||
"id" : "aa8912c8-d2fc-4c2d-bf5e-f0192dad2bb4",
|
||||
"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 (1483 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" : "Thu, 05 Dec 2019 14:56:35 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" : "aa8912c8-d2fc-4c2d-bf5e-f0192dad2bb4",
|
||||
"persistent" : true,
|
||||
"insertionIndex" : 12
|
||||
}
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
{
|
||||
"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
|
||||
}
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
{
|
||||
"id" : "4bf5d84c-f2bd-44c3-b777-06fbdcbff249",
|
||||
"name" : "capabilities",
|
||||
"request" : {
|
||||
"url" : "/capabilities",
|
||||
"method" : "GET"
|
||||
},
|
||||
"response" : {
|
||||
"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" : "Fri, 22 Nov 2019 15:30:17 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" : "Xdf-Cf9mfoQXu7q7IFuX2gAAAUU",
|
||||
"X-Download-Options" : "noopen",
|
||||
"X-Runtime" : "0.011692",
|
||||
"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'",
|
||||
"X-Powered-By" : "Phusion Passenger 6.0.4",
|
||||
"Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
|
||||
"Expect-CT" : "max-age=0, report-uri=\"https://openstreetmap.report-uri.com/r/d/ct/reportOnly\"",
|
||||
"Upgrade" : "h2",
|
||||
"ETag" : "W/\"0d683cbc36a97f94c7e1bcc861adc22a-gzip\"",
|
||||
"Status" : "200 OK",
|
||||
"Keep-Alive" : "timeout=5, max=100",
|
||||
"Connection" : "Keep-Alive",
|
||||
"Content-Type" : "application/xml; charset=utf-8"
|
||||
}
|
||||
},
|
||||
"uuid" : "4bf5d84c-f2bd-44c3-b777-06fbdcbff249",
|
||||
"persistent" : true,
|
||||
"insertionIndex" : 17
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"id" : "1931fb41-5009-49b6-a4e1-0069c3ca1d22",
|
||||
"id" : "cf884424-9817-4f92-a3af-6b5aa2bc4b0e",
|
||||
"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" : "Tue, 12 Nov 2019 16:33:02 GMT",
|
||||
"Date" : "Thu, 05 Dec 2019 14:51:56 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" : "XcrevuZqZvsEtGBZ7@HMHwAAAY8",
|
||||
"X-Request-Id" : "XekZjNRQE5fxVSCmvZ8wYAAAAMM",
|
||||
"X-Download-Options" : "noopen",
|
||||
"X-Runtime" : "0.010450",
|
||||
"X-Runtime" : "0.011898",
|
||||
"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" : "1931fb41-5009-49b6-a4e1-0069c3ca1d22",
|
||||
"uuid" : "cf884424-9817-4f92-a3af-6b5aa2bc4b0e",
|
||||
"persistent" : true,
|
||||
"insertionIndex" : 9
|
||||
"insertionIndex" : 8
|
||||
}
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -0,0 +1,26 @@
|
|||
{
|
||||
"id" : "6eeb774c-de7d-4486-abc0-c06ace4916d0",
|
||||
"name" : "josmfile",
|
||||
"request" : {
|
||||
"url" : "/josmfile?page=Styles/MapWithAI&zip=1",
|
||||
"method" : "GET"
|
||||
},
|
||||
"response" : {
|
||||
"status" : 200,
|
||||
"base64Body" : "UEsDBBQAAAAIAOSAhU93j0zPDgIAAHYFAAAdAAAAU3R5bGVzX01hcFdpdGhBSS1zdHlsZS5tYXBjc3OlVE1v00AQvftXTA2HOMJ1EoEgRgi4ROJQhJQIDlWINvbY2XbtMTtrjIHy29mNnShtVClR97Sej/fm43kLNML744E9RhqFMfhXovomzebjJ//t1p4iJ1pWRlJpvV8l10LJ38J9A2WwD4dUGNHniNpsSNvwhWgVaZgXlNz2vp+oucMaX75eTUbjaTgeh6OXvbuQZXhDXIQHca8mk6l133leNDz/eDCEORq4LETV2FKFhMzWJJSC25Ka8kELjIbBJZ1/Iu8D11VF2iIMjhuxfbyZBtCN29IYWeYcx7yhZuWq6RzuKLFGFYPRA39uvVARs1wrPCiV1jeYGPaDbmx3djo9ZI9YYtMjmrayi10TKRRlF35A8BmbHUiKmaiVcfYaO1Ouqa7sDnZFbtdwn6igVGYS05PYrvrgI8pMKD6dk9RpdF80hvhLsks9mzIawmIjGTT+qKVGhn65IEswG4RK1bm9Dhppl6dRpHCL7VZbe6U5zSXMcV9fbCjPFa6cc6VEizoAq5p9b0fuk5pcbLOgErI0bFp7pTKiLAOHA1ucx3q3v1Qj2mumWif47l/0ffBeBla6iSamzPxNZS6NULmiNQbPo+V1X+rA363BD5YXsdXaRbzTwYsnQZZOjkuH+DScYi+0ZfxAoXzvMdgN4eB56MISUu4N25ufzWaj0Wx2HB8nihjTSZ+XWTmEjycDeP8BUEsBAhQAFAAAAAgA5ICFT3ePTM8OAgAAdgUAAB0AAAAAAAAAAAAAAIABAAAAAFN0eWxlc19NYXBXaXRoQUktc3R5bGUubWFwY3NzUEsFBgAAAAABAAEASwAAAEkCAAAAAA==",
|
||||
"headers" : {
|
||||
"Date" : "Thu, 05 Dec 2019 15:07:08 GMT",
|
||||
"Server" : "Apache/2.4.29 (Ubuntu)",
|
||||
"X-Clacks-Overhead" : "GNU Terry Pratchett",
|
||||
"Strict-Transport-Security" : "max-age=16070400; includeSubDomains",
|
||||
"Content-Disposition" : "attachment; filename=\"Styles_MapWithAI.zip\"",
|
||||
"Set-Cookie" : "trac_session=52872db4f9b904822ae80bba; expires=Wed, 04 Mar 2020 15:07:08 GMT; httponly; Path=/",
|
||||
"Keep-Alive" : "timeout=5, max=100",
|
||||
"Connection" : "Keep-Alive",
|
||||
"Content-Type" : "application/zip"
|
||||
}
|
||||
},
|
||||
"uuid" : "6eeb774c-de7d-4486-abc0-c06ace4916d0",
|
||||
"persistent" : true,
|
||||
"insertionIndex" : 13
|
||||
}
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"id" : "652ba7c2-465d-47df-b2a3-a3388ea825f0",
|
||||
"id" : "146193dd-3082-495b-b350-8164e2858f8d",
|
||||
"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=-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&result_type=road_building_vector_xml",
|
||||
"method" : "GET"
|
||||
},
|
||||
"response" : {
|
||||
|
|
@ -16,13 +16,13 @@
|
|||
"X-Frame-Options" : "DENY",
|
||||
"X-XSS-Protection" : "0",
|
||||
"Access-Control-Allow-Origin" : "https://facebook.com",
|
||||
"X-FB-Debug" : "plFuCEMYK94NKE/73/DZzkeYuySsey+BnVLWWD07YUOCLEjJTjiH5McGU+h41N9bQFwUFI5E8c3in47r1SQ4kA==",
|
||||
"Date" : "Tue, 12 Nov 2019 16:20:36 GMT",
|
||||
"X-FB-Debug" : "qE8O2lKCwh9FH8Ls+TyRrL0PM87qbcaZpFqnNwRft2Iby5lKiXh0YyNGocjYZR9bzNa+DdVLLvdsHqc/jEzI5g==",
|
||||
"Date" : "Thu, 05 Dec 2019 14:38:35 GMT",
|
||||
"Alt-Svc" : "h3-23=\":443\"; ma=3600",
|
||||
"Connection" : "keep-alive"
|
||||
}
|
||||
},
|
||||
"uuid" : "652ba7c2-465d-47df-b2a3-a3388ea825f0",
|
||||
"uuid" : "146193dd-3082-495b-b350-8164e2858f8d",
|
||||
"persistent" : true,
|
||||
"insertionIndex" : 6
|
||||
"insertionIndex" : 4
|
||||
}
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
{
|
||||
"id" : "2527ed5c-1fc5-49c3-93b4-5c38323770f2",
|
||||
"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" : "4wfqXkCFMY11jcj4ckGFU9f8MP58lzqCIt8FlBXS1U+3QeVYgL5mmQMpNCSYiWm+D1cUufTvpzt44eAPpa8wCA==",
|
||||
"Date" : "Wed, 20 Nov 2019 14:34:44 GMT",
|
||||
"Alt-Svc" : "h3-23=\":443\"; ma=3600",
|
||||
"Connection" : "keep-alive"
|
||||
}
|
||||
},
|
||||
"uuid" : "2527ed5c-1fc5-49c3-93b4-5c38323770f2",
|
||||
"persistent" : true,
|
||||
"scenarioName" : "scenario-1-maps-ml_roads",
|
||||
"requiredScenarioState" : "scenario-1-maps-ml_roads-2",
|
||||
"insertionIndex" : 15
|
||||
}
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"id" : "6009fed1-4c0d-4bc9-bb59-38f9e4e4075a",
|
||||
"id" : "2aac807a-9c8c-4713-a806-9f2451600f2b",
|
||||
"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&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&result_type=road_building_vector_xml",
|
||||
"method" : "GET"
|
||||
},
|
||||
"response" : {
|
||||
|
|
@ -16,13 +16,13 @@
|
|||
"X-Frame-Options" : "DENY",
|
||||
"X-XSS-Protection" : "0",
|
||||
"Access-Control-Allow-Origin" : "https://facebook.com",
|
||||
"X-FB-Debug" : "znCxafQnUn7WKB/uHKAUwQ/U7oUOp/huKmVU9zz10bthu+PL2ZY3CS32+YdPEdPbzv/TfDRWQ/KyKWssKiaikw==",
|
||||
"Date" : "Tue, 12 Nov 2019 16:16:58 GMT",
|
||||
"X-FB-Debug" : "pAVoB1d1AQr2FejyueTMcu+w/Dz6gRkTSWM8vHG9Is5MwRmNnY97YHiWDtoDigLbkHsoKHQtAWaRwWI+47NZKw==",
|
||||
"Date" : "Thu, 05 Dec 2019 14:25:09 GMT",
|
||||
"Alt-Svc" : "h3-23=\":443\"; ma=3600",
|
||||
"Connection" : "keep-alive"
|
||||
}
|
||||
},
|
||||
"uuid" : "6009fed1-4c0d-4bc9-bb59-38f9e4e4075a",
|
||||
"uuid" : "2aac807a-9c8c-4713-a806-9f2451600f2b",
|
||||
"persistent" : true,
|
||||
"insertionIndex" : 4
|
||||
"insertionIndex" : 3
|
||||
}
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
{
|
||||
"id" : "4df1e72e-a62e-48b6-806d-99fd74956742",
|
||||
"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&result_type=road_building_vector_xml",
|
||||
"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=\"-447607076088874\" lat=\"39.0627937\" lon=\"-108.4614400\" visible=\"true\">\n <tag k=\"conn\" v=\"w489117884,n176212515,n1337868173\"/>\n </node>\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=\"-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=\"-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=\"-516655755810722\" lat=\"39.0624525\" lon=\"-108.4599170\" 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=\"-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=\"-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=\"-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/BuildingFootprints\" visible=\"true\"/>\n <node id=\"-1870090824197945931\" lat=\"39.062422\" lon=\"-108.461835\" source=\"microsoft/BuildingFootprints\" visible=\"true\"/>\n <node id=\"-2311326059727567166\" lat=\"39.062341\" lon=\"-108.461835\" source=\"microsoft/BuildingFootprints\" visible=\"true\"/>\n <node id=\"-3237410471007433804\" lat=\"39.062341\" lon=\"-108.461698\" source=\"microsoft/BuildingFootprints\" visible=\"true\"/>\n <way action=\"modify\" id=\"-3811549318070132106\" source=\"microsoft/BuildingFootprints\" 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/BuildingFootprints\" visible=\"true\"/>\n <node id=\"-297264572487637546\" lat=\"39.062184\" lon=\"-108.460581\" source=\"microsoft/BuildingFootprints\" visible=\"true\"/>\n <node id=\"-2189477319764664972\" lat=\"39.061986\" lon=\"-108.460584\" source=\"microsoft/BuildingFootprints\" visible=\"true\"/>\n <node id=\"-2965280592153399968\" lat=\"39.061982\" lon=\"-108.460182\" source=\"microsoft/BuildingFootprints\" visible=\"true\"/>\n <way action=\"modify\" id=\"-2949770679498650644\" source=\"microsoft/BuildingFootprints\" 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" : "QOH/uVezGcDgTnRr2jZ1IkfdKKqM58LWaV/SlCdAL7YdKiWbBLck26+xgQpnTcAAWJ06oVbVNddoCu+fZ0F4Tg==",
|
||||
"Date" : "Thu, 05 Dec 2019 14:46:51 GMT",
|
||||
"Alt-Svc" : "h3-23=\":443\"; ma=3600",
|
||||
"Connection" : "keep-alive"
|
||||
}
|
||||
},
|
||||
"uuid" : "4df1e72e-a62e-48b6-806d-99fd74956742",
|
||||
"persistent" : true,
|
||||
"insertionIndex" : 7
|
||||
}
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
{
|
||||
"id" : "506ca06e-8d07-4762-ad45-32f69a0f3ecb",
|
||||
"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=\"-3490187867011827994\" 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=\"-3490187867011827995\" 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" : "hNbBk003KWeBO3dOsB+94Y8uPRYJFURLqHqCLP7w1pwAVI2c38OkpZ7VBBCC5M4TVLar8VRjD7KFlC1Ero3avA==",
|
||||
"Date" : "Wed, 20 Nov 2019 14:34:42 GMT",
|
||||
"Alt-Svc" : "h3-23=\":443\"; ma=3600",
|
||||
"Connection" : "keep-alive"
|
||||
}
|
||||
},
|
||||
"uuid" : "506ca06e-8d07-4762-ad45-32f69a0f3ecb",
|
||||
"persistent" : true,
|
||||
"scenarioName" : "scenario-1-maps-ml_roads",
|
||||
"requiredScenarioState" : "Started",
|
||||
"newScenarioState" : "scenario-1-maps-ml_roads-2",
|
||||
"insertionIndex" : 13
|
||||
}
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1,28 +0,0 @@
|
|||
{
|
||||
"id" : "65180ede-85cf-4fc0-94b4-8ae6ecd4c8c0",
|
||||
"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=0.0,0.0,0.001,0.001&crop_bbox=0.0,0.0,0.001,0.001",
|
||||
"method" : "GET"
|
||||
},
|
||||
"response" : {
|
||||
"status" : 200,
|
||||
"body" : "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<osm generator=\"NS_ROADS_SERVICE\" version=\"0.6\"><bounds maxlat=\"0.00099\" maxlon=\"0.00098999999999962\" minlat=\"1.0E-5\" minlon=\"1.0000000000381E-5\"/></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" : "8mHqShqG9xtWOu9e6u4iVvAadFNyNs3qT/T5BmQnE7UnM4CtSFX6G1MtUN9d7ajrR2B7tAn9cAfwoNYau90EQA==",
|
||||
"Date" : "Wed, 20 Nov 2019 14:34:44 GMT",
|
||||
"Alt-Svc" : "h3-23=\":443\"; ma=3600",
|
||||
"Connection" : "keep-alive"
|
||||
}
|
||||
},
|
||||
"uuid" : "65180ede-85cf-4fc0-94b4-8ae6ecd4c8c0",
|
||||
"persistent" : true,
|
||||
"insertionIndex" : 14
|
||||
}
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -0,0 +1,28 @@
|
|||
{
|
||||
"id" : "715854d4-ba75-4289-89fe-9352c3d3ed6b",
|
||||
"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&result_type=road_building_vector_xml",
|
||||
"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" : "uhd2nZW/X8sd5JhczSOjcv1ho6t3ZigTidNma/6Ufz5LENsI8a7coxvxs5h5lhF2507g9cfL1cQNL1JSP5Ugkg==",
|
||||
"Date" : "Thu, 05 Dec 2019 14:25:07 GMT",
|
||||
"Alt-Svc" : "h3-23=\":443\"; ma=3600",
|
||||
"Connection" : "keep-alive"
|
||||
}
|
||||
},
|
||||
"uuid" : "715854d4-ba75-4289-89fe-9352c3d3ed6b",
|
||||
"persistent" : true,
|
||||
"insertionIndex" : 2
|
||||
}
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -1,31 +0,0 @@
|
|||
{
|
||||
"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
|
||||
}
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"id" : "b8d51a0d-76b7-4805-b72e-61dda7951bb7",
|
||||
"id" : "e543fb8b-a680-4a1d-9f90-a793b7a7a6a6",
|
||||
"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=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&result_type=road_building_vector_xml",
|
||||
"method" : "GET"
|
||||
},
|
||||
"response" : {
|
||||
|
|
@ -16,13 +16,13 @@
|
|||
"X-Frame-Options" : "DENY",
|
||||
"X-XSS-Protection" : "0",
|
||||
"Access-Control-Allow-Origin" : "https://facebook.com",
|
||||
"X-FB-Debug" : "JepMhi9THt+anWgV2bD3AUwkBCmQHcAf93a5Sxr4w4tC4ggxVGdfCmpPbnFKM7jxb9q8elehQuf78I2KZCn6KQ==",
|
||||
"Date" : "Tue, 12 Nov 2019 16:20:36 GMT",
|
||||
"X-FB-Debug" : "FJjx+i5MkmXItFFBe8db1G1WdLXvQ6NIqBtGlXPCtsb0yb/h73gwbbNVdxakIqzOJbPDmFXbXJF3gBWact65eQ==",
|
||||
"Date" : "Thu, 05 Dec 2019 14:36:42 GMT",
|
||||
"Alt-Svc" : "h3-23=\":443\"; ma=3600",
|
||||
"Connection" : "keep-alive"
|
||||
}
|
||||
},
|
||||
"uuid" : "b8d51a0d-76b7-4805-b72e-61dda7951bb7",
|
||||
"uuid" : "e543fb8b-a680-4a1d-9f90-a793b7a7a6a6",
|
||||
"persistent" : true,
|
||||
"insertionIndex" : 5
|
||||
"insertionIndex" : 3
|
||||
}
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
{
|
||||
"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
|
||||
}
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
{
|
||||
"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
|
||||
}
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
{
|
||||
"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
|
||||
}
|
||||
|
|
@ -29,6 +29,7 @@ import org.openstreetmap.josm.gui.MainApplication;
|
|||
import org.openstreetmap.josm.gui.layer.GpxLayer;
|
||||
import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
|
||||
import org.openstreetmap.josm.gui.mappaint.StyleSource;
|
||||
import org.openstreetmap.josm.spi.preferences.Config;
|
||||
import org.openstreetmap.josm.testutils.JOSMTestRules;
|
||||
|
||||
import com.github.tomakehurst.wiremock.WireMockServer;
|
||||
|
|
@ -73,7 +74,7 @@ public class MapWithAIDataUtilsTest {
|
|||
public void testGetData() {
|
||||
final BBox testBBox = getTestBBox();
|
||||
final DataSet ds = new DataSet(MapWithAIDataUtils.getData(testBBox));
|
||||
Assert.assertEquals(2, ds.getWays().size());
|
||||
Assert.assertEquals(1, ds.getWays().size());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -92,7 +93,7 @@ public class MapWithAIDataUtilsTest {
|
|||
final DataSet ds = MapWithAIDataUtils.getData(testBBox);
|
||||
Assert.assertEquals(1, ds.getWays().size());
|
||||
Assert.assertEquals(3, ds.getNodes().size());
|
||||
Assert.assertEquals(2, originalData.getWays().size());
|
||||
Assert.assertEquals(1, originalData.getWays().size());
|
||||
Assert.assertEquals(4, originalData.getNodes().size());
|
||||
}
|
||||
|
||||
|
|
@ -146,6 +147,8 @@ public class MapWithAIDataUtilsTest {
|
|||
int initialSize = paintStyles.size();
|
||||
// There are two default paint styles
|
||||
Assert.assertEquals(initialSize, paintStyles.size());
|
||||
MapWithAIDataUtils.setPaintStyleUrl(
|
||||
MapWithAIDataUtils.getPaintStyleUrl().replace(Config.getUrls().getJOSMWebsite(), wireMock.baseUrl()));
|
||||
MapWithAIDataUtils.addMapWithAIPaintStyles();
|
||||
paintStyles = MapPaintStyles.getStyles().getStyleSources();
|
||||
Assert.assertEquals(initialSize + 1, paintStyles.size());
|
||||
|
|
@ -153,6 +156,7 @@ public class MapWithAIDataUtilsTest {
|
|||
paintStyles = MapPaintStyles.getStyles().getStyleSources();
|
||||
Assert.assertEquals(initialSize + 1, paintStyles.size());
|
||||
MapWithAIDataUtils.addMapWithAIPaintStyles();
|
||||
MapWithAIDataUtils.setPaintStyleUrl(MapWithAIDataUtils.DEFAULT_PAINT_STYLE_RESOURCE_URL);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ import javax.swing.JLabel;
|
|||
import javax.swing.JPanel;
|
||||
|
||||
import org.awaitility.Durations;
|
||||
import org.junit.After;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
|
|
@ -34,7 +35,7 @@ import org.openstreetmap.josm.plugins.mapwithai.MapWithAIPlugin;
|
|||
import org.openstreetmap.josm.plugins.mapwithai.commands.MapWithAIAddCommand;
|
||||
import org.openstreetmap.josm.testutils.JOSMTestRules;
|
||||
|
||||
import com.github.tomakehurst.wiremock.junit.WireMockRule;
|
||||
import com.github.tomakehurst.wiremock.WireMockServer;
|
||||
|
||||
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
|
||||
|
||||
|
|
@ -47,22 +48,26 @@ public class MapWithAILayerTest {
|
|||
@SuppressFBWarnings("URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
|
||||
public JOSMTestRules test = new JOSMTestRules().preferences().main().projection();
|
||||
|
||||
@Rule
|
||||
@SuppressFBWarnings("URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
|
||||
public WireMockRule wireMockRule = new WireMockRule(options().usingFilesUnderDirectory("test/resources/wiremock"));
|
||||
WireMockServer wireMock = new WireMockServer(options().usingFilesUnderDirectory("test/resources/wiremock"));
|
||||
|
||||
MapWithAILayer layer;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
wireMock.start();
|
||||
MapWithAIPreferenceHelper.setMapWithAIURLs(MapWithAIPreferenceHelper.getMapWithAIURLs().stream().map(map -> {
|
||||
map.put("url", map.getOrDefault("url", MapWithAIPreferenceHelper.DEFAULT_MAPWITHAI_API)
|
||||
.replace("https://www.facebook.com", wireMockRule.baseUrl()));
|
||||
.replace("https://www.facebook.com", wireMock.baseUrl()));
|
||||
return map;
|
||||
}).collect(Collectors.toList()));
|
||||
layer = new MapWithAILayer(new DataSet(), "test", null);
|
||||
}
|
||||
|
||||
@After
|
||||
public void tearDown() {
|
||||
wireMock.stop();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetSource() {
|
||||
Assert.assertNull(layer.getChangesetSourceTag());
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
|
|||
import java.util.stream.Collectors;
|
||||
|
||||
import org.awaitility.Durations;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
|
|
@ -23,7 +24,7 @@ import org.openstreetmap.josm.plugins.mapwithai.MapWithAIPlugin;
|
|||
import org.openstreetmap.josm.testutils.JOSMTestRules;
|
||||
import org.openstreetmap.josm.tools.Utils;
|
||||
|
||||
import com.github.tomakehurst.wiremock.junit.WireMockRule;
|
||||
import com.github.tomakehurst.wiremock.WireMockServer;
|
||||
|
||||
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
|
||||
|
||||
|
|
@ -46,20 +47,25 @@ public class MapWithAIRemoteControlTest {
|
|||
@SuppressFBWarnings("URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
|
||||
public JOSMTestRules test = new JOSMTestRules().main().projection();
|
||||
|
||||
@Rule
|
||||
public WireMockRule wireMockRule = new WireMockRule(options().usingFilesUnderDirectory("test/resources/wiremock"));
|
||||
WireMockServer wireMock = new WireMockServer(options().usingFilesUnderDirectory("test/resources/wiremock"));
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
wireMock.start();
|
||||
MapWithAIPreferenceHelper.setMapWithAIURLs(MapWithAIPreferenceHelper.getMapWithAIURLs().stream()
|
||||
.map(map -> {
|
||||
map.put("url",
|
||||
map.getOrDefault("url", MapWithAIPreferenceHelper.DEFAULT_MAPWITHAI_API)
|
||||
.replace("https://www.facebook.com", wireMockRule.baseUrl()));
|
||||
.replace("https://www.facebook.com", wireMock.baseUrl()));
|
||||
return map;
|
||||
}).collect(Collectors.toList()));
|
||||
}
|
||||
|
||||
@After
|
||||
public void tearDown() {
|
||||
wireMock.stop();
|
||||
}
|
||||
|
||||
private static MapWithAIRemoteControl newHandler(String url) throws RequestHandlerBadRequestException {
|
||||
final MapWithAIRemoteControl req = new MapWithAIRemoteControl();
|
||||
if (url != null) {
|
||||
|
|
@ -141,7 +147,6 @@ public class MapWithAIRemoteControlTest {
|
|||
|
||||
await().atMost(Durations.TEN_SECONDS)
|
||||
.until(() -> !MapWithAIDataUtils.getLayer(false).getDataSet().getDataSourceBounds().isEmpty());
|
||||
|
||||
final BBox added = MapWithAIDataUtils.getLayer(false).getDataSet().getDataSourceBounds().iterator().next().toBBox();
|
||||
assertTrue(temp.bounds(added));
|
||||
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue