[PATCH] Geotagged images gone from the map view

[richlv]

Previously, geotagged images were shown on the map view as generic "photo" icons (with previews disabled).
With the latest version, they are gone, only the active image is shown. Enabling previews makes no difference.

In the image, two consecutive images are selected. Notice how only the active image is displayed.

[skyper]

Cannot reproduce. Your status report, please.

Relative:URL: ^/trunk
Repository:UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b
Last:Changed Date: 2021-03-14 18:17:35 +0100 (Sun, 14 Mar 2021)
Revision:17560
Build-Date:2021-03-14 17:21:03
URL:https://josm.openstreetmap.de/svn/trunk

Identification: JOSM/1.5 (17560 en) Linux Debian GNU/Linux 10 (buster)
Java version: 11.0.9.1+1-post-Debian-1deb10u2, Debian, OpenJDK 64-Bit Server VM

[richlv]

Sorry I missed the status report, had it open in another tab.

URL:https://josm.openstreetmap.de/svn/trunk
Repository:UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b
Last:Changed Date: 2021-03-14 18:17:35 +0100 (Sun, 14 Mar 2021)
Build-Date:2021-03-14 17:21:03
Revision:17560
Relative:URL: ^/trunk

Identification: JOSM/1.5 (17560 en_GB) Mac OS X 10.15.7
OS Build number: Mac OS X 10.15.7 (19H524)
Memory Usage: 902 MB / 1820 MB (564 MB allocated, but free)
Java version: 1.8.0_281-b09, Oracle Corporation, Java HotSpot(TM) 64-Bit Server VM
Look and Feel: com.apple.laf.AquaLookAndFeel
Screen: Display 69733382 1680×1050 (scaling 1.00×1.00)
Maximum Screen Size: 1680×1050
Best cursor sizes: 16×16→16×16, 32×32→32×32
VM arguments: [-Djnlp.application.href=https://josm.openstreetmap.de/download/josm.jnlp, -Djava.util.Arrays.useLegacyMergeSort=true, -Djnlp.tk=awt, -Djnlpx.jvm=<java.home>/bin/java, -Djnlpx.splashport=-1, -Djnlpx.home=<java.home>/bin, -Djnlpx.remove=false, -Djnlpx.offline=false, -Djnlpx.relaunch=true, -Djnlpx.session.data=/var/folders/nl/flqxqsmj5q963r7tcnfrdt3c0000gn/T/session2763496785039449722, -Djnlpx.heapsize=-1,2147483648, -Djava.security.policy=file:<java.home>/lib/security/javaws.policy, -DtrustProxy=true, -Djnlpx.origFilenameArg=/Users/richlv/Library/Application Support/Oracle/Java/Deployment/cache/6.0/56/1ee8cfb8-72e8e992, -Dsun.awt.warmup=true, -Djava.security.manager]

Plugins:
+ InfoMode (35543)
+ Mapillary (1.5.37.2)
+ PicLayer (2a9aa7a)
+ apache-commons (35524)
+ apache-http (35589)
+ ejml (35458)
+ geotools (35458)
+ imagery_offset_db (35640)
+ javafx-osx (35655)
+ jaxb (35543)
+ jna (35662)
+ jts (35458)
+ measurement (35640)
+ opendata (35640)
+ pbf (35720)
+ photo_geotagging (35715)
+ reverter (35688)
+ utilsplugin2 (35691)

Map paint styles:
+ /Users/richlv/Desktop/ChangeFontSize.mapcss
- https://josm.openstreetmap.de/josmfile?page=Styles/Coloured_Streets&zip=1

Last errors/warnings:
- 00013.866 W: Failed to load Mappaint styles from '/Users/richlv/Desktop/ChangeFontSize.mapcss'. Exception was: java.nio.file.NoSuchFileException: /Users/richlv/Desktop/ChangeFontSize.mapcss
- 00013.867 E: java.nio.file.NoSuchFileException: /Users/richlv/Desktop/ChangeFontSize.mapcss
- 00013.880 E: java.nio.file.NoSuchFileException: /Users/richlv/Desktop
- 00013.880 W: Initializing map style /Users/richlv/Desktop/ChangeFontSize.mapcss completed in 16 ms (1 errors, 0 warnings)

[skyper]

Thanks, could you please try without plugins?

[richlv]

Disabled all plugins, restarted JOSM, no difference.

[simon04]

I cannot reproduce: loading five geotagged images yields five camera icons on the map.

Relative:URL: ^/trunk
Repository:UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b
Last:Changed Date: 2021-03-14 18:17:35 +0100 (Sun, 14 Mar 2021)
Revision:17560
Build-Date:2021-03-14 17:21:03
URL:https://josm.openstreetmap.de/svn/trunk

Identification: JOSM/1.5 (17560 en) Mac OS X 10.16
OS Build number: macOS 11.2.3 (20D91)
Memory Usage: 219 MB / 2048 MB (79 MB allocated, but free)
Java version: 15.0.2+7, Azul Systems, Inc., OpenJDK 64-Bit Server VM
Look and Feel: com.formdev.flatlaf.FlatLightLaf
Screen: Display 1 1440×900 (scaling 2,00×2,00) Display 2 3008×1692 (scaling 2,00×2,00)
Maximum Screen Size: 3008×1692
Best cursor sizes: 16×16→16×16, 32×32→32×32

Your screenshot also shows a GPX layer? Are the images embedded in the file?

[richlv]

Yes, screenshot shows GPX (the coloured lines) + image layer.
Images are separate files, they are correlated to GPX.
They are missing both when imported via right clicking GPX -> "Import images", and when dragged into JOSM with GPX file open.

[richlv]

josm-snapshot-17458.jar - works
josm-snapshot-17460.jar - doesn't work

https://josm.openstreetmap.de/changeset/17460/josm explicitly mentions geoimages?
Although it seems to build on 17459.

[StephaneP]

I can reproduce. The behavior is changing, depending of the zoom. Very strange

[StephaneP]

correlation_bug

[taylor.smock]

Well, I feel stupid.

When I implemented getBBox in GpxImageEntry, I used getExifCoor instead of getPos (which is what the painting method uses). This meant that it worked so long as the image wasn't moved.

Anyway, have a patch.

[taylor.smock]

Use getPos instead of getExifCoor

[Don-vip]

In 17565/josm:

fix #20598 - see #20363 - Use getPos instead of getExifCoor (patch by taylor.smock)

[Don-vip]

Thanks!

[richlv]

Yay, thank you for the quick fix :)

