source: josm

Fix #23444: NPE in org.openstreetmap.josm.gui.MapViewState$MapViewEastNorthPoint.<init>

This occurs when an incomplete way is loaded into JOSM (by an .osm file, for
example). This is fixed by checking to see if the way is usable (not incomplete,
not deleted, and more importantly for this ticket, no nodes are incomplete).

This additionally fixes some pmd issues and sonarlint issues.

see #23397: Improve the results of partial validations

• correct last minute change so that it doesn't use empty collection to filter irrelevant warnings
• correct usage of isPrimitiveUsable() so that CrossingWays.Boundaries works again (old unit test failed)
• add unit tests to check partial validation of DuplicateWay and CrossingWays gives expected results

fix #23442: Follow line bug when holding F

• make sure that the node returned by DrawAction.getCurrentBaseNode() is either first or last node of the selected way.

see #20405: simplify code

see #23427: remove obsolete and unintended code from experiment

remove TLD from IANA

fix #23430: Resetting preference validator.selectionFilter results in broken validator

• always set filter when selection was changed
• updateSelection when preferences were changed so that a change of the preference validator.selectionFilter is applied immediately

Improve reaction time when user presses cancel while a session is loaded

fix memory leak, ImgDisplay.destroy() was only called when at least one image was viewed

fix #22819: JOSM shows geotagged images in the wrong location

• if a new image should be shown, make sure that we don't show the previous one. Instead, show only the loading message.

fix #23417: Load images from Wikimedia Commons can cause crash report

• disable the action when last layer was closed

This requires special action in layerRemoving(), so default listeners in JosmAction are no longer needed

fix #23408

• fix crash when lots of GeoImageLayer layers are closed without and no data layer is open
• don't show save layers dialog when no save or upload action is available.

See #23415/r18938: Use titleBar instead of dialogsPanel

fix #23415 and #23414, patch 23415-v2.patch

• fixes issues where the wrong image is shown
• properly destroys the toggle dialog and the toggle action when no more geotagged image layer is available
• make sure that the title is updated when no image is selected (instead of possibly showing an image name from a closed layer

Fix #23399: Simplify way crashes

This was primarily caused by selection updates occurring while the commands were generated. The fixes could be any of the following:

• Synchronized collections
• New list
• Avoiding selection updates

The last option was taken for the following reasons:

• Avoiding a StackOverflow exception when many ways are being simplified
• Reduced memory allocations (>11GB to <250MB)
• Reduced CPU cycles

i18n update

pmd

proper interface

Fix #23316: MarkerLayer should return an empty list instead of a list with a single null value when the entry is null

See #23290 comment 10: Fix missing s in region for payment cards

Fix #16485: Ensure windows lose always-on-top status when JOSM loses focus

Also fix some spotbugs/sonarlint issues.

Fix #23308: Fix a false positive for "Water area inside water area" validation (patch by gaben, modified)

A coastline as an area follows the right-side rule like coastlines as a way.
This means that a water area inside the area, as defined for almost every other
area tag, may be valid, depending upon the directionality of the coastline way.

Modifications are as follows:

• Look for water areas inside oceans (coastline is drawn in clockwise direction)
  • This is anticipated to be a rare occurrence since most coastlines are expected to be part of a large area.
• Add non-regression test
• Keep previous spacing for easier svn blame usage

Fix #23339: Improve preset for charging stations (patch by dbrgn)

• Generic fee -> fee + parking:fee (the two may be separate)
• capacity is now free-form text (some charging stations can have 20 or more chargers)
• covered has been added
• Remove non-vehicle transport methods like bicycle and scooter (preset is in the vehicle group)
• Unused socket types have been removed
• Replace voltage and amperage with max socket output power
• Update authentication methods
• Add level for when the charging station is in a multi-level parking garage

since_xxx.py: Add optional parameter for changesets

remove TLD from IANA

See #22596: Some hosts redirect to another host for authentication (patch by hhtznr, modified)

This lets plugins do authentication with hosts that redirect to another host
for authentication.

Fix #23113: Use default methods from JMapViewer

Dependency updates

ivy.xml

• org.openstreetmap.jmapviewer:jmapviewer: 2.16 -> 2.18
  • Add default methods to JMapViewer TileSource interface
  • Modularize for Java 9+
  • Add layer option for Bing Imagery
• jakarta.json:jakarta.json-api: 2.1.2 -> 2.1.3
• org.eclipse.parsson:parsson: 1.1.4 -> 1.1.5
• org.apache.commons:commons-jcs3-core: 3.1 -> 3.2
• org.apache.commons:commons-compress: 1.23.0 -> 1.25.0
• com.drewnoakes:metadata-extractor: 2.18.0 -> 2.19.0
• ch.poole:OpeningHoursParser: 0.27.0 -> 0.27.1
• org.webjars.npm:tag2link: 2022.11.28 -> 2023.11.21
  • This now parses OSM Wiki Data Items directly instead of via the (outdated) sophox API
• org.apache.commons:commons-lang3: 3.13.0 -> 3.14.0
• org.jacoco:org.jacoco.ant: 0.8.10 -> 0.8.11
  • Official Java 21 support
• com.github.spotbugs:spotbugs-annotations: 4.7.3 -> 4.8.3
• io.github.classgraph:classgraph: 4.8.162 -> 4.8.165
• JUnit platform: 1.10.0 -> 1.10.1
• JUnit packages: 5.10.0 -> 5.10.1
• nl.jqno.equalsverifier:equalsverifier: 3.15.1 -> 3.15.4

tools/ivy.xml

• net.java.dev.javacc:javacc: 7.0.12 -> 7.0.13
• com.guardsquare:proguard-ant: 7.4.0-beta02 -> 7.4.1
• com.github.spotbugs:spotbugs-annotations: 4.7.3 -> 4.8.3
• com.google.errorprone:error_prone_core: 2.22.0 -> 2.23.0

Fix #23341: Paintstyles are wiped when updating when the user has never explicitly changed the styles

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