source: josm

Fix last failing test in Java 21

• Generate Java 21 image files (probably from r19043: Drop COMPAT locale provider).
• Replace most deprecated function calls and classes in tests with non-deprecated functions.

See r19043: Drop COMPAT locale provider

The CLDR provider does not currently return the CET for GMT+01:00. Using only SPI
will result in the "correct" CET timezone abbreviation. If using both, CLDR wins
and returns GMT+01:00. In addition, there are locales that do not use the Western
Arabic numeral system. Specifically, Arabic uses the Eastern Arabic numeral
system, Persian uses the Urdu numeral system, and Marathi uses the Devanagari
numeral system. Of note, while the first character for the Eastern Arabic and
Urdu numeral systems looks the same, it is a different character.

Fix some wiremock tests -- wiremock no longer considers // to be a valid URI.

From history, it appears that this may have been a typo (any URL to //maps).

Revert most var changes from r19048, fix most new compile warnings and checkstyle issues

Also, document why various ErrorProne checks were originally disabled and fix
generic SonarLint issues.

Dependency updates

ivy.xml

• org.eclipse.parsson:parsson: 1.1.5 -> 1.1.6
• org.apache.commons:commons-compress: 1.25.0 -> 1.26.1
  • Note: This deprecated some functions
• ch.poole:OpeningHoursParser: 0.28.1 -> 0.28.2
• org.jacoco:org.jacoco.ant: 0.8.11 -> 0.8.12
• com.github.spotbugs:spotbugs-annotations: 4.8.3 -> 4.8.4
• com.github.tomakehurst:wiremock: 2.35.0 -> 3.0.1
• io.github.classgraph:classgraph: 4.8.165 -> 4.8.171
• nl.jqno.equalsverifier:equalsverifier: 3.15.6 -> 3.16.1
• org.awaitility:awaitility: 4.2.0 -> 4.2.1

tools/ivy.xml

• com.puppycrawl.tools:checkstyle: 9.3 -> 10.15.0
• com.github.spotbugs:spotbugs: 4.8.3 -> 4.8.4
• com.google.errorprone: 2.(10.0|24.1) -> 2.26.1
• net.sourceforge.pmd:pmd was not updated to 7.0.0 due to a significant number of false positives.

There were some additional changes to cleanup new warnings and remove some
additional Java 8 files. There are more warnings that need to be cleaned up.

typo in javadoc, see #23627

switch build-xml to java 11 and drop java 9 support, see #17858

fix #23625 - allow - sign in keys

add gpl to ant build, see #23552

checkstyle

See #23600: Native Apple Silicon Support

Add entitlements so that the app can start.

fix #9304: fix #9304: in validator, check for intersecting roads in different layers

• exclude highway areas with layer != 0 from test
• add one more test case with a bridge that is split (code coverage)

See #21533: Native Apple Silicon Support

Try to fix code signatures for merged binaries (again).

Fix #21533, see #23600: Native Apple Silicon Support

When building on macOS, the macos-jpackage.sh script now takes two arguments:

1. The JOSM revision
2. An additional JDK to build against (this should be of a different architecture)

If an additional JDK is specified, it is assumed that it is a different
architecture, and the two built apps are combined using lipo for a universal binary.

ant.yml does have some changes to make it easier to debug packaging issues in
PRs; the PR does still need to upload the specific package and add its branch to
the triggers.

fix #23596: name=Bâtiment (French for "building"), especially on buildings, is suspicious and worth flagging by validator

Fix #23350: Add amenity=bicycle_wash as a preset (patch by mcliquid)

The proposal (​osmwiki:Proposal:Bicycle_Wash) was approved on 2023-12-18.

Fix #23550: Error when deserializing PBF Blog (patch by giora.kosoi, modified)

Modifications are as follows:

• Added non-regression test
• Removed unnecessary changes in Blob

see #23305 and #23555:
-revert most of the changes in r18988, it caused too many problems with plugins which relied on the old behaviour

see #23482: optimize the space in the history view (column width) and consider adding line wrapping

• avoid misaligned tables caused by invisible fields (in many but not all cases)

See #17858/#23564: Update Java versions in Linux start scripts

Additions:

• Java 19-20 (EOL, added for completeness)
• Java 21 (preferred LTS)
• Java 22 (latest Java version)
• Java 23 (next Java version)

Removals:

• Java 8, 9, and 10: We no longer support Java < 11.

Fix #23540: When a Linux distribution removes the Bing png from JMapViewer, JOSM hangs when loading a Bing imagery layer

This is due to an interaction between JOSM preferences, the ValidatorDialog, and
the cached Bing imagery layer.

The specific interaction that leads to the freeze is as follows:

1. User starts process of adding a Bing imagery layer to JOSM
2. In the EDT we call a synchronized method in MainLayerManager
3. In the EDT we block on a separate thread that is fetching the Bing attribution data
4. In the separate thread, we attempt to set cache information in preferences
5. Setting the preference fires a preference change event
6. One of the listeners, specifically ValidatorDialog, then calls another synchronized method in MainLayerManager

Steps 2 and 6 are the problem points. This patch fixes that by only
attempting to perform the update by only listening to a specific preference,
instead of all of them.

The alternative to this patch uses Config#addKeyPreferenceChangeListener
instead. This was not done since ToggleDialog is already listening to all
preference changes.

fix #23527: Memory leak in relation editor

• add new method wouldRelationBeUseful() in IRelationEditorActionAccess which doesn't call the problematic method getChangedRelation() to evaluate whether a relation would be useful if saved.
• add comments and code in unit test for the method that shows how to handle the result of getChangedRelation() in case it is not needed any longer to avoid the memory leak.

Fix #23437: Offer to reset JOSM if JOSM fails to finish startup multiple times

remove TLD from IANA

Fix an issue with custom OAuth2 parameters where the custom parameters would be replaced by default parameters

fix #22814: Command stack shows "Set 1 tags for 0 objects"

• add check to avoid a no-change-command on the undo/redo stack

see #23514: add @Territories annotation

see #23305: correct @since xxx

fix #23519: Don't automatically enlarge "Validation Results" panel

• implement new preference validator.force.unfurl.window with default value true, if set to false the window is not unfurled
• code cleanup to remove duplicate or obsolete code

See #23355: Don't store stop answers for startup sanity check

see #23506, see #23408 - readd the bracket lost in last checkin

fix #23506, see #23408 - fix the save/upload layer preconditions - neither the original, nor the #23408 variant makes real sense

See #23485/r18989: Fix broken tests

The tests just needed to have a category set.

Fix #23472: Decrease cost of Geometry#polygonIntersectionResult (specifically for geometry.mapcss)

When profiling the validator with an overpass download of Mesa County, Colorado,
~50% of the total CPU time are taken up by Geometry#polygonIntersectionResult.

Specifically (inside the function), the improvements for this patch are as follows:

• CPU cycles: -95.7%
• Memory allocations: -97.9%

When taken as a whole, the total time taken by the validator was reduced by ~75%.

fix #23305: conflict detection not working for combine way with one null and one tag set
(23305-alt.patch)

• adds code to check if a conflict exists where one or more tagged ways don't have the same tag value and - if so - show the conflict dialog.
• adds a preference combine-conflict-precise . If set to false the old behaviour is restored.
• changes the preference for the non-expert relation member ship warning popup from combine_tags to combine_relation_member, so that both dialogs have separate settings

See #23355: Sanity check JVM arguments on startup

Change the icon for Continue and be a more lenient when comparing expected JVM
arguments against actual JVM arguments.

This additionally updates the Eclipse launch files.

see #17035: enable counter that shows "{0} of {1} elements done" for the tested OSM elements also in TagChecker

See #23471: Temporarily disable fast sorting

Fix #23290: Improve region check messages and run region checks when informational warnings are disabled

See #23468: Improve performance in the validator tree window

Add missing - character.

fix #20424, fix #20425: Duplicate relations not detected with incomplete members, Duplicate Relation test is too lazy/too aggressive

• add code to compare just members so that it doesn't matter if they are complete
• change original test which compares geometry to use a list instead of a set to store members. That means that the order of members is taken into account as well as duplicated members
• before comparing tags only the "discardable" tag keys are removed, previously all "uninteresting" keys were removed, so fixme=* or note=* was ignored
• if two relations have the same members in the same order but different tags the new message informational message "Identical members" is produced.

Fix #23465: Remove custom checkstyle plugin

TopLevelJavadocCheck.java is duplicating functionality from MissingJavadocType.
Our custom class is from #14794 (closed 2017-10-16). The check that makes it
redundant was added in checkstyle 8.20 (released 2019-04-28).

This adds the missing javadocs for the more comprehensive checkstyle version.

See #23465: Add additional javadoc comments

This also fixes some sonarlint issues

remove TLD from IANA

fix #23447:Fatal "crash" attempting to delete all "Outer" members & then multipolygon

• revert changes from r18967
• simply close relation editor dialog for the already deleted relation instead of generating an additional delete command

See #23290: Add missing regions attributes to text, combo and multiselect

simonpoole (Vespucci dev) pointed out that we were using regions for those
attributes on but did not have them documented in the xsd.

fix #23440: Validation results may not be refreshed on upload
The patch checks if the validator dialog is already showing. If yes, it is always updated.
An empty dialog is only suppressed when there was no dialog showing and there are no errors and the validation was triggered by the upload action.

see #23397: Improve the results of partial validations

• don't call endTest() in static method CrossingWays.isSelfCrossing(), this fixes the failing unit test AlignInCircleActionTest

fix #23397: Improve the results of partial validations

• pass also parent ways and relations of uploaded/selected objects to the testers, child objects are already added, this allows to find e.g. overlapping polygons problems with tags in members of relations
• let CrossingWays find a problem if at least one of the crossing ways is in the partial selection.
• let DuplicatWays find a problem if at least one of the duplicated ways is in the partial selection
• add code to filter the detected issues so that those issues which are clearly not related to the original list of objects are removed. A few issues from mapcss tests may remain.
• add new preference validator.partial.add.parents to disable the addition of parent objects, default is enabled
• add new preference validator.partial.removeIrrelevant to disable the filtering of irrelevant errors, default is enabled
• duplicated code to call AggregatePrimitivesVisitor was moved to ValidationTask

Fix #23418: Improve unit test consistency when run with non-English locales

This also fixes some tests that fail when run individually.