source: josm

see #23228 - i18n update

Fix #23209: Add generator:type=boiler (patch by gaben)

remove hardcoded plugin Java versions, see #23218

Fix icon viewboxes

See #23218: Update proguard to 7.4.0-beta02 for Java 21 support

add some important tags

See #16567: Update to JUnit 5

This removes new JOSMTestRules() with no additional setup and most
JOSMFixture calls.

Removing the bare JOSMTestRules speeds up the test suite since there are two
fewer System.gc() calls per test.

Fix #23203: Simplify Way dialog can cause a deadlock

This is caused by a write lock being acquired in SimplifyWayAction.actionPerformed
in the EDT and then a read lock is attempted to be acquired in a styled-map-renderer
thread. The styled-map-renderer thread is waited on by the EDT, which causes the
deadlock. The fix is removing the dataset write lock in SimplifyWayAction.actionPerformed
which was added back in 2011. An analysis of the code shows that the commands generated
lock the dataset themselves, so the dataset lock in SimplifyWayAction.actionPerformed
should no longer be necessary.

The deadlock does not happen reliably with only the JOSM default paintstyle; adding
additional paintstyles was required for the initial analysis.

Fix #16485: Modal dialogs may occasionally be behind another dialog

From the ​Modality javadocs:

• keeps its Z-order below the modal dialog that blocks it

Warning! Some window managers allow users to change the window Z-order in an arbitrary way — in that case the last requirement may not be met.

The workaround is to set the blocking dialog as always on top.

Fix #23212: Overpass query wizard should transform key: to ["key"] instead of [~"key"~""]

This is fixed by using ExactKeyValue instead of KeyValue for key: queries.
As a happy side effect, this significantly reduces the cost of key: queries.
In a test area ("Mesa County, Colorado"), this reduces the cpu time from 2600ms
to 200ms and reduces memory allocations from 425mb to effectively 0 for a name:
query.

In addition, this simplifies many equals methods by converting the following
pattern to Objects.equals(first, second):

if (first == null) {
    if (second != null) {
        return true;
    }
} else if (!first.equals(second))
    return false;
return true;

There are some additional changes, mostly related to documentation and lint
issues.

Fix #23189: Conflict tag tables should resize with the conflict window

Fix #23184: Add/ignore popular tags

Add

• generator:solar:tracking: See ​osmwiki:Key:generator:solar:tracking
• natural=earth_bank: See ​osmwiki:Tag:natural=earth_bank
  • Icon drawn by taylor.smock
• highway=busway: See ​osmwiki:Tag:highway=busway
  • Icon from merging way_residential.svg and bus.svg
• school:gender: See ​osmwiki:Key:school:gender
• craft=electronics_repair: See ​osmwiki:Tag:electronics_repair
  • Icon drawn by taylor.smock
• place=municipality: See ​osmwiki:Tag:place=municipality
  • municipality.svg is largely copied from city.svg, color modified

Ignore

