Changeset 18847 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2023-10-03T16:25:42+02:00 (18 months ago)

Author:

taylor.smock

Message:

Fix #23212: Overpass query wizard should transform key: to ["key"] instead of [~"key"~""]

This is fixed by using ExactKeyValue instead of KeyValue for key: queries.
As a happy side effect, this significantly reduces the cost of key: queries.
In a test area ("Mesa County, Colorado"), this reduces the cpu time from 2600ms
to 200ms and reduces memory allocations from 425mb to effectively 0 for a name:
query.

In addition, this simplifies many equals methods by converting the following
pattern to Objects.equals(first, second):

if (first == null) {
    if (second != null) {
        return true;
    }
} else if (!first.equals(second))
    return false;
return true;

There are some additional changes, mostly related to documentation and lint
issues.

File:

• trunk/src/org/openstreetmap/josm/tools/SearchCompilerQueryWizard.java (modified) (4 diffs)

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

@@ -38 +38 @@
     public static String constructQuery(final String search) {
         try {
-            Matcher matcher = Pattern.compile("\\s+GLOBAL\\s*$", Pattern.CASE_INSENSITIVE).matcher(search);
+            Matcher matcher = Pattern.compile("\\s+GLOBAL\\s*$", Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CHARACTER_CLASS)
+                    .matcher(search);
             if (matcher.find()) {
                 final Match match = SearchCompiler.compile(matcher.replaceFirst(""));
@@ -44 +45 @@
             }
 
-            matcher = Pattern.compile("\\s+IN BBOX\\s*$", Pattern.CASE_INSENSITIVE).matcher(search);
+            matcher = Pattern.compile("\\s+IN BBOX\\s*$", Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CHARACTER_CLASS)
+                    .matcher(search);
             if (matcher.find()) {
                 final Match match = SearchCompiler.compile(matcher.replaceFirst(""));
@@ -50 +52 @@
             }
 
-            matcher = Pattern.compile("\\s+(?<mode>IN|AROUND)\\s+(?<area>[^\" ]+|\"[^\"]+\")\\s*$", Pattern.CASE_INSENSITIVE).matcher(search);
+            matcher = Pattern.compile("\\s+(?<mode>IN|AROUND)\\s+(?<area>[^\" ]+|\"[^\"]+\")\\s*$",
+                    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CHARACTER_CLASS).matcher(search);
             if (matcher.find()) {
                 final Match match = SearchCompiler.compile(matcher.replaceFirst(""));
@@ -79 +82 @@
             final EnumSet<OsmPrimitiveType> types = EnumSet.noneOf(OsmPrimitiveType.class);
             final String query = constructQuery(conjunction, types);
-            (types.isEmpty() || types.size() == 3
+            queryLines.addAll((types.isEmpty() || types.size() == 3
                     ? Stream.of("nwr")
                     : types.stream().map(OsmPrimitiveType::getAPIName))
-                    .forEach(type -> queryLines.add("  " + type + query + queryLineSuffix + ";"));
+                    .map(type -> "  " + type + query + queryLineSuffix + ";")
+                    .collect(Collectors.toList()));
         }
         queryLines.add(");");