Conflicts: Resolving differences between tags

[leni]

What steps will reproduce the problem?

1. Generating a conflict over tags
2. The Resolve button launches the Conflict Dialog for the selected conflict

What is the expected result?

Tags should have a red background and turn blue when selected as Help/Dialog/Conflict#Resolvingdifferencesbetweentags

What happens instead?

The tags of both versions are on a blue background and nothing changes when one of the tags is selected.

Please provide any additional information below. Attach a screenshot if possible.

Relative:URL: ^/trunk
Repository:UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b
Last:Changed Date: 2024-07-30 15:13:18 +0200 (Tue, 30 Jul 2024)
Revision:19160
Build-Date:2024-07-31 01:30:32
URL:https://josm.openstreetmap.de/svn/trunk

Identification: JOSM/1.5 (19160 en) Windows 10 64-Bit
OS Build number: Windows 10 Home 22H2 (19045)
Memory Usage: 607 MB / 1970 MB (325 MB allocated, but free)
Java version: 21.0.3+9-LTS, Azul Systems, Inc., OpenJDK 64-Bit Server VM
Look and Feel: com.sun.java.swing.plaf.windows.WindowsLookAndFeel
Screen: \Display0 1920x1080x32bpp@60Hz (scaling 1.25×1.25)
Maximum Screen Size: 1920×1080
Best cursor sizes: 16×16→32×32, 32×32→32×32
System property file.encoding: UTF-8
System property sun.jnu.encoding: Cp1252
Locale info: en_FR
Numbers with default locale: 1234567890 -> 1234567890
VM arguments: [-Dicedtea-web.bin.location=%UserProfile%\AppData\Local\Programs\OpenWebStart\javaws, -Djava.util.Arrays.useLegacyMergeSort=true, --add-reads=java.base=ALL-UNNAMED,java.desktop, --add-reads=java.desktop=ALL-UNNAMED,java.naming, --add-reads=java.naming=ALL-UNNAMED,java.desktop, --add-exports=java.desktop/sun.awt=ALL-UNNAMED,java.desktop, --add-exports=java.desktop/javax.jnlp=ALL-UNNAMED,java.desktop, --add-exports=java.base/com.sun.net.ssl.internal.ssl=ALL-UNNAMED,java.desktop, --add-exports=java.base/sun.net.www.protocol.jar=ALL-UNNAMED,java.desktop, --add-exports=java.base/sun.security.action=ALL-UNNAMED,java.desktop, --add-exports=java.base/sun.security.provider=ALL-UNNAMED,java.desktop, --add-exports=java.base/sun.security.util=ALL-UNNAMED,java.desktop, --add-exports=java.base/sun.security.validator=ALL-UNNAMED,java.desktop, --add-exports=java.base/sun.security.x509=ALL-UNNAMED,java.desktop, --add-exports=java.base/jdk.internal.util.jar=ALL-UNNAMED,java.desktop, --add-exports=java.base/sun.net.www.protocol.http=ALL-UNNAMED,java.desktop, --add-exports=java.desktop/sun.awt.X11=ALL-UNNAMED,java.desktop, --add-exports=java.desktop/sun.applet=ALL-UNNAMED,java.desktop,jdk.jsobject, --add-exports=java.naming/com.sun.jndi.toolkit.url=ALL-UNNAMED,java.desktop, --add-modules=java.scripting,java.sql,javafx.controls,javafx.media,javafx.swing,javafx.web, --add-exports=java.desktop/com.apple.eawt=ALL-UNNAMED, --add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED, --add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED, --add-exports=javafx.graphics/com.sun.javafx.application=ALL-UNNAMED, --add-exports=jdk.deploy/com.sun.deploy.config=ALL-UNNAMED, --add-opens=java.base/java.lang=ALL-UNNAMED, --add-opens=java.base/java.nio=ALL-UNNAMED, --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED, --add-opens=java.base/jdk.internal.ref=ALL-UNNAMED, --add-opens=java.desktop/javax.imageio.spi=ALL-UNNAMED, --add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED, --add-opens=java.prefs/java.util.prefs=ALL-UNNAMED, -Djava.security.manager=allow]

Plugins:
+ DirectUpload (36282)
+ HouseNumberTaggingTool (36298)
+ ImageWayPoint (36298)
+ MapRoulette (40)
+ PicLayer (1.0.3)
+ apache-commons (36282)
+ apache-http (36273)
+ auto_tools (81)
+ buildings_tools (36226)
+ cadastre-fr (36298)
+ conflation (0.6.11)
+ easypresets (1623509627)
+ ejml (36176)
+ geotools (36273)
+ graphview (36298)
+ indoorhelper (1.2.3)
+ jackson (36273)
+ javafx (36282)
+ jaxb (36118)
+ jna (36273)
+ jts (36004)
+ mapwithai (829)
+ opendata (36298)
+ photo_geotagging (36298)
+ photoadjust (36200)
+ pmtiles (36219)
+ pt_assistant (637)
+ reverter (36256)
+ scripting (v0.3.1)
+ tageditor (36298)
+ tagging-preset-tester (36256)
+ terracer (36298)
+ todo (138)
+ utilsplugin2 (36298)

