source: josm

i18n updates

Fix #23600: Replace macos-14 with macos-latest in GitHub actions for building mac release files

GitHub macos-latest is now equivalent to macos-14.

Fix tests broken by r19152

Fix #23821: Ensure that a new layer is loaded prior to loading additional data to that layer

This occurred due to a race condition, whereby the /load_and_zoom call would
return immediately prior to the download finishing for the new layer and the
next /load_and_zoom call merging onto a pre-existing layer.

This could be fixed in one of two different ways:

1. Block the RemoteControl thread
2. Have some method for ensuring that a new layer is loaded first

While we are effectively doing (1), it was easier to do (2) as well for testing
purposes. This means the RemoteControl thread could spin off a thread for each
request to /load_and_zoom and this particular issue should not reappear.

This does not control for cases where a user calls /load_and_zoom like so:

1. new_layer=true + layer_name=first
2. new_layer=true + layer_name=second
3. new_layer=false + layer_name=first
4. new_layer=false + layer_name=second

Both (1) and (2) will complete before (3) and (4) are run. However, both (3) and
(4) will be loaded into the last layer loaded.

adapt message, patch by Famlam, see #23621

Bump error prone from 2.29.0 to 2.29.1

This fixes an issue where the PBF plugin would fail to build.
For additional details, see ​https://github.com/google/error-prone/issues/4475 .

fix #23392: JOSM doesn't work well when not maximized

• use SwingUtilities.invokeLater() for the AlignImageryPanel

Fix #23721: Application hangs indefinitely if Bing API unavailable

This adds a progress monitor that the user can cancel if Bing attribution doesn't
load quickly enough. This additionally removes the need for Thread.sleep calls
by using a timer thread.

This requires an update to the JMapViewer dependency.

Fix #23804: xdg-open can return a 0 exit code when a browser doesn't open

This is alleviated by switching the default order of browser.unix to be
#DESTKOP then xdg-open. #DESKTOP is our magic value for using built-in
Java methods for opening a browser.

It appears that there is a race condition somewhere for the Brave browser.
I suspect that the process returned by the Runtime.exec and xdg-open isn't
actually complete when it says it is, and so the process is cleaned up prior to
Brave actually launching.

See #23804: Try to detect common failures with OpenBrowser.displayUrl

In #23804, the user indicated that the web browser did not open, so they were
unable to go through the automatic authentication flow. This attempts to work
around that problem by detecting caught exceptions and showing the user a dialog
that will allow them to copy the authorization URL.

PMD and checkstyle fixes

add iD and Rapid to editor sync

fix #23754: JOSM fails to upload exactly 30000 changes in chunks of 10000

• don't compare collection sizes() because they are changed in different situations

See #23727, #23748: Re-enable Map.ofEntries for Utils#toUnmodifiableMap

This restores the behavior that was present prior to r19101 without reflection.

In r19100 and earlier, the NPE was caught and rethrown as a reflection exception.
At this point, we then returned a Collections.unmodifiableMap object.

See #23785: Log when an imagery layer is removed due to validity reasons

add Check for trees that are too big, patch by gaben, fix #23621

see #23738 comment:26

• make Cancel button work when using "Upload each object individually"

see #23748: NPE: Reverse way direction: Automatic tag correction

• add null value in unit test

fix #23728: First geotagged image not fully selected

• remove code in GeoImageLayer constructor which more or less randomly opens the ImageViewerDialog
• fix layer actions "Jump to next marker" and "Jump to previous marker" so that they open or update the image viewer dialog
• new code to check if a new geoimage layer was added by any open file or drag/drop action and - if so - to open the first image of the topmost new geoimage layer. If ImageViewerDialog is already open a new tab is added.

See #17858: Replace most calls to StandardCharsets.UTF_8.name() with StandardCharsets.UTF_8

This (in many cases) also removes catches for UnsupportedEncodingException.

fix #23735: Combine ways refused
(patch 23735-2.patch)

• rewrite check so that it checks if the parents of the combined ways are known instead of the parents of the connection node(s)
• show dialog with hint about download parents action that allows to continue

TODO: implement full automatic download of parents in all relavant action or add download button in the common dialog.

Fix #23743: MinimapDialogTest was failing

This does two things:

1. Remove hack that is no longer necessary with wiremock 3.6.0
2. Create a copy of the layer list

Fix some checkstyle issues

Update PMD to 7.2.0

A bunch of rules were deprecated and replaced and the XPath expressions had to be updated from XPath 1 to XPath 3.

remove TLD from IANA

See #17858: Remove old workarounds for javabugs and update Utils#getLatestVersion

• JDK-8180379: Fixed in Java 9+
• JDK-8251377: Fixed in Java 11.0.14 (2021-09-02)
• JDK-8262085: Fixed in Java 11.0.17 (2022-07-19)

Replace most calls for getNodes in VectorWay with direct calls to underlying list

This is primarily to avoid new unmodifiable collection instantiations where we
don't need a copy of the list. This significantly reduces the cost of the
post-processing merge ways step. Specifically, there is a 55% drop in the memory
cost, and 90% fewer CPU cycles.

