Changeset 16336 in josm

Timestamp:

2020-04-18T10:52:42+02:00 (6 years ago)

Author:

simon04

Message:

fix #19112, see #18164 - OverpassTurboQueryWizard: use OsmPrimitiveType.getAPIName

Location:

trunk

Files:

• src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java

@@ -12 +12 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -89 +90 @@
             final EnumSet<OsmPrimitiveType> types = EnumSet.noneOf(OsmPrimitiveType.class);
             final String query = constructQuery(conjunction, types);
-            for (Object type : types.isEmpty() || types.size() == 3 ? Collections.singleton("nwr") : types) {
-                queryLines.add("  " + type + query + queryLineSuffix + ";");
-            }
+            final Stream<String> typeStream = types.isEmpty() || types.size() == 3
+                    ? Stream.of("nwr")
+                    : types.stream().map(OsmPrimitiveType::getAPIName);
+            typeStream.forEach(type -> queryLines.add("  " + type + query + queryLineSuffix + ";"));
         }
         queryLines.add(");");

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

@@ -20 +20 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().timeout(15000);
+    public JOSMTestRules test = new JOSMTestRules().i18n("de");
 
     private void assertQueryEquals(String expectedQueryPart, String input) {