[patch] JOSM search by preset in the search dialog

[bafonins]

Currently, there are two menu entries to perform searching - "Search" and "Search for object by preset...". And functionality to search for osm objects is very limiting, namely there is no way to search for two or more presets at the same time, it is not possible to add object that match the preset to the current selection and etc.
I propose to merge these dialogs, actually adding functionality to search for presets to the search dialog. Then queries like
preset:water | preset:waterway or
preset:Village | preset:"Cave Entrance" | highway=motorway
can be performed + the selection settings from the search dialog can be used to control selected objects.

Also, we can embed the "Search for objectsby preset..." dialog intro the "Search" dialog in order to simply select needed presets and append 'preset:...' query to the text field.

[stoecker]

Note before applying: Typo in the first line "all object_s_".

[michael2402]

There is a github PR for this patch. Commenting is easier there. I did a review on it - especially to address some coding style issues:

​https://github.com/openstreetmap/josm/pull/19

[stoecker]

Replying to michael2402:

There is a github PR for this patch. Commenting is easier there.

No it is not. It is already enough work to react to one bug-tracker. Starting to react to different places is not a good idea.

[bafonins]

Refactored the code a bit

[michael2402]

Replying to stoecker:

Replying to michael2402:

There is a github PR for this patch. Commenting is easier there.

No it is not. It is already enough work to react to one bug-tracker. Starting to react to different places is not a good idea.

For conceptional issues I agree. But my comments were more on stylistic issues (variable names, inverting equals, using blocks in if/else, ...)

@bafonins: You patch looks better that way ;-). Cann you add test cases to it to the SearchCompilerTest? Especially for:

`
preset:"water" (Test if it matches correctly)
preset:water (Test if it matches correctly)
preset: water (Test if it matches correctly)
preset: (Should throw a ParseError)
preset:xyz (Should throw a ParseError)
`

[bafonins]

Fixed the issue and added tests

[michael2402]

@bafonins: Should I merge this patch now or wait for your work on your future work?

[bafonins]

Do not merge it now, there are still things to be done.

[michael2402]

Moving this until after the 17.6 release - the patch should be ready before then but we should have time to fix issues.

[bafonins]

The search dialog, expert mode, english

[bafonins]

The search dialog, regular mode, english

[bafonins]

The search dialog, expert mode, german

[bafonins]

With this update GUI of the search dialog changed a bit. New hints added, as well as a list of possible presets to search for.

After clicking on any preset in the selector, a corresponding string is generated and appended to the text field. Autocomplete is working and in case of selecting some preset that starts already used query, the generated part is selected. And of course, presets can be combined into more sophisticated queries as you usually do with types, names, logical operators, etc.

So, searching works as follows :
Annotation/Address - a regular query that matches all object that have the corresponding preset
Annotation/* - a wildcard query that matches all object that have any preset of the group Annotation

Any suggestions?

[michael2402]

In 12464/josm:

Apply #14923: Adjust the search dialog to allow to search for primitives that use a preset. Patch by bafonins

[Don-vip]

In 12467/josm:

see #14923 - PMD - UseIndexOfChar - String.indexOf(char) is faster than String.indexOf(String)

[Don-vip]

In 12468/josm:

see #14923 - suppress java warnings