Explain what to do

Cleanup some new PMD warnings from PMD 7.x (followup of r19101)

Cleanup some new PMD warnings from PMD 7.x

I haven't updated to PMD 7.x in ivy/maven yet since I still have 83 PMD violations
to go through, and I don't know (yet) if any of them were supposed to be ignored
by the xpath expressions in tools/pmd/josm-ruleset.xml.

I may re-enable some of the PMD checks I've temporarily disabled prior to committing
the update for PMD.

Additionally cleanup some SonarLint issues in the modified files.

Fix #23717: Manual OAuth 2 authorization was not working

Fix #8269: Add initial maven pom files

This additionally deletes most IDE specific configuration, in favor of Maven
configuration.

We did have to update scripts/BuildProjectionDefinitions.java so that it would
create an empty EPSG file for the next run in the pom.xml file.

For core, we needed two additional pom.xml files:

• A parent pom with most dependency information (for inheritance)
  • This will make it easier to keep core and the apache-commons plugin in sync
• A unit test pom (for plugin tests)
  • Some IDEs (netbeans specifically) don't like this.

What this does not do:

• Convert from ivy to maven for dependency management in core. This should happen eventually with maven-resolver-ant-tasks (probably with the next dependency update).
• Deprecate the current ant scripts.

Fix #23707: Remove basic auth for openstreetmap.org

This does the following:

• On startup, if the current API is set to the default OSM API url, osm-server.{auth-method|username|password} are set to null, clearing them

from the saved preferences.xml file.

• In preferences, if the OSM API is set to the default OSM API url, the basic auth radio button is disabled (if it is not currently selected or the current auth method). This is done since some users contribute to both OSM and some other project, which may still support basic authentication.

typo

i18n updates

see #23621 - add unit conversion for length values

Hmm, am I the only one who finds junit output very confusing?

Fix #23687: Freeze when opening Add Tag dialog

This occurs when the following are true:

• The EDT is in a blocking dialog where a DataSet write lock is held
• The EDT decides to repaint the mapview
• The style caching occurs on a different thread

Why is this a problem?
The style caching waits for a read lock in a different thread, which will never
happen since the EDT has a write lock. The try-catch block that checks to see if
the current thread can get a read lock does not work on a thread that already has
a write lock, since that thread will always be able to obtain a read lock.

There are two solutions to this:

1. Change the style caching code such that it times out after some period of time and then retries in the EDT (to avoid recurrent timeouts)
2. Change TagEditHelper such that the blocking dialog is not in a block which holds a DataSet write lock

Option 2 is better, since it fixes the root cause; option 1 may need to be done
in the future, if only to allow for bug reports.

fix text

Fix backbard typo (patch by gaben)

See #23671: Significantly improve performance of Utils.isBlank and Utils.isStripEmpty along with reducing intern cost when loading files

From Utils, isBlank and isStripEmpty are functionally similar; both take a
string and check for the same whitespace characters. Specifically, the code flow
for isBlank calls strip, which uses DEFAULT_STRIP as additional characters
to remove. strip eventually calls isStrippedChar to determine whether or not
to keep a character. isStrippedChar checks DEFAULT_STRIP always, so the
returns from Utils.isBlank and Utils.isStripEmpty should always be the same.

Since the two functions are the same, we change isBlank to point at
isStripEmpty, and isStripEmpty now calls String.isBlank prior to checking
every character. String.isBlank is a built-in method, and is thus more likely
to be well-optimized by the JVM. In the event that it returns false, we want to
avoid any additional work, so we use a traditional for loop instead of a stream;
we will usually know within a character or two whether or not the string is empty.
With a stream, we first have to construct the stream, then iterate through it.

In AbstractReader, we create a map of strings to interned strings to avoid
calling String.intern too often -- despite being something we want to do fairly
frequently. Part of the (current) problem with String.intern is that it uses a
ConcurrentHashTable, so it "costs" more to use. The HashMap (even with the
cost of the lambdas) is ~25% of the CPU cost of interning, given sufficiently
duplicated data.

Fix #23666: commons-io dependency not included in ivy.xml

This removes all imports of org.apache.commons.io classes and replaces them with
similar functionality.

Fix #23628: Decrease cost of ImageWarp#warp

This decreases overall memory allocations for ImageWarp#warp by ~80% and
decreases GC by ~80%.

This does not decrease the direct CPU cost of ImageWarp#warp.

see #17858 - Java 8 → 11

fix pmd

fix mime type

i18n updates

see #21881 Add a check for loops in directional waterways
Fix code in WaySegment and IWaySegment

• change text in Exception to "Node pair is not a single segment of the way!" and move it to constant IWaySegment.NOT_A_SEGMENT
• fix error in WaySegment.forNodePair and IWaySegment.forNodePair
• add unit test for further invalid node pairs

see #21881: revert unintended change for different ticket

Fix #23643: Move to supported actions for GitHub ant workflow to remove node16 deprecation warnings