Modify

Opened 13 months ago

Closed 3 months ago

#23290 closed enhancement (fixed)

Validate the regions a tag is expected to be in

Reported by: taylor.smock Owned by: team
Priority: normal Milestone: 24.08
Component: Core Version:
Keywords: vespucci regions tagging preset Cc: SimonPoole, stoecker

Description

Original PR by Sarabjeet108: https://github.com/JOSM/josm/pull/122

I've made the following modifications:

  • Allow the use of the new region attributes for keys inside a preset
  • Basic Tests

regions comes from Vespucci's extensions: https://vespucci.io/tutorials/presets/#extensions

Attachments (1)

23290.patch (72.8 KB ) - added by taylor.smock 13 months ago.

Download all attachments as: .zip

Change History (65)

by taylor.smock, 13 months ago

Attachment: 23290.patch added

comment:1 by taylor.smock, 13 months ago

Milestone: 23.12

comment:2 by anonymous, 13 months ago

crossing_ref is used worldwide, not sure if that should (effectively) be deprecated everywhere except GB?

comment:3 by taylor.smock, 13 months ago

@anonymous: See #23251: Crossing preset: Change label for crossing_ref.

I've scheduled the UK limitation for rereview in May 2024.

comment:4 by Famlam, 13 months ago

Just my two cents: could it be considered to delay this new warning until May too? I use crossing_ref all the time in The Netherlands too.

comment:5 by taylor.smock, 13 months ago

@Famlam: In order to see the new warning, you have to:

  1. Enable Run data validator on user input in Tagging Presets settings
  2. Enable Show informational level in Data validator.

You can disable the region check under the Tag checker heading. Or ignore the the group.

comment:6 by Famlam, 13 months ago

Ah, by scanning it I thought it'd trigger the Severity.WARNING message. Apologies.

comment:7 by taylor.smock, 13 months ago

No worries. Always feel free to ask for clarification.

In this case, the checks are only run if the informational level is enabled.

comment:8 by taylor.smock, 11 months ago

Resolution: fixed
Status: newclosed

In 18918/josm:

Fix #23290: Validate the regions a tag is expected to be in (patch by Sarabjeet108, modified)

Modifications are as follows:

  • Allow the use of the new region attributes for keys inside a preset
  • Basic tests

regions comes from Vespucci's extensions: https://vespucci.io/tutorials/presets/#extensions

comment:9 by skyper, 11 months ago

It would be nice if the new attribute is documented under wiki:TaggingPresets#Attributes. Thanks in advance.

comment:10 by skyper, 11 months ago

The unit test jenkins/job/JOSM-Integration/9800/jdk=JDK8/testReport/junit/org.openstreetmap.josm.gui.preferences.map/TaggingPresetPreferenceTestIT/Internal_Preset___https___josm_openstreetmap_de_browser_trunk_data_defaultpresets_xml/ is failing, now:

Internal Preset => [resource://data/defaultpresets.xml => org.openstreetmap.josm.tools.XmlParsingException:
org.openstreetmap.josm.tools.XmlParsingException (at line 1,468, column 140)
java.lang.reflect.InvocationTargetException] ==> expected: <true> but was: <false>

Edit: see #23514

Plus there is a s missing at source:/trunk/resources/data/defaultpresets.xml#L8268.

Last edited 9 months ago by skyper (previous) (diff)

comment:11 by taylor.smock, 11 months ago

I noticed the failing integration test. Unfortunately, it passed locally for me.

comment:12 by skyper, 11 months ago

Keywords: regions tagging preset added
Resolution: fixed
Status: closedreopened

I tried the "Shops/Payment Methodes" and I am still offered all regional payments and no validator informational warning is created (unlike crossing_ref where a warning is created).

payment:ep_avant=yes
payment:ep_geldkarte=yes
payment:ep_mep=yes
payment:ep_minicash=yes
payment:ep_minipay=yes
payment:ep_monedero4b=yes
payment:postfinance_card=yes
shop=pet
Last edited 11 months ago by skyper (previous) (diff)

comment:13 by skyper, 11 months ago

