Changeset 15814 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2020-02-05T19:53:01+01:00 (5 years ago)

Author:

simon04

Message:

fix #18639 - Update to overpass-wizard 0.0.9

File:

• trunk/test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java (modified) (8 diffs)

trunk/test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java

@@ -31 +31 @@
                 "[out:xml][timeout:90][bbox:{{bbox}}];\n" +
                 "(\n" +
-                "  node[\"amenity\"=\"drinking_water\"];\n" +
-                "  way[\"amenity\"=\"drinking_water\"];\n" +
-                "  relation[\"amenity\"=\"drinking_water\"];\n" +
+                "  nwr[\"amenity\"=\"drinking_water\"];\n" +
                 ");\n" +
                 "(._;>;);\n" +
@@ -48 +46 @@
                 "[out:xml][timeout:90][bbox:{{bbox}}];\n" +
                 "(\n" +
-                "  node[\"amenity\"!=\"drinking_water\"];\n" +
-                "  way[\"amenity\"!=\"drinking_water\"];\n" +
-                "  relation[\"amenity\"!=\"drinking_water\"];\n" +
+                "  nwr[\"amenity\"!=\"drinking_water\"];\n" +
                 ");\n" +
                 "(._;>;);\n" +
@@ -64 +60 @@
                 "[out:xml][timeout:90][bbox:{{bbox}}];\n" +
                 "(\n" +
-                "  node[\"foo\"=\"bar\"][\"baz\"=\"42\"];\n" +
-                "  way[\"foo\"=\"bar\"][\"baz\"=\"42\"];\n" +
-                "  relation[\"foo\"=\"bar\"][\"baz\"=\"42\"];\n" +
+                "  nwr[\"foo\"=\"bar\"][\"baz\"=\"42\"];\n" +
                 ");\n" +
                 "(._;>;);\n" +
@@ -83 +77 @@
                 "[out:xml][timeout:90][bbox:{{bbox}}];\n" +
                 "(\n" +
-                "  node[\"foo\"=\"bar\"];\n" +
-                "  way[\"foo\"=\"bar\"];\n" +
-                "  relation[\"foo\"=\"bar\"];\n" +
-                "  node[\"baz\"=\"42\"];\n" +
-                "  way[\"baz\"=\"42\"];\n" +
-                "  relation[\"baz\"=\"42\"];\n" +
+                "  nwr[\"foo\"=\"bar\"];\n" +
+                "  nwr[\"baz\"=\"42\"];\n" +
                 ");\n" +
                 "(._;>;);\n" +
@@ -106 +96 @@
                 "[out:xml][timeout:90][bbox:{{bbox}}];\n" +
                 "(\n" +
-                "  node[\"foo\"][\"asd\"];\n" +
-                "  way[\"foo\"][\"asd\"];\n" +
-                "  relation[\"foo\"][\"asd\"];\n" +
-                "  node[\"foo\"][\"fasd\"];\n" +
-                "  way[\"foo\"][\"fasd\"];\n" +
-                "  relation[\"foo\"][\"fasd\"];\n" +
-                "  node[\"bar\"][\"asd\"];\n" +
-                "  way[\"bar\"][\"asd\"];\n" +
-                "  relation[\"bar\"][\"asd\"];\n" +
-                "  node[\"bar\"][\"fasd\"];\n" +
-                "  way[\"bar\"][\"fasd\"];\n" +
-                "  relation[\"bar\"][\"fasd\"];\n" +
+                "  nwr[\"foo\"][\"asd\"];\n" +
+                "  nwr[\"foo\"][\"fasd\"];\n" +
+                "  nwr[\"bar\"][\"asd\"];\n" +
+                "  nwr[\"bar\"][\"fasd\"];\n" +
                 ");\n" +
                 "(._;>;);\n" +
@@ -148 +130 @@
                 "[out:xml][timeout:90][bbox:{{bbox}}];\n" +
                 "(\n" +
-                "  node(user:\"foo\");\n" +
-                "  way(user:\"foo\");\n" +
-                "  relation(user:\"foo\");\n" +
-                "  node(uid:42);\n" +
-                "  way(uid:42);\n" +
-                "  relation(uid:42);\n" +
+                "  nwr(user:\"foo\");\n" +
+                "  nwr(uid:42);\n" +
                 ");\n" +
                 "(._;>;);\n" +
@@ -184 +162 @@
                 "{{geocodeArea:Josmland}}->.searchArea;\n" +
                 "(\n" +
-                "  node[\"foo\"=\"bar\"](area.searchArea);\n" +
-                "  way[\"foo\"=\"bar\"](area.searchArea);\n" +
-                "  relation[\"foo\"=\"bar\"](area.searchArea);\n" +
+                "  nwr[\"foo\"=\"bar\"](area.searchArea);\n" +
                 ");\n" +
                 "(._;>;);\n" +
@@ -202 +178 @@
                 "[out:xml][timeout:90];\n" +
                 "(\n" +
-                "  node[\"amenity\"=\"hospital\"];\n" +
-                "  way[\"amenity\"=\"hospital\"];\n" +
-                "  relation[\"amenity\"=\"hospital\"];\n" +
+                "  nwr[\"amenity\"=\"hospital\"];\n" +
                 ");\n" +
                 "(._;>;);\n" +