source: josm

i18n update

Fix #23309: NPE in GeoPropertyIndex$GPLevel.getBounded when called by Territories.getRegionalTaginfoUrls

Territories.getRegionalTaginfoUrls uses Collection.parallelStream
which could cause the following race conditions:

• children is reinitialized after the null check, potentially causing an NPE due to a different null check becoming false after it was checked. Solution: either synchronize the creation of children or have a local variable.
• Two threads could generate a child and then generate children of children, creating a split tree hierarchy, only one of which would be kept. Solution: synchronize the creation of the child nodes

For both of the new synchronized methods, we could use a safe double-lock
idiom if there ends up being performance issues. This probably won't be the case.
Profiling JOSM start to end with Mesa County, CO (+ validations) did not show
that the modified methods were "hot".

This additionally fixes some lint issues and converts some package-private
methods to use ILatLon instead of LatLon.

remove TLD from IANA

combine two loops (remove sonar warning)

Add/Ignore popular tags

Add

• informal=no -- this appears to be used for trails that appear to be informal=yes but are not.
• highway=trailhead
  • Icon drawn by taylor.smock
• amenity=letterbox
  • Additionally adds post:* tags, copied from addr:* tags
  • Icon drawn by taylor.smock; a better icon would be much appreciated
• building=stadium -- added as a checkbox to leisure=stadium and the default building preset

Ignore

• building=no -- this is already covered in unnecessary.mapcss

Fix #23057: data layers should be selected next, not non-data layers (patch by gaben, modified)

Modifications are as follows:

• Fix test pollution uncovered by change in non-obvious determinate order of tests
• Fix code so that MainLayerManagerTest.testRemoveLayerUnsetsActiveLayer passes

Fix #16567: Upgrade to JUnit 5

JOSMTestRules and JOSMTestFixture can reset the default JOSM profile, which can
be unexpected for new contributors. This updates all tests to use JUnit 5 and
the new JUnit 5 annotations.

This also renames MapCSSStyleSourceFilterTest to MapCSSStyleSourceFilterPerformanceTest
to match the naming convention for performance tests and fixes some lint issues.

This was tested by running all tests individually and together.

Fix #23256: AbstractPrimitive::putAll not updating values (patch by marcello)

See #17858: Add Java 17 as an option for the Java version in deb packages

By depending upon default-jre with a version specification, we can avoid
hardcoding many specific Java JREs versions via |. Instead, we just indicate
that the default-jre must be >= 17 or the currently installed version must be
Java 8 compatible. This will change on 2023-12-31 when Java 8 support is dropped.
See #17858 for details.

This was verified via the following in an Ubuntu 23.04 container:

1. curl -O https://josm.openstreetmap.de/apt/pool/universe/j/josm-latest/josm-latest_1.5.svn18887_all.deb
2. ar x josm-latest_1.5.svn18887_all.deb control.tar.xz
3. tar xf control.tar.xz control
4. Edit control to match new control
5. xz --decompress control.tar.xz && tar uvf control.tar control && xz control.tar
6. ar r josm-latest_1.5.svn18887_all.deb control.tar.xz

The resulting deb package was then tested against Debian Buster, Bullseye,
Bookworm, Trixie, and Sid, along with Ubuntu 18.04, 20.04, 22.04, 23.04, and
23.10 with
podman run -it --rm --volume $(pwd):/mnt ${IMAGE} /usr/bin/bash -c "apt update && apt install -y /mnt/josm-latest_1.5.svn18887_all.deb && josm-latest --version && josm-latest --status-report"

See r18885: Fix default hasTagDifferent implementation.

Fix #23252: Ignore line_management=transition|termination in UnconnectedPowerTest (patch by gaben, modified)

Modifications are as follows:

• Lint fixes
• Performance enhancements (profiling done with validator and an overpass download of Mesa County, Colorado)
  • Iterating over an array is much more efficient than using streams. For methods that may be frequently called, using Arrays.stream is currently not a good idea.
    • hasTagDifferent: 2.09 MB -> 0
    • hasTag: 125MB -> 0
    • hasKey: 879MB -> 0

Mention that Douglas-Peucker is used

add import as other name for source

See #23125: Add secret to GH action environment

See #23220: Use jakarta.annotation instead of javax.annotation (JSR305)

jsr305 should be removed in June 2024 to give plugins time to migrate.

Some lint issues were also fixed.

Fix #23238: Some MapCSS functions cause NPEs when part of fixAdd

Fix #23240: Change tag man_made=mineshaft to man_made=heap for new man_made=heap preset

See #23218: Use newer error_prone versions when compiling on Java 11+

error_prone 2.11 dropped support for compiling with Java 8, although it still
supports compiling for Java 8. The "major" new check for us is NotJavadoc since
we used /** in quite a few places which were not javadoc.

Other "new" checks that are of interest:

• AlreadyChecked: if (foo) { doFoo(); } else if (!foo) { doBar(); }
• UnnecessaryStringBuilder: Avoid StringBuilder (Java converts + to StringBuilder behind-the-scenes, but may also do something else if it performs better)
• NonApiType: Avoid specific interface types in function definitions
• NamedLikeContextualKeyword: Avoid using restricted names for classes and methods
• UnusedMethod: Unused private methods should be removed

This fixes most of the new error_prone issues and some SonarLint issues.

Fix #23235: Allow unicode characters in URL paths

See #16567: Update to JUnit 5

This adds the @TaggingPresets annotation used by r18866 (see #23196). The
annotation tries to only initialize the presets when the current preset list does
not have the same hashCode as the default preset list. In order for this to work,
TaggingPresets#getTaggingPresets had to return a List (the method contract
has not changed), which calculates the hashCode in a deterministic manner.

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.