Type: defectenhancement

comment:14 by taylor.smock, 11 months ago

In 18925/josm:

See #23290 comment 10: Fix missing s in region for payment cards

in reply to:  12 comment:15 by skyper, 11 months ago

Replying to skyper:

I tried the "Shops/Payment Methodes" and I am still offered all regional payments and no validator informational warning is created (unlike crossing_ref where a warning is created).

Rereading the ticket and commit carefully, I understand that it is only about validating the values. I was hoping that additionally only appropriate values for the region would be offered in the preset.
Now, I wonder if it would be better to use the code of existing territory selectors inside and outside and even use the same naming instead of adding two new names regions and exclude_regions.

comment:16 by taylor.smock, 11 months ago

If Vespucci didn't already have the extension, I might be more inclined to go with the MapCSS inside/outside for consistency. However, when adding support for an extension from a third-party project (Vespucci), I would strongly prefer to be consistent with the third-party. With a few functional changes (for example, I don't believe Vespucci supports regions/exclude_regions on a per-tag basis).

We haven't documented it yet, and it is a new feature, so I would be willing to change it to match the MapCSS inside/outside naming scheme. But I would want it to be consistent in the ecosystem, which means getting SimonPoole on board.

Pros of current tagging:

  • Existing documentation on how to use it with Vespucci
  • Minimal breakage for those who want to bring Vespucci only presets to JOSM
  • Doesn't match MapCSS, so it is easier to find documentation (josm regions preset instead of josm inside preset)

Cons of current tagging:

  • Doesn't match MapCSS, for those who write both MapCSS and presets
  • exclude_regions is a flag instead of a list of regions.

comment:17 by skyper, 11 months ago

Naming could be solved with aliases and documentation can still be present on the preset part (link). Major questions are if the MapCSS functions could be used for the preset part, too, instead of some duplication, and how to handle the differences between outside and exclude_regions.

comment:18 by taylor.smock, 11 months ago

Cc: stoecker added

After much investigation, I figured out why region wasn't flagged:
We extensively use <anyAttribute processContents="skip" />; this skips any attribute that is not understood.
Of course, that now means I have no idea what is going on with the test.

@stoecker: Are there any customizations to the source code for https://josm.openstreetmap.de/jenkins/job/JOSM-Integration ?
I haven't been able to get the test to fail locally (note: I had to modify source:trunk/test/unit/org/openstreetmap/josm/gui/preferences/AbstractExtendedSourceEntryTestCase.java to point to the "right" URL for resources -- the generated URL doesn't actually point at a valid resource).

in reply to:  18 ; comment:19 by stoecker, 11 months ago

Replying to taylor.smock:

We extensively use <anyAttribute processContents="skip" />; this skips any attribute that is not understood.
Of course, that now means I have no idea what is going on with the test.

Yes. This is ugly, but a design flaw of XSD in my eyes. I would like "warn and ignore", but that's not possible. Also the language prefixes would make the warnings hard. XSD is limited...

@stoecker: Are there any customizations to the source code for

Don't think so. You should be able to look yourself :-)

in reply to:  19 comment:20 by taylor.smock, 11 months ago

Replying to stoecker:

Replying to taylor.smock:

@stoecker: Are there any customizations to the source code for

Don't think so. You should be able to look yourself :-)