Tagging presets:
+ https://github.com/Jungle-Bus/josm-presets/raw/gh-pages/jungle-stops/Preset_Jungle-Bus.zip
+ https://josm.openstreetmap.de/josmfile?page=Presets/ParkingLanes&zip=1
+ <josm.pref>/EasyPresets.xml
+ https://josm.openstreetmap.de/josmfile?page=Presets/Charlieu_Schema_for_POIs&zip=1

Map paint styles:
+ https://josm.openstreetmap.de/josmfile?page=Styles/MapWithAI&zip=1
+ https://josm.openstreetmap.de/josmfile?page=Styles/PublicTransport&zip=1
- <josm.pref>\plugins\indoorhelper\resources\sit.mapcss
+ <josm.pref>\plugins\indoorhelper\resources\sit.mapcss

Validator rules:
+ https://josm.openstreetmap.de/josmfile?page=Rules/FranceSpecificRules&zip=1

Last errors/warnings:
- 00000.380 W: extended font config - overriding 'filename.Malgun_Gothic=malgun.ttf' with 'MALGUN.TTF'
- 00000.381 W: extended font config - overriding 'filename.Myanmar_Text=mmrtext.ttf' with 'MMRTEXT.TTF'
- 00000.381 W: extended font config - overriding 'filename.Mongolian_Baiti=monbaiti.ttf' with 'MONBAITI.TTF'
- 00006.850 E: java.lang.IllegalArgumentException: WMS imagery has tileMatrixSet defined to: PTTM_06
- 00010.146 E: java.nio.file.NoSuchFileException: <josm.pref>\EasyPresets.xml
- 00010.147 E: <josm.pref>/EasyPresets.xml
- 00010.446 E: unable to find dependency jaxb for plugin geotools
- 00010.447 E: unable to find dependency jaxb for plugin opendata
- 01534.587 W: Conflicts detected - <html>There was 1 conflict detected.</html>
- 02375.638 W: Conflicts detected - <html>There was 1 conflict detected.</html>

[skyper]

So, the fields are auto-selected on both sides which hides the red background. The advantage of the auto-selection is that you do not need any further clicks to solve the tag conflicts though it hides the background colors.

[leni]

This only works for tags, when there is only one in conflict, if there are several tags only for the first one (several-tags.png): So it's the wiki that needs to be modified.

[skyper]

Yeah, this wiki page needs some updates. Actually, it is already mentioned on top of the page. Probably the whole page needs a review.
I can try to update the text but I won't have time to create nice screenshots with the indications and description on top.

[leni]

I've started making screenshots to complete the wiki (conflict over properties and members), I could take care of that, as well as the text (first drafted in French, which I'll translate with my bad English) after the 15th of September.

[skyper]

Sorry, had not much time to complete the text. I hope I find some next week. As the way's node list and the relation's member list are almost the same, I planned to describe them together but, well, we can also duplicate most of the text to have a section for each.

Thanks for the screenshots. We do not need attachments for icons as they are somewhere in the sources though I have to admit that I often have to read the java code to find the full path for the icon.

[leni]

No problem, I have been able to move forward.

I have separated the nodes and the members of the relation, but I have only described the simple method for the nodes and the less simple method for the members, referring to their reciprocal chapters, but they could very well be grouped together by describing the simple method with the nodes and the less simple method with the members. You're right, it would certainly be more readable.

For the icons, I found the after I have create the screenshot copyallelements.png and I cannot remove them.

[leni]

I think I've finished the screenshots, so I've reworded the text to bring together node/member. It can certainly be improved

[skyper]

Thanks for your work. I really want to review the wording plus add more describtion to some parts but I only have little spare time, atm. On top, I just ran into #23930 which took some time to reproduce and properly describe.

Replying to leni:

For the icons, I found the after I have create the screenshot copyallelements.png and I cannot remove them.

Yes, only a few persons have the privilege to delete attachments. I usually report them as "spam" with a decent comment. On the attachment's page, take a look at the top right corner below the common "tabs".

[skyper]

I am satisfied. As it is a wiki you can fiddle to perfection but the major information is up-to-date. The screenshots are quite huge but scaling them down will turn them almost unreadable.

@leni: Feel free to close the ticket.

[leni]

With the screenshots I can't reduce them in width “their version” disappears (I'll make a ticket) and indeed I couldn't reduce the definition any further without making them unreadable.

[skyper]

Yeah, in a few cases the height of the screenshots could be shorten but the width will always be quite wide caused by the design of the dialog. So nothing we can do.

[skyper]

Oh I missed to document the information about the changesets in the "Properties" tab.