[PATCH] Extract necessary method for QuadBuckets into separate interface

[taylor.smock]

Use cases:

• Various layer users can implement IQuadBucketType on their respective methods
  • Notes (so that the Bounds passed into paint can be used) -- not really a speed up here, but depends upon note coverage
  • Geotagged images (Mapillary/Streetside/OKV, for example)

Notes: I don't think I missed any files for this, but my JOSM work directory is kind of messy right now (see #16567 16567.initial_extensions.3.patch)

[Don-vip]

It doesn't compile:

compile:
    [javac] Compiling 44 source files to C:\SVN\josm\core\build
    [javac] C:\SVN\josm\core\src\org\openstreetmap\josm\gui\preferences\PreferenceTabbedPane.java:59: warning: [deprecation] MapPreference in org.openstreetmap.josm.gui.preferences.map has been deprecated
    [javac] import org.openstreetmap.josm.gui.preferences.map.MapPreference;
    [javac]                                                  ^
    [javac] C:\SVN\josm\core\src\org\openstreetmap\josm\data\ImageData.java:46: error: type argument ImageEntry is not within bounds of type-variable T
    [javac]     QuadBuckets<ImageEntry> geoImages = new QuadBuckets<>();
    [javac]                 ^
    [javac]   where T is a type-variable:
    [javac]     T extends IQuadBucketType declared in class QuadBuckets
    [javac] C:\SVN\josm\core\src\org\openstreetmap\josm\data\ImageData.java:46: error: incompatible types: cannot infer type arguments for QuadBuckets<>
    [javac]     QuadBuckets<ImageEntry> geoImages = new QuadBuckets<>();
    [javac]                                                        ^
    [javac]     reason: inference variable T has incompatible bounds
    [javac]       equality constraints: ImageEntry
    [javac]       upper bounds: IQuadBucketType
    [javac]   where T is a type-variable:
    [javac]     T extends IQuadBucketType declared in class QuadBuckets
    [javac] 2 errors
    [javac] 1 warning

[taylor.smock]

Replying to Don-vip:
I was intending to apply the patch to a different tree before someone else looked at it, just to check and make certain that I wasn't missing anything, but you looked at it before I did. I need to find a better way to keep patchsets separate. I also should have marked it as WIP, since I thought I had probably missed a file.

Anyway, I'll upload a new patch.

[taylor.smock]

Initial implementation

[Don-vip]

In 17459/josm:

fix #20363 - Extract necessary method for QuadBuckets into separate interface (patch by taylor.smock, modified)

[taylor.smock]

Thanks. I'll get an updated version of the Mapillary plugin out sometime today (I am using QuadBuckets there already, so I need to recompile for this patch).

[Don-vip]

In 17460/josm:

see #20363 - fix NPE

[Stereo]

It crashes on startup for me?

java.lang.NoSuchMethodError: 'boolean org.openstreetmap.josm.data.osm.QuadBuckets.add(org.openstreetmap.josm.data.osm.IPrimitive)'
	at org.openstreetmap.josm.data.osm.QuadBucketPrimitiveStore.addPrimitive(QuadBucketPrimitiveStore.java:107)
	at org.openstreetmap.josm.data.osm.DataSet.lambda$addPrimitive$5(DataSet.java:504)
	at org.openstreetmap.josm.data.osm.DataSet.update(DataSet.java:960)
	at org.openstreetmap.josm.data.osm.DataSet.addPrimitive(DataSet.java:495)
	at org.openstreetmap.josm.io.AbstractReader.processNodesAfterParsing(AbstractReader.java:141)
	at org.openstreetmap.josm.io.AbstractReader.prepareDataSet(AbstractReader.java:265)
	at org.openstreetmap.josm.io.AbstractReader.doParseDataSet(AbstractReader.java:310)
	at org.openstreetmap.josm.io.OsmReader.doParseDataSet(OsmReader.java:488)
	at org.openstreetmap.josm.io.OsmReader.parseDataSet(OsmReader.java:538)
	at org.openstreetmap.josm.io.OsmReader.parseDataSet(OsmReader.java:521)
	at org.openstreetmap.josm.tools.Territories.initializeInternalData(Territories.java:137)
	at org.openstreetmap.josm.tools.Territories.initialize(Territories.java:123)
	at org.openstreetmap.josm.gui.MainInitialization.lambda$beforeInitializationTasks$4(MainInitialization.java:85)
	at org.openstreetmap.josm.spi.lifecycle.InitializationTask.call(InitializationTask.java:33)
	at org.openstreetmap.josm.spi.lifecycle.Lifecycle.runInitializationTasks(Lifecycle.java:99)
	at org.openstreetmap.josm.spi.lifecycle.Lifecycle.initialize(Lifecycle.java:71)
	at org.openstreetmap.josm.gui.MainApplication.mainJOSM(MainApplication.java:920)
	at org.openstreetmap.josm.gui.MainApplication$3.processArguments(MainApplication.java:278)
	at org.openstreetmap.josm.gui.MainApplication.main(MainApplication.java:715)

[taylor.smock]

Replying to Stereo:
Question: Are you running a release from the JOSM website or a locally built version? If the latter, please run ant clean dist. Otherwise, which version are you running from the JOSM website? josm-latest.jar I would presume.

[Stereo]

Indeed, ant dist was all it took. Thank you!

[Don-vip]

Possible regression: #20598

[Don-vip]

In 17565/josm:

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