I didn't see anything in Jenkins. I'll change the checkout strategy from Use 'svn update' as much as possible to Always check out a fresh copy for the next run (probably the next few runs; I will change it back tomorrow, assuming I don't forget).

comment:21 by GerdP, 11 months ago

Not sure if this is the right ticket. I see these warnings
"Invalid region for this preset - Preset Traffic Signal should not have the key crossing_ref" for e.g. https://www.osm.org/node/428042469

I think the wording should be improved.
What should this tell the mapper? Are they supposed to change the preset Traffic Signal somehow? Or should they open a ticket because the preset is wrong? Or something in the data is wrong?
If the data should be changed I would expect a message like
"crossing_ref=* should not be used in <....>"
or probably better
"crossing_ref=* should not be used outside of GB".

Last edited 11 months ago by GerdP (previous) (diff)

comment:22 by taylor.smock, 11 months ago

This is the "right" place. Maybe it should have some kind of conditional (if invalid key else if invalid value else if invalid preset).

  • Invalid region for this preset
  • Invalid region for a value from a preset
  • Invalid region for a key from a preset

Additional notes:
I believe this only occurs when both expert mode is enabled and the informational errors are enabled.

comment:23 by GerdP, 11 months ago

Sorry, I still don't understand what the warning is about. Maybe I didn't understand what a region is. I thought that is an area (a boundary) and my object is inside or outside of that boundary. If the message says that the region is invalid what am I supposed to do?

I think it is not the region that is invalid, it is the tag or tag value that is considerd invalid in a given region.

comment:24 by taylor.smock, 11 months ago

The crossing_ref tag is kind of a special case -- I've scheduled a review on that (see #23251) since it doesn't seem to be UK only anymore. I'll probably be dropping the regions check for that.

But there are some tags that are (almost always) limited to a specific region.
For example, ref:gnis or memorial=stolperstein.

comment:25 by GerdP, 11 months ago

Yes, that's understood. I just complain about the wording of the message. If a tag should not be used outside a special region the message should say that. The actual wording blames the region, not the misused tag.

comment:26 by taylor.smock, 11 months ago

Milestone: 23.1224.01

Ticket retargeted after milestone closed

comment:27 by taylor.smock, 10 months ago

In 18966/josm:

See #23290: Add missing regions attributes to text, combo and multiselect

simonpoole (Vespucci dev) pointed out that we were using regions for those
attributes on but did not have them documented in the xsd.

comment:28 by taylor.smock, 10 months ago

Milestone: 24.0124.02

Ticket retargeted after milestone closed

comment:29 by aceman, 10 months ago

Yes, the wording of the message should be improved.

comment:30 by taylor.smock, 10 months ago

Does the following wording make sense? If it doesn't, I'm open to suggestions. Just keep in mind that we have limited space.

  • src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

    IDEA additional info:
    Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
    <+>UTF-8
    diff --git a/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java b/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
    a b  
    749749                }
    750750                if (isInRegion == preset.exclude_regions()) {
    751751                    errors.add(TestError.builder(this, Severity.WARNING, INVALID_REGION)
    752                             .message(tr("Invalid region for this preset"),
     752                            .message(tr("Preset is invalid in this region"),
    753753                                    marktr("Preset {0} should not be applied in this region"),
    754754                                    preset.getLocaleName())
    755755                            .primitives(p)
     
    825825                final TestError.Builder builder = TestError.builder(this, Severity.WARNING, INVALID_REGION)
    826826                        .primitives(p);
    827827                if (value == null) {
    828                     builder.message(tr("Invalid region for this preset"),
     828                    builder.message(tr("Key from a preset is invalid in this region"),
    829829                            marktr("Preset {0} should not have the key {1}"),
    830830                            preset.getLocaleName(), key);
    831831                } else {
    832                     builder.message(tr("Invalid region for this preset"),
     832                    builder.message(tr("Value from a preset is invalid in this region"),
    833833                            marktr("Preset {0} should not have the tag {1}={2}"),
    834834                            preset.getLocaleName(), key, value);
    835835                }

comment:31 by GerdP, 10 months ago

Sorry, I tried to find the reasoning for this change on github, but failed, so I still don't know for sure what this test is expected to find and who is supposed to fix the found "errors". For me, this came "out of the blue", but I assume it was discussed on github. How/Where do I find that discussion?

I didn't try but I think even with the patch I would see lots of these warning messages when validating a city in Germany:
"Preset Pedestrian Crossing should not have the key crossing_ref"
"Preset Traffic Signal should not have the key crossing_ref"
and I am still not sure if that means that the tags of the OSM object should be changed or if the preset has to be fixed or maybe if the preset should not be used by JOSM or something like that.

BTW: I have to enable informational warnings to see these messages, but they are shown with severity warning.

comment:32 by skyper, 10 months ago

Regarding crossing_ref, see also #23251. Besides I wonder how I can handle the situation if I need to specify different lists of tags with some maybe identical per region/country. And how well the code is prepare for external presets with conflicting definitions compare to the core presets. Have not tried it but what happens if a tag is excluded from a region in core and included in an external preset or vice versa?

comment:33 by taylor.smock, 10 months ago

I have to enable informational warnings to see these messages, but they are shown with severity warning.

I think that the warnings were initially hidden behind the informational warnings being enabled due to a misunderstanding in the startTest method. Probably my fault.

  • src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

    IDEA additional info:
    Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
    <+>UTF-8
    diff --git a/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java b/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
    a b  
    12661266            checkPresetsTypes = checkPresetsTypes && Config.getPref().getBoolean(PREF_CHECK_PRESETS_TYPES_BEFORE_UPLOAD, true);
    12671267        }
    12681268
    1269         checkRegions = includeOtherSeverity && Config.getPref().getBoolean(PREF_CHECK_REGIONS, true);
     1269        checkRegions = Config.getPref().getBoolean(PREF_CHECK_REGIONS, true);
    12701270        if (isBeforeUpload) {
    12711271            checkRegions = checkRegions && Config.getPref().getBoolean(PREF_CHECK_REGIONS_BEFORE_UPLOAD, true);
    12721272        }

but I assume it was discussed on github

I think its been discussed in various locations, but it mostly comes down to decreasing the delta between us and Vespucci (see https://vespucci.io/tutorials/presets/#extensions ).

Have not tried it but what happens if a tag is excluded from a region in core and included in an external preset or vice versa?

I would expect there to be a warning; we have no method of having presets override other presets. Whichever one is excluding a tag from a region "wins".

comment:34 by GerdP, 10 months ago

So, if the "regions extension" was introduced for a mobile OSM editor, I assume the idea was to prevent the situation that a preset is presented to the user when the current location doesn't "allow" to use it. That seems reasonable to me.
I don't know Vespucci, does it also verify existing OSM data and show error messages regarding preset regions? Or maybe other QA tools? What wording do they use?

in reply to:  34 comment:35 by taylor.smock, 10 months ago

Replying to GerdP:

I don't know Vespucci, does it also verify existing OSM data and show error messages regarding preset regions? Or maybe other QA tools? What wording do they use?

It looks like it has a basic validator; I don't know all that it does (since I don't use Vespucci). @SimonPoole can probably answer that better.

Or maybe other QA tools?

I don't think other QA tools use it yet, but I would hope they do in the future, assuming they use our presets for validation purposes.

comment:36 by taylor.smock, 10 months ago

Resolution: fixed
Status: reopenedclosed

In 18980/josm:

Fix #23290: Improve region check messages and run region checks when informational warnings are disabled

comment:37 by taylor.smock, 10 months ago

In 18981/josm:

See #23290/r18980: Update test messages

in reply to:  12 ; comment:38 by skyper, 9 months ago

Resolution: fixed
Status: closedreopened

Replying to skyper:

I tried the "Shops/Payment Methodes" and I am still offered all regional payments and no validator informational warning is created (unlike crossing_ref where a warning is created).

payment:ep_avant=yes
payment:ep_geldkarte=yes
payment:ep_mep=yes
payment:ep_minicash=yes
payment:ep_minipay=yes
payment:ep_monedero4b=yes
payment:postfinance_card=yes
shop=pet

Still no warning with a node with above tags in Germany. All, except payment:ep_geldkarte=yes should be warned about.

in reply to:  7 comment:39 by Famlam, 9 months ago

Replying to taylor.smock:

No worries. Always feel free to ask for clarification.

In this case, the checks are only run if the informational level is enabled.

I just tried the latest dev version 18997. It also seems that something else changed, because this warning now appears at warning level, e.g. flagging all crossing_refs not on an informational level as before, but on an actual warning level, giving about 10k incorrect actual warnings in NL by default (rather than after manually enabling a specific setting)

(Also the warning is strange: I rarely use the presets, but I get a warning about a key from a preset being wrong)

Version 0, edited 9 months ago by Famlam (next)

comment:40 by taylor.smock, 8 months ago

Milestone: 24.0224.03

Ticket retargeted after milestone closed

comment:41 by skyper, 8 months ago

See #23589 for another improper validator warning.

comment:42 by Famlam, 8 months ago

Another issue with this check is that some relations cross country borders, so the Rhine river (relation 123924) also contains ref:fgkz=2, ref:sandre=A---0000 and ref:gwlnr=CH0000010000 because it passes through France, Germany and Switzerland as one river (thus one waterway relation). However, that means that if I'm editing near the river in The Netherlands, I get several validation warnings. I don't think I'm supposed to delete these tags from the relation though, nor that I should split the river relation per country borders.

comment:43 by stoecker, 8 months ago

That could be easily solved when a feature is not reported when at least partially in the area.

comment:44 by GerdP, 8 months ago

The current implementation checks only where the center is. An incomplete relation is probably not worth testing.

comment:45 by Famlam, 8 months ago

The current implementation checks only where the center is. An incomplete relation is probably not worth testing.

Skipping incomplete relations unfortunately won't resolve this issue (although it would help). If I download all members of the relation, I still get the warning for ref:sandre (but indeed, the warning for the German ref - probably the center - is suppressed in that case)

comment:46 by taylor.smock, 8 months ago

IIRC, the territory checks only take a coordinate.

I'd have to check (via profiling), but I suspect the most complete solution (check every node) would be extremely expensive in terms of CPU and memory.

comment:47 by skyper, 8 months ago

Problems with relations crossing the national boarder reminds me of #21908.
I guess there are not many ways crossing a national boarder though touching a boarder in more than one consecutive node might still be more common. If you choose a small region like a state or even a city limit, you'd probably find more problematical ways.
For relations I only see a solution for completely downloaded relations by converting the members into a line and checking if the line crosses/touches the boarder. This might work for ways, too, but I do not know how expensive these computations are.

comment:48 by taylor.smock, 8 months ago

Milestone: 24.0324.04

Ticket retargeted after milestone closed

comment:49 by skyper, 7 months ago

Summary: [PATCH] Validate the regions a tag is expected to be inValidate the regions a tag is expected to be in

See #23636 for suggests to solve the problem.

comment:50 by taylor.smock, 7 months ago

Milestone: 24.0424.05

Ticket retargeted after milestone closed

comment:51 by taylor.smock, 6 months ago

Milestone: 24.0524.06

Ticket retargeted after milestone closed

comment:52 by stoecker, 5 months ago

Milestone: 24.0624.07

Milestone closed.

comment:53 by goodidea, 4 months ago

Is it sure that the validator will work correctly if regions is used in an item tag?

For example, I now always get the validator warning “Preset is invalid in this region – Preset Charging Station should not be applied in this region”., when I edit a charging station in Germany. And this is caused by a preset with regions="US,CA" in the item tag (I checked this by changing the name of the preset). The preset is from Simonpoole's “beautified-JOSM-preset” (see https://github.com/simonpoole/beautified-JOSM-preset).

Note: there is a second “Charging Station” preset for all other regions with exclude_regions="true" regions="US,CA" in the item tag. This does not cause validator warnings for objects in Germany.

Here is the code of these 2 presets:

            <item name="Charging Station" icon="transport_charging_station.png" regions="US,CA" type="node,closedway,multipolygon" preset_name_label="true">
                <link wiki="Tag:amenity=charging_station"/>
                <space/>
                <key key="amenity" value="charging_station"/>
                <reference ref="charging_base"/>
                <space/>
                <reference ref="charging_sockets_cables_us_ca"/>
                <preset_link preset_name="Charge point" text="Similar but different tags:"/>
            </item> <!-- Charging Station US,CA -->

           <item name="Charging Station" icon="transport_charging_station.png" exclude_regions="true" regions="US,CA" type="node,closedway,multipolygon" preset_name_label="true">  
                <link wiki="Tag:amenity=charging_station"/>
                <space/>
                <key key="amenity" value="charging_station"/>      
                <reference ref="charging_base"/>
                <space/>
                <reference ref="charging_sockets_cables"/>
                <preset_link preset_name="Charge point" text="Similar but different tags:"/>   
            </item> <!-- Charging Station -->

comment:54 by taylor.smock, 4 months ago

Milestone: 24.0724.08

Ticket retargeted after milestone closed

comment:55 by taylor.smock, 4 months ago

Resolution: fixed
Status: reopenedclosed

In 19170/josm:

Fix #23290: When an object is not in the appropriate region based off of the center of its bbox, check all the nodes.

This does not appear to have a significant performance impact; this may change as
more region specific presets are created.

in reply to:  38 ; comment:56 by taylor.smock, 4 months ago

@goodidea: Please open another ticket for your issue; right now, our code assumes that there are no duplicate presets (like one for inside the US and Canada and one for outside the US and Canada).

in reply to:  38 comment:57 by skyper, 4 months ago

@Taylor: Did you miss my comments? It is still not working with r19171!

Replying to skyper:

Replying to skyper:

I tried the "Shops/Payment Methodes" and I am still offered all regional payments and no validator informational warning is created (unlike crossing_ref where a warning is created).

payment:ep_avant=yes
payment:ep_geldkarte=yes
payment:ep_mep=yes
payment:ep_minicash=yes
payment:ep_minipay=yes
payment:ep_monedero4b=yes
payment:postfinance_card=yes
shop=pet

Still no warning with a node with above tags in Germany. All, except payment:ep_geldkarte=yes should be warned about.

comment:58 by skyper, 4 months ago

Resolution: fixed
Status: closedreopened

comment:59 by taylor.smock, 4 months ago

I did see your comment, attempted to reproduce, and was unable to. Then I went to update the testRegionKey test and was able to reproduce. I've been working on it.

comment:60 by taylor.smock, 4 months ago

Resolution: fixed
Status: reopenedclosed

In 19172/josm:

Fix #23290: Use checks in checkgroups when looking for out-of-region tags

Also fix an i18n issue and update a test to use a key that is currently invalid
in a region.

in reply to:  56 comment:61 by goodidea, 3 months ago

Replying to taylor.smock:

@goodidea: Please open another ticket for your issue; right now, our code assumes that there are no duplicate presets (like one for inside the US and Canada and one for outside the US and Canada).

I just created a new ticket #23865 from my comment above. I hope it is OK like that.

comment:62 by Famlam, 3 months ago

Resolution: fixed
Status: closedreopened

Fix #23290: When an object is not in the appropriate region based off of the center of its bbox, check all the nodes.

@Taylor After testing with JOSM-latest (19198) I'm afraid that the case of comment:42 requires an additional fix.

  1. Download everything in the bbox 51.8570401,5.8806038,51.8627914,5.8875132 (or, if it's easier, download the big river in the city of Nijmegen, Netherlands) . It contains a Dutch part of a river that crosses many countries. (However, make sure not to download all relation members).
  2. Validate
  3. Still get a warning about the keys regarding the French/German/Swiss ref's of the river (see comment 42) even though the river really streams to each of these countries

I think it also needs to check if all members are downloaded before issuing this warning? E.g. ignore incomplete relations? The present fix works very well once all members are downloaded (thanks :) )

comment:63 by taylor.smock, 3 months ago

I just created a new ticket #23865 from my comment above. I hope it is OK like that.

Yep. That is fine.

I think it also needs to check if all members are downloaded before issuing this warning? E.g. ignore incomplete relations? The present fix works very well once all members are downloaded (thanks :) )

This is easy enough to fix.

comment:64 by taylor.smock, 3 months ago

Resolution: fixed
Status: reopenedclosed

In 19201/josm:

Fix #23290: Exclude incomplete relations from region checks

Also rework TagCheckerTest to use parameterized tests.

Modify Ticket

Change Properties
Set your email in Preferences
Action
as closed The owner will remain team.
as The resolution will be set.
The resolution will be deleted. Next status will be 'reopened'.

Add Comment


E-mail address and name can be saved in the Preferences .
 
Note: See TracTickets for help on using tickets.