• check_date:?*: Used by surveying applications (fix #23182)
• boundary=religious_administration: Not well documented

Replace

• landuse=reservoir: Deprecated by ​osmwiki:Proposal:Reservoir_(2020) and replaced by ​osmwiki:water=reservoir (fix #23185)
  • tailings_pond.svg is a modified reservoir.svg icon; ​osmwiki:Tag:man_made=tailings_pond is a replacement for landuse=reservoir + reservoir_type=tailings.

This additionally fixes an issue discovered by gaben in #23183, whereby
values_from="java.util.Locale#getISOCountries" could have some values
translated. This was fixed by adding a values_context attribute; in this case,
I used "country codes".

Fix #23183: Add country and target to office=diplomatic

country is needed to indicate which country the diplomatic office belongs
to, and target is needed for the cases where a diplomatic office is outside
the country the embassy owner is communicating with.

Fix #23179: Include changeset in note comment if feasible (patch by qeef, modified)

Modifications are as follows:

• Unit tests
• Better note matching
• Find multiple changesets referring the same note

Fix #23057: An invisible layer should not become active when removing a layer

Fix #22134: Only show cycle dashes on one side of roundabout

Fix #17052: Allow plugins to save state to session file

The primary feature request was for the TODO plugin to save the list elements for
a future session.

This allows plugins to register via ServiceLoader classes which need to be
called to save or restore their state.

In addition, this fixes an ordering issue with tests whereby the OsmApi cache
would be cleared, but the FakeOsmApi class would not recache itself when called.

Fix #23112: Expand visibility of some objects and methods in JCSCachedTileLoaderJob for plugin subclasses

Fix #16998: Add parent_osm_primitives and convert_primitives_to_string

See #23165: Use test file with smaller (Integer.MAX_VALUE) changeset id

Fix #23169: NPE when running validator with no validations enabled

Improve performance for TaggingPresetSelector$PresetClassifications.getMatchingPresets

This was found when profiling with the Name Suggestion Index enabled.

The improvements are as follows:

• ~80% reduction in CPU usage
• ~85% reduction in memory allocations

A good chunk of the remaining cpu cycles and memory allocations is from the sort
operation.

Non-performance related changes are as follows:

• Add documentation
• Lint fixes

Fix #23140: RejectedExecutionException when MultiFetchServerObjectReader is cancelled while creating download jobs

This was caused by a race condition.
User starts a download, and cancels it as jobs are submitted to the thread pool.
The next job to be submitted will cause a RejectedExecutionException. In order
to fix this, we ensure that we shutdown the thread pool inside a synchronized
block, and add jobs to the executor inside a synchronized block.

See #22652, r18817: Stop parsing gpx files when point elements have invalid coordinates

This adds back the wpt check that was temporarily removed in r18818 to get back
to the previous "known good" state and additionally adds checks for rtept and
trkpt elements.

This also removes a change to build.xml that was accidentally committed in r18818.
The specific change (adding Automatic-Module-Name to the JOSM manifest) will
probably be done in a separate commit in the future.

Fix #22652: Stop parsing gpx files when wpt elements do not have valid coordinates

This does move the parsing code out of GpxReader into GpxParser and refactors it
so that it is (hopefully) easier to understand and debug.

Improve paste behavior of large amounts of data

Both SelectionListDialog and MapStatus can use the consolidated events, which
drastically reduces the amount of time spent pasting large amounts of data. This
reduces the time spent in their listener methods by >99%.

The test paste of 41k objects took ~20s after the change and ~80s prior to the change.

A good chunk of the remaining time spent pasting is from checking to see whether
an upload is needed. Fixing that will take a lot more work, since there is
currently no concept of consolidated events for that specific listener type.

This was found while investigating #4145.

See #22832: Don't quote $JPACKAGEOPTIONS

Fix #23124: Azul Java 17.0.4.1 will cause a NumberFormatException

Java can have multiple dots instead of just two. Specifically, the Java version
specifier is $MAJOR.$MINOR.$SECURITY.$PATCH.

Previously, we assumed that there would only ever be two dots in the version
specifier, and got the first and last dot. Now we get the first and second dot.

In addition, this fixes some lint issues.

See #23125: Prefer notarytool if it is available; fall back to altool if it is not

The altool notarization process will stop working in the next few months, so we
need to switch to notarytool.

For now, we will try to use notarytool, and if I messed up the command line,
it should fall back to altool.

Allow importing geojson files that were saved to a session file

• GeoJSONImporter now extends OsmImporter instead of FileImporter and deprecates the parseDataSet(String) method.

Fix #23117: NPE in PlaceSelection$NamedResultTableModel

This occurs when (a) search results are returned and then (b) the user searches
for more results, but nominatim returns garbage.

In addition, this also fixes some lint issues.

remove TLD from IANA

Fix #22832: Code cleanup and some simplification, documentation fixes (patch by gaben)

There should not be any functional changes in this patch; it is intended to do
the following:

• Simplify and cleanup code (example: Arrays.asList(item) -> Collections.singletonList(item))
• Fix typos in documentation (which also corrects the documentation to match what actually happens, in some cases)

See r18798: Actually use the @Territories annotation

This also fixes some tests that fail with specific options, but were passing due
to run order.

Fix #21364: GPX export of image new position use old coordinates

This was due to not clearing cached data (done for performance reasons)

Fix #23095: Missing space after name template output (patch by matthijs)

Fix #23091: Opening a preset from inside a relation editor causes a DataIntegrityProblemException

remove TLD from IANA

i18n update

separate NmeaParser from NmeaReader

remove TLD from IANA

Fix #23081: NoSuchElementException in ConflictDialog.ResolveToAction#actionPerformed

This occurs when one of the Resolve to (my|their) versions actions is called
when no conflict is selected.

There are two distinct bugs:

• isConflictSelected did not check to make certain that the selection index made sense
• ResolveActions were not enabled/disabled when the popup menu became visible, depending upon whether the current selection was valid

Fix #23023: Fix logic for enabling buttons in color preferences (patch by Larsossum)

This makes the buttons work properly with the filterfield.

Fix #23078: Improve cancel action on OSM API errors (patch by gaben, heavily modified)

Reduce allocations during startup from Shape

Shape#hashCode made between 8 and 24 MB of allocations at startup. This was
reduced by moving the math out of Arrays#hash and the default List#hash methods.
This additionally reduced the allocations from the Shape#equals method.

As an implementation note, the Shape#hashCode method returns exactly the same
hashcode as it did prior to this change. This may change in the future.

Fix #23049: Informational errors cause validator dialog to occur on upload, even if they are not enabled

See #22990: synchronize jakarta.json versions in ivy.xml

Fix #23022: Application name on macOS 12 is MainApplication

Fix #22569: Add beauty multiselect key to shop=beauty preset (patch by jose1711)

Fix #23015, see #2483: Right click (map move) + scale/rotate modes should not interfere with each other

The workaround added for #2483 (r1634, Java 5) does not appear to be needed
anymore (tested with a Magic Mouse in one-button mode under Java 8). Removing
the workaround fixes the behavior whereby a right-click will cause the
scale/rotate mode to be enabled.

To fix extraneous commands being generated during a map pan when scale/rotate
mode is enabled, we check to see if the right mouse button is down in
updateCommandWhileDragging.