[richlv]

Is josm-snapshot-17569.jar expected to contain the fix?
Trying it, still not seeing the image icons.

There's also a minor typo in the diff (comment) - "coorelated" -> "correlated".

[taylor.smock]

Replying to richlv:

Is josm-snapshot-17569.jar expected to contain the fix?
Trying it, still not seeing the image icons.

There's also a minor typo in the diff (comment) - "coorelated" -> "correlated".

I was looking at attachment:6B3faZO9Dv.mp4​ when I wrote the fix -- I assumed that the two problems were the same. Can you (richlv) attach some sample data?

[richlv]

Try this with Current.gpx to reproduce the problem

[richlv]

Try this with Current.gpx to reproduce the problem

[richlv]

Sure, please see "Current.gpx" and two images that go with it.
For correlation, please use "Timezone" of -5:00 and "Offset" of 455 (this is all a bit off, but should demonstrate the problem).

[taylor.smock]

Update the bucket with the new bbox

[taylor.smock]

Replying to richlv:

Sure, please see "Current.gpx" and two images that go with it.
For correlation, please use "Timezone" of -5:00 and "Offset" of 455 (this is all a bit off, but should demonstrate the problem).

Thanks for the images and GPX track. I've validated the fix (the first patch was still needed, but the new patch gets the remainder).

[Don-vip]

In 17574/josm:

fix #20598 - Update the bucket with the new bbox (patch by taylor.smock)

[Don-vip]

@richlv @StephaneP can you please test josm-latest (r17574)?

[richlv]

Hooray, it works as expected for me in 17574 - thank you :)

Sidenote - perhaps "Indicate that a entry has changed" -> "Indicate that an entry has changed"?

[richlv]

Works now :)

[Don-vip]

In 17577/josm:

see #20598 - javadoc

[Don-vip]

Three tests are failing:

 org.openstreetmap.josm.data.ImageDataTest.testWithNullData()
 org.openstreetmap.josm.gui.layer.geoimage.GeoImageLayerTest.testMergeFromIAE()
 org.openstreetmap.josm.gui.layer.geoimage.ImageEntryTest.testEqualsContract()

[StephaneP]

I just test with r17577 and it doesn't work correctly. The problem is still present.
@taylor.smock, do you need a new video?

It's easier to reproduce with a large time offset (more than 30 seconds)

[taylor.smock]

Replying to StephaneP:

I just test with r17577 and it doesn't work correctly. The problem is still present.
@taylor.smock, do you need a new video?

It's easier to reproduce with a large time offset (more than 30 seconds)

No -- I just needed more images so I'd have a better idea of what was going on. I've reproduced your issue in its totality (I think), and I've got a patch incoming as soon as I get the tests working again.

[taylor.smock]

Add method to indicate that a temporary copy has been updated, fix broken tests

[Don-vip]

In 17579/josm:

fix #20598 - Add method to indicate that a temporary copy has been updated, fix broken tests (patch by taylor.smock)

[Don-vip]

ImageEntryTest.testEqualsContract is still failing

[taylor.smock]

Replying to Don-vip:

ImageEntryTest.testEqualsContract is still failing

Sorry, I missed that one. Uploading patch.

[taylor.smock]

Fix ImageEntryTest.testEqualsContract

[Don-vip]

In 17580/josm:

fix #20598 - fix ImageEntryTest.testEqualsContract (patch by taylor.smock)

[Don-vip]

@richlv @StephaneP can you please check with r17580?

[StephaneP]

My short test with r17588 is successful.

[richlv]

Works OK for me with 17588, thank you so much for all the fixes :)

[Don-vip]

Thanks for feedback I'll release r17580 as hotfix. Simon is going all-in in technical changes in r17581+ ;)