Modify

Opened 5 years ago

Closed 3 months ago

Last modified 3 months ago

#12536 closed defect (fixed)

[Patch] Conflict window completely hides relation 'conflicts' while doing a "Replace Geometry"

Reported by: rickmastfan67 Owned by: GerdP
Priority: major Milestone: 20.12
Component: Core Version: latest
Keywords: conflict Cc:

Description (last modified by Klumbumbus)

Steps to reproduce:

  1. Start with a fresh profile (not really necessary as I can trigger this on my normal profile).
  2. Download and install the utilsplugin2 plugin.
  3. Activate the 'expert' mode (not 100% this is needed, but still, best to active it to be sure).
  4. Now, open the attached OSM file (this will allow you to see the bug in action very quickly).
  5. Select Way 64441900 and the tagless way above it.
  6. Ctrl+Shift+G to activate the 'Replace Geometry' function of utilsplugin2.
  7. Click the "Show tags with conflicts only" box. (not 100% necessary, but needed to match attached screenshot)

What should happen:
You should be able to see the relation conflicts immediately.

What happens:
You need to manually pull up the divider line that separates the two different sections.

In the past, when I did the 'replace geometry' on sections like this, the nodes/id of the way would have been automatically been moved to the new way with no problems or conflicts because the start/end nodes were the same. Now every time I do this, I have to manually move that divider up and select the 'keep' option for the relation, which really slows me down big time on cleaning up highways.


URL:http://josm.openstreetmap.de/svn/trunk
Repository:UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b
Last:Changed Date: 2016-02-14 23:17:40 +0100 (Sun, 14 Feb 2016)
Build-Date:2016-02-15 02:31:56
Revision:9805
Relative:URL: ^/trunk

Identification: JOSM/1.5 (9805 en) Windows 7 64-Bit
Memory Usage: 344 MB / 1820 MB (74 MB allocated, but free)
Java version: 1.8.0_73-b02, Oracle Corporation, Java HotSpot(TM) 64-Bit Server VM

Plugins:
- turnrestrictions (31895)
- utilsplugin2 (32018)

Attachments (6)

ticket12536.osm (352.9 KB) - added by rickmastfan67 5 years ago.
ticket12536.png (308.5 KB) - added by rickmastfan67 5 years ago.
12536.patch (1.5 KB) - added by GerdP 4 months ago.
first.PNG (43.6 KB) - added by GerdP 4 months ago.
panel before resize
enlarged.PNG (46.8 KB) - added by GerdP 4 months ago.
enlarged
12536.2.patch (3.3 KB) - added by GerdP 4 months ago.
adjust divider also when resizing the popup

Download all attachments as: .zip

Change History (17)

Changed 5 years ago by rickmastfan67

Attachment: ticket12536.osm added

Changed 5 years ago by rickmastfan67

Attachment: ticket12536.png added

comment:1 Changed 5 years ago by rickmastfan67

Description: modified (diff)

comment:2 Changed 5 years ago by Klumbumbus

Description: modified (diff)

comment:3 Changed 5 years ago by rickmastfan67

Has anybody been able to duplicate this yet? This is a really annoying bug and is still present in r10169. Maybe later today I'll try to see if I can find a regression window with the conflict window. If this helps, I run at 1920x1080 if that helps out.

comment:4 Changed 7 months ago by skyper

I have faced that problem even without using utilsplugin2. Gonna try to get an example the next time.

comment:5 Changed 4 months ago by GerdP

Component: Plugin utilsplugin2Core
Keywords: conflict added

I can reproduce but the conflict dialog is a core component.

Changed 4 months ago by GerdP

Attachment: 12536.patch added

Changed 4 months ago by GerdP

Attachment: first.PNG added

panel before resize

Changed 4 months ago by GerdP

Attachment: enlarged.PNG added

enlarged

comment:6 Changed 4 months ago by GerdP

Owner: changed from team to GerdP
Status: newassigned

This patch fixes the position of the vertical divider when the dialog is first displayed. Works fine until the dialog is resized so that window height is increased and the list of tags has a vertical scrollbar.
The increase is used for both parts of the panel equally, but it should first enlarge the panel with the scrollbar.

comment:7 Changed 4 months ago by GerdP

Summary: Conflit window completely hides relation 'conflicts' while doing a "Replace Geometry"[Patch]Conflit window completely hides relation 'conflicts' while doing a "Replace Geometry"

Changed 4 months ago by GerdP

Attachment: 12536.2.patch added

adjust divider also when resizing the popup

comment:8 Changed 4 months ago by GerdP

Oops. The patch disallows to move the divider manually :(
I think as of now AutoAdjustingSplitPane is not very useful. It assumes that the ratio of the heights/widths of the two panes is a constant, but with scroll bars and switches like "Show tags with conflicts only" this isn't true.

comment:9 Changed 4 months ago by skyper

Summary: [Patch]Conflit window completely hides relation 'conflicts' while doing a "Replace Geometry"[Patch] Conflict window completely hides relation 'conflicts' while doing a "Replace Geometry"

comment:10 Changed 3 months ago by GerdP

Resolution: fixed
Status: assignedclosed

In 17353/josm:

fix #12536: Conflict window completely hides relation 'conflicts' while doing a "Replace Geometry"

  • improve calculation of divider location

When resizing the dialog the refreshed result is still poor but I hope that's less annoying.

comment:11 Changed 3 months ago by GerdP

Milestone: 20.12

Modify Ticket

Change Properties
Set your email in Preferences
Action
as closed The owner will remain GerdP.
as The resolution will be set.
The resolution will be deleted.

Add Comment


E-mail address and name can be saved in the Preferences.

 
Note: See TracTickets for help on using tickets.