Ticket #24993: 1-docs-linux-manpages.patch

File 1-docs-linux-manpages.patch, 33.3 KB (added by gaben, 5 hours ago)

  • README 

    diff --git a/README b/README
index 523b073a11..59705cfea9 100644
    a b Microsoft Windows and Apple macOS users should visit one of:  
    2121- https://bell-sw.com/pages/downloads/#mn
    2222and download the latest Java executable for their system.
    2323
    24 Linux users should visit http://www.oracle.com/technetwork/java/index.html
    25 There is a Linux binary installer, which you must execute from a console, or
    26 use the mechanism of your distribution's packaging system.
     24Linux users should install OpenJDK using the mechanism of their distribution's
     25packaging system (e.g. "sudo apt install default-jre openjfx" on Debian/Ubuntu),
     26or download a JDK from one of the links above.
    2727
    2828
    2929How to launch

  • deleted file native/Dockerfile 

    diff --git a/native/Dockerfile b/native/Dockerfile
deleted file mode 100644
index fdb8f590b2..0000000000
    + -  
    1 FROM openjdk:8-jdk-alpine
    2 
    3 RUN apk update && \
    4     apk add apache-ant && \
    5     apk add ttf-dejavu && \
    6     apk add subversion && \
    7     apk add git && \
    8     rm /var/cache/apk/*
    9 
    10 COPY . /josm
    11 
    12 RUN mkdir -p /josm/test/report
    13 
    14 CMD cd /josm && \
    15     ant test-html -DnoJavaFX=true

  • deleted file native/docker-test.bat 

    diff --git a/native/docker-test.bat b/native/docker-test.bat
deleted file mode 100644
index 1041e1af8b..0000000000
    + -  
    1 docker build . -t josm/josm
    2 mkdir %CD%\test\report
    3 docker run -it --name josm -v %CD%\test\report:/josm/test/report josm/josm
    4 docker rm josm
    5 docker rmi josm/josm
    6 pause

  • deleted file native/docker-test.sh 

    diff --git a/native/docker-test.sh b/native/docker-test.sh
deleted file mode 100644
index 0823586358..0000000000
    + -  
    1 #!/bin/bash
    2 
    3 docker build . -t josm/josm
    4 mkdir -p test/report
    5 docker run -it --name josm -v "$(pwd)"/test/report:/josm/test/report josm/josm
    6 docker rm josm
    7 docker rmi josm/josm

  • native/linux/latest/DEBIAN/control 

    diff --git a/native/linux/latest/DEBIAN/control b/native/linux/latest/DEBIAN/control
index 957f01cded..30d8d2e0d4 100644
    a b Architecture: all  
    88Depends: default-jre (>= 2:1.17) | java11-runtime,
    99         proj-data, fonts-noto, openjfx
    1010Description: Editor for OpenStreetMap (daily development snapshot)
    11  JOSM is an editor for OpenStreetMap (OSM) written in Java.
    12   The current version supports stand alone GPX tracks, GPX track data
    13   from OSM database and existing nodes, line segments and metadata tags
    14   from the OSM database.
     11 JOSM is an extensible editor for OpenStreetMap (OSM) written in Java.
     12 It supports loading GPX tracks, background imagery and OSM data from
     13 local sources as well as from online sources and allows to edit the
     14 OSM data (nodes, ways and relations) and their metadata tags.
    1515 .
    16   OpenStreetMap is a project aimed squarely at creating and providing
    17   free geographic data such as street maps to anyone who wants them.
    18   The project was started because most maps you think of as free actually
    19   have legal or technical restrictions on their use, holding back people
    20   from using them in creative, productive or unexpected ways.
     16 OpenStreetMap is a project aimed squarely at creating and providing
     17 free geographic data such as street maps to anyone who wants them.
     18 The project was started because most maps you think of as free actually
     19 have legal or technical restrictions on their use, holding back people
     20 from using them in creative, productive or unexpected ways.
    2121
    2222
    2323

  • native/linux/latest/etc/default/josm-latest 

    diff --git a/native/linux/latest/etc/default/josm-latest b/native/linux/latest/etc/default/josm-latest
index bb792ca8c7..00495f8d49 100644
    a b  
    77# Enable OpenGL pipeline (2D graphic accelerators)
    88#JAVA_OPTS="-Dsun.java2d.opengl=True ${JAVA_OPTS}"
    99
     10# Use a specific Java executable instead of the automatic selection
     11#JAVACMD="/usr/lib/jvm/java-21-openjdk-amd64/bin/java"
     12
     13# Location of the OpenJFX modules (default: /usr/share/openjfx/lib)
     14#JAVAFX_HOME="/usr/share/openjfx/lib"
     15
     16# Additional Java module path entries
     17#JOSM_MODULEPATH=""
     18
     19# Location of the JOSM jar file (default: /usr/share/josm-latest/josm-latest.jar)
     20#JOSM_PATH="/usr/share/josm-latest/josm-latest.jar"
     21

  • native/linux/latest/usr/bin/josm-latest 

    diff --git a/native/linux/latest/usr/bin/josm-latest b/native/linux/latest/usr/bin/josm-latest
index 58cce230aa..34553cccc0 100755
    a b dpkg_java() {  
    2121    if dpkg --get-selections "openjdk-*-jre" | grep install$ > /dev/null \
    2222    || dpkg --get-selections "openjdk-*-jre:$ARCH" | grep install$ > /dev/null ; then
    2323        # LTS versions in decreased order
     24        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-25-openjdk/bin/java /usr/lib/jvm/java-25-openjdk-$ARCH/bin/java"
    2425        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-21-openjdk/bin/java /usr/lib/jvm/java-21-openjdk-$ARCH/bin/java"
    2526        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-17-openjdk/bin/java /usr/lib/jvm/java-17-openjdk-$ARCH/bin/java"
    2627        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-openjdk/bin/java /usr/lib/jvm/java-11-openjdk-$ARCH/bin/java"
    2728        # Released versions in decreased order
    28         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-24-openjdk/bin/java /usr/lib/jvm/java-24-openjdk-$ARCH/bin/java"
     29        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-27-openjdk/bin/java /usr/lib/jvm/java-27-openjdk-$ARCH/bin/java"
    2930        # EOL versions in decreased order
     31        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-26-openjdk/bin/java /usr/lib/jvm/java-26-openjdk-$ARCH/bin/java"
     32        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-24-openjdk/bin/java /usr/lib/jvm/java-24-openjdk-$ARCH/bin/java"
    3033        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-23-openjdk/bin/java /usr/lib/jvm/java-23-openjdk-$ARCH/bin/java"
    3134        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-22-openjdk/bin/java /usr/lib/jvm/java-22-openjdk-$ARCH/bin/java"
    3235        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-20-openjdk/bin/java /usr/lib/jvm/java-20-openjdk-$ARCH/bin/java"
    … … dpkg_java() {  
    3841        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-13-openjdk/bin/java /usr/lib/jvm/java-13-openjdk-$ARCH/bin/java"
    3942        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-12-openjdk/bin/java /usr/lib/jvm/java-12-openjdk-$ARCH/bin/java"
    4043        # Development version(s)
    41         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-25-openjdk/bin/java /usr/lib/jvm/java-25-openjdk-$ARCH/bin/java"
     44        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-28-openjdk/bin/java /usr/lib/jvm/java-28-openjdk-$ARCH/bin/java"
    4245    fi
    4346}
    4447

  • native/linux/latest/usr/share/doc/josm-latest/copyright 

    diff --git a/native/linux/latest/usr/share/doc/josm-latest/copyright b/native/linux/latest/usr/share/doc/josm-latest/copyright
index 59ca9024ea..384c4eb34c 100644
    a b  
    1 Copyright (c) 2005-2020 JOSM developers <josm-dev@openstreetmap.org>
     1Copyright (c) 2005-2026 JOSM developers <josm-dev@openstreetmap.org>
    22
    33License: GPL3+
    44

  • native/linux/latest/usr/share/man/man1/josm-latest.1 

    diff --git a/native/linux/latest/usr/share/man/man1/josm-latest.1 b/native/linux/latest/usr/share/man/man1/josm-latest.1
index f8546e32e1..1b8f9cc173 100644
    a b  
    1 .TH JOSM 1 "March 22, 2021"
     1.TH JOSM 1 "October 23, 2026"
    22.\" Please adjust this date whenever revising the manpage.
     3.\" Keep in sync with MainApplication.getHelp(), RenderingCLI, ProjectionCLI and ValidatorCLI.
    34.SH NAME
    45josm \- Java OpenStreetMap Editor
    56.SH SYNOPSIS
    67.B josm-latest
     8[\fIcommand\fR] [\fIoptions\fR] [\fIfile\fR|\fIURL\fR|\fIbbox\fR...]
    79.SH DESCRIPTION
    8 .B JOSM 
    9 is an editor for OpenStreetMap written in Java 8.
     10.B JOSM
     11is an editor for OpenStreetMap written in Java.
    1012.PP
    11 .B OpenStreetMap 
     13.B OpenStreetMap
    1214is a project aimed squarely at creating and providing free geographic data such as street maps to anyone
    13 who wants them. It allows you to view, edit and use geographical data in a collaborative way from 
     15who wants them. It allows you to view, edit and use geographical data in a collaborative way from
    1416anywhere on earth.
    15 The project was started because most maps you think of as free actually have legal or technical 
     17The project was started because most maps you think of as free actually have legal or technical
    1618restrictions on their use, holding back people from using them in creative, productive or unexpected
    1719ways.
     20.SH COMMANDS
     21.TP
     22.B runjosm
     23Launch JOSM (default, performed when no command is specified)
     24.TP
     25.B render
     26Render data and save the result to an image file
     27.TP
     28.B project
     29Convert coordinates from one coordinate reference system to another
     30.TP
     31.B validate
     32Validate data
     33.PP
     34Run a command with \fB\-\-help\fR for details on its options.
    1835.SH OPTIONS
     36The following options apply to the \fBrunjosm\fR command.
    1937.TP
    20 .B \-h, \-?, \-\-help
     38.B \-h, \-\-help
    2139Show help
    2240.TP
    23 .B \-\-geometry=<width>x<height>(+|-)x(+|-)y
     41.B \-\-geometry=<width>x<height>(+|\-)x(+|\-)y
    2442Standard X geometry argument
    2543.TP
    2644.B [\-\-download=]minlat,minlon,maxlat,maxlon
    2745Download the bounding box
    2846.TP
    29 .B [\-\-download=]<url>
    30 Download the location at the url (with lat=x&lon=y&zoom=z)
     47.B [\-\-download=]<URL>
     48Download the location at the URL (with lat=x&lon=y&zoom=z)
    3149.TP
    3250.B [\-\-download=]<filename>
    33 Open file (any file type that can be opened with File/Open)
     51Open a file (any file type that can be opened with File/Open)
    3452.TP
    3553.B \-\-downloadgps=minlat,minlon,maxlat,maxlon
    36 Download the bounding box as raw gps
     54Download the bounding box as raw GPS
     55.TP
     56.B \-\-downloadgps=<URL>
     57Download the location at the URL (with lat=x&lon=y&zoom=z) as raw GPS
    3758.TP
    3859.B \-\-selection=<searchstring>
    39 Select with the given search
     60Select with the given search. Make sure you load some data if you use \-\-selection.
    4061.TP
    4162.B \-\-[no\-]maximize
    4263Do [not] launch in maximized mode
    4364.TP
    4465.B \-\-reset\-preferences
    45 Reset the preferences to the default
     66Reset the preferences to default
    4667.TP
    4768.B \-\-load\-preferences=<url\-to\-xml>
    4869Change preferences according to the XML file
    … … Set preference key to value  
    5374.B \-\-language=<language>
    5475Set the language
    5576.TP
    56 .B \-\-version
    57 Display the JOSM version
     77.B \-v, \-\-version
     78Display the JOSM version and exit
    5879.TP
    59 .B \-\-status-report
     80.B \-\-status\-report
    6081Show status report with useful information that can be attached to bugs
    6182.TP
     83.B \-\-warn
     84Print only warning or error messages to console
     85.TP
    6286.B \-\-debug
    6387Print debugging messages to console
    6488.TP
     89.B \-\-skip\-plugins
     90Skip loading plugins
     91.TP
    6592.B \-\-offline=<OSM_API|JOSM_WEBSITE|CACHE_UPDATES|CERTIFICATES|ALL>
    6693Disable access to the given resource(s), separated by comma
     94.PP
     95Parameters \-\-download, \-\-downloadgps and \-\-selection are processed in this order.
     96.SS render
     97.B josm\-latest render
     98\fIoptions\fR
     99.PP
     100Renders data and saves the result to an image file.
     101.TP
     102.B \-h, \-\-help
     103Show help
     104.TP
     105.B \-i, \-\-input <file>
     106Input data file name (.osm)
     107.TP
     108.B \-o, \-\-output <file>
     109Output image file name (.png); defaults to out.png
     110.TP
     111.B \-s, \-\-style <file>
     112Style file to use for rendering (.mapcss or .zip).
     113This option can be repeated to load multiple styles.
     114.TP
     115.B \-\-setting <key>:<value>
     116Style setting (in JOSM accessible in the style list dialog right click menu).
     117Applies to the last style loaded with the \-\-style option.
     118.TP
     119.B \-z, \-\-zoom <lvl>
     120Select zoom level to render (integer value, 0=entire earth, 18=street level)
     121.TP
     122.B \-\-scale <scale>
     123Select the map scale. A value of 10000 denotes a scale of 1:10000
     124(1 cm on the map equals 100 m on the ground; display resolution: 96 dpi).
     125Options \-\-zoom and \-\-scale are mutually exclusive.
     126.TP
     127.B \-b, \-\-bounds auto|<min_lon>,<min_lat>,<max_lon>,<max_lat>
     128Area to render, default value is auto.
     129With keyword auto, the downloaded area in the .osm input file will be used (if recorded).
     130.TP
     131.B \-\-anchor <lon>,<lat>
     132Specify bottom left corner of the rendering area.
     133Used in combination with width and height options to determine the area to render.
     134.TP
     135.B \-\-width\-m <number>
     136Width of the rendered area, in meter
     137.TP
     138.B \-\-height\-m <number>
     139Height of the rendered area, in meter
     140.TP
     141.B \-\-width\-px <number>
     142Width of the target image, in pixel
     143.TP
     144.B \-\-height\-px <number>
     145Height of the target image, in pixel
     146.TP
     147.B \-\-projection <code>
     148Projection to use, default value epsg:3857 (web\-Mercator)
     149.TP
     150.B \-\-max\-image\-size <number>
     151Maximum image width/height in pixel (0 means no limit), default value: 20000
     152.TP
     153.B \-\-debug, \-\-trace
     154Print (detailed) debugging messages to console
     155.PP
     156To specify the rendered area and scale, the options can be combined in various ways:
     157.nf
     158  \-\-bounds (\-\-zoom|\-\-scale|\-\-width\-px|\-\-height\-px)
     159  \-\-anchor (\-\-width\-m|\-\-width\-px) (\-\-height\-m|\-\-height\-px) (\-\-zoom|\-\-scale)
     160  \-\-anchor \-\-width\-m \-\-height\-m (\-\-width\-px|\-\-height\-px)
     161  \-\-anchor \-\-width\-px \-\-height\-px (\-\-width\-m|\-\-height\-m)
     162.fi
     163If neither bounds nor anchor is given, the default value \-\-bounds=auto takes effect
     164and the bounds of the download area in the .osm input file are used.
     165.SS project
     166.B josm\-latest project
     167\fIoptions\fR \fIcrs\fR +to \fIcrs\fR [\fIfile\fR...]
     168.PP
     169Converts coordinates from one coordinate reference system to another.
     170The format for input and output coordinate reference system is similar to that of the PROJ.4 software.
     171Input data is read from the files given as positional arguments; when no files are given,
     172or the filename is "\-", data is read from standard input.
     173.TP
     174.B \-h, \-\-help
     175Show help
     176.TP
     177.B \-I, \-\-inverse
     178Switch input and output crs
     179.TP
     180.B \-r, \-\-switch\-input
     181Switch order of input coordinates (east/north, lon/lat)
     182.TP
     183.B \-s, \-\-switch\-output
     184Switch order of output coordinates (east/north, lon/lat)
     185.SS validate
     186.B josm\-latest validate
     187\fIoptions\fR
     188.PP
     189Validates data and saves the result to a file.
     190.TP
     191.B \-h, \-\-help
     192Show help
     193.TP
     194.B \-i, \-\-input <file>
     195Input data file name (.osm, .validator.mapcss, .mapcss).
     196OSM files can be specified multiple times. Required.
     197\&.validator.mapcss and .mapcss files will stop processing on first error.
     198Non\-osm files do not use \-\-output or \-\-change\-file.
     199.TP
     200.B \-o, \-\-output <file>
     201Output data file name (.geojson, line\-by\-line delimited for MapRoulette). Optional.
     202.TP
     203.B \-c, \-\-change\-file <file>
     204Change file name (.osc). Can be specified multiple times per input.
     205Changes will be applied in the specified order. Optional.
     206.TP
     207.B \-l, \-\-language <language>
     208Set the language
     209.TP
     210.B \-p, \-\-load\-preferences <file>
     211Change preferences according to the XML file
     212.TP
     213.B \-s, \-\-set <key>=<value>
     214Set preference key to value
     215.TP
     216.B \-\-warn, \-\-debug, \-\-trace
     217Set the logging level
    67218.SH FILES
    68219JOSM files are saved according to the XDG Base Directory Specification:
    69220.TP
    … … User data  
    77228Cache
    78229.TP
    79230If the directory $HOME/.josm-latest exists, all files are stored there.
     231.TP
     232.B /etc/default/josm-latest
     233Shell file sourced by the launcher script, e.g. to set JAVA_OPTS or JAVACMD.
    80234.SH JAVA PROPERTIES
    81235The following options can be set by using Java system properties (i.e. \-Dkey=value
    82236passed to java, or specified inside JAVA_OPTS).
    … … Set the JOSM cache directory.  
    92246.TP
    93247.B josm.home=<homedir>
    94248Relocate all 3 directories to homedir. Cache directory will be in <homedir>/cache.
     249josm.home has lower precedence, i.e. the specific settings above override it.
    95250.TP
    96251.B josm.dir.name=<JOSM-latest>
    97252Change the JOSM directory name.
    98253.SH ENVIRONMENT
    99254.IP JAVA_HOME
    100255Specify an alternate Java environment.
     256.IP JAVACMD
     257Specify the java executable to use, overriding the automatic selection.
    101258.IP JAVA_OPTS
    102259Specify Java options.
    103260For example, to use a HTTP proxy server with this program, set this environment variable
    104261to something like
    105 .I JAVA_OPTS="-Dhttp.proxyHost=yourProxyURL"
     262.I JAVA_OPTS="\-Dhttp.proxyHost=yourProxyURL"
    106263before starting josm.
     264If unset and the machine has more than 8 GB of memory, the launcher uses
     265.IR "\-XX:MaxRAMPercentage=75.0 \-Xms256m" .
     266.IP JAVAFX_HOME
     267Location of the OpenJFX modules (default /usr/share/openjfx/lib).
     268.IP JOSM_MODULEPATH
     269Additional Java module path entries.
     270.IP JOSM_PATH
     271Location of the JOSM jar file (default /usr/share/josm-latest/josm-latest.jar).
     272.SH EXAMPLES
     273.nf
     274josm\-latest track1.gpx track2.gpx london.osm
     275josm\-latest https://www.openstreetmap.org/#map=13/43.2/11.1
     276josm\-latest london.osm \-\-selection=http://www.ostertag.name/osm/OSM_errors_node\-duplicate.xml
     277josm\-latest 43.2,11.1,43.4,11.4
     278josm\-latest render \-i data.osm \-s style.mapcss \-z 16 \-o image.png
     279josm\-latest project +init=epsg:4326 +to +init=epsg:3857 <<<"11.232274 50.5685716"
     280josm\-latest validate \-i data.osm \-o errors.geojson
     281JAVA_OPTS="\-Xmx1024m" josm\-latest
     282.fi
    107283.SH AUTHOR
    108284JOSM was originally designed and coded by Immanuel Scholz,
    109285and is now maintained by the OpenStreetMap community.
    … … Ulf Lamping  
    126302Simon Legner
    127303Raphael Mack
    128304Upliner Mikhalych
     305Gerd Petermann
    129306Vincent Privat
    130307Frederik Ramm
     308Taylor Smock
    131309Dirk Stöcker
     310Stefan Volke
     311Michael Zangl
    132312.PP
    133313Many minor contributions and patches by others; see SVN history
    134314at https://josm.openstreetmap.de/svn/ for details. Use

  • native/linux/tested/DEBIAN/control 

    diff --git a/native/linux/tested/DEBIAN/control b/native/linux/tested/DEBIAN/control
index 02961f8929..86e999034a 100644
    a b Depends: default-jre (>= 2:1.17) | java11-runtime,  
    1010Conflicts: josm-plugins
    1111Replaces: josm-plugins
    1212Description: Editor for OpenStreetMap
    13  JOSM is an editor for OpenStreetMap (OSM) written in Java.
    14   The current version supports stand alone GPX tracks, GPX track data
    15   from OSM database and existing nodes, line segments and metadata tags
    16   from the OSM database.
     13 JOSM is an extensible editor for OpenStreetMap (OSM) written in Java.
     14 It supports loading GPX tracks, background imagery and OSM data from
     15 local sources as well as from online sources and allows to edit the
     16 OSM data (nodes, ways and relations) and their metadata tags.
    1717 .
    18   OpenStreetMap is a project aimed squarely at creating and providing
    19   free geographic data such as street maps to anyone who wants them.
    20   The project was started because most maps you think of as free actually
    21   have legal or technical restrictions on their use, holding back people
    22   from using them in creative, productive or unexpected ways.
     18 OpenStreetMap is a project aimed squarely at creating and providing
     19 free geographic data such as street maps to anyone who wants them.
     20 The project was started because most maps you think of as free actually
     21 have legal or technical restrictions on their use, holding back people
     22 from using them in creative, productive or unexpected ways.
    2323
    2424
    2525

  • native/linux/tested/etc/default/josm 

    diff --git a/native/linux/tested/etc/default/josm b/native/linux/tested/etc/default/josm
index 508ac3137f..fd49b64076 100644
    a b  
    77# Enable OpenGL pipeline (2D graphic accelerators)
    88#JAVA_OPTS="-Dsun.java2d.opengl=True ${JAVA_OPTS}"
    99
     10# Use a specific Java executable instead of the automatic selection
     11#JAVACMD="/usr/lib/jvm/java-21-openjdk-amd64/bin/java"
     12
     13# Location of the OpenJFX modules (default: /usr/share/openjfx/lib)
     14#JAVAFX_HOME="/usr/share/openjfx/lib"
     15
     16# Additional Java module path entries
     17#JOSM_MODULEPATH=""
     18
     19# Location of the JOSM jar file (default: /usr/share/josm/josm.jar)
     20#JOSM_PATH="/usr/share/josm/josm.jar"
     21

  • native/linux/tested/usr/bin/josm 

    diff --git a/native/linux/tested/usr/bin/josm b/native/linux/tested/usr/bin/josm
index b84a517f8e..b91f2fcaa6 100755
    a b dpkg_java() {  
    2121    if dpkg --get-selections "openjdk-*-jre" | grep install$ > /dev/null \
    2222    || dpkg --get-selections "openjdk-*-jre:$ARCH" | grep install$ > /dev/null ; then
    2323        # LTS versions in decreased order
     24        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-25-openjdk/bin/java /usr/lib/jvm/java-25-openjdk-$ARCH/bin/java"
    2425        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-21-openjdk/bin/java /usr/lib/jvm/java-21-openjdk-$ARCH/bin/java"
    2526        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-17-openjdk/bin/java /usr/lib/jvm/java-17-openjdk-$ARCH/bin/java"
    2627        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-openjdk/bin/java /usr/lib/jvm/java-11-openjdk-$ARCH/bin/java"
    2728        # Released versions in decreased order
    28         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-24-openjdk/bin/java /usr/lib/jvm/java-24-openjdk-$ARCH/bin/java"
     29        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-27-openjdk/bin/java /usr/lib/jvm/java-27-openjdk-$ARCH/bin/java"
    2930        # EOL versions in decreased order
     31        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-26-openjdk/bin/java /usr/lib/jvm/java-26-openjdk-$ARCH/bin/java"
     32        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-24-openjdk/bin/java /usr/lib/jvm/java-24-openjdk-$ARCH/bin/java"
    3033        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-23-openjdk/bin/java /usr/lib/jvm/java-23-openjdk-$ARCH/bin/java"
    3134        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-22-openjdk/bin/java /usr/lib/jvm/java-22-openjdk-$ARCH/bin/java"
    3235        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-20-openjdk/bin/java /usr/lib/jvm/java-20-openjdk-$ARCH/bin/java"
    … … dpkg_java() {  
    3841        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-13-openjdk/bin/java /usr/lib/jvm/java-13-openjdk-$ARCH/bin/java"
    3942        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-12-openjdk/bin/java /usr/lib/jvm/java-12-openjdk-$ARCH/bin/java"
    4043        # Development version(s)
    41         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-25-openjdk/bin/java /usr/lib/jvm/java-25-openjdk-$ARCH/bin/java"
     44        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-28-openjdk/bin/java /usr/lib/jvm/java-28-openjdk-$ARCH/bin/java"
    4245    fi
    4346}
    4447

  • native/linux/tested/usr/share/doc/josm/copyright 

    diff --git a/native/linux/tested/usr/share/doc/josm/copyright b/native/linux/tested/usr/share/doc/josm/copyright
index 59ca9024ea..384c4eb34c 100644
    a b  
    1 Copyright (c) 2005-2020 JOSM developers <josm-dev@openstreetmap.org>
     1Copyright (c) 2005-2026 JOSM developers <josm-dev@openstreetmap.org>
    22
    33License: GPL3+
    44

  • native/linux/tested/usr/share/man/man1/josm.1 

    diff --git a/native/linux/tested/usr/share/man/man1/josm.1 b/native/linux/tested/usr/share/man/man1/josm.1
index c8467c3a73..5c66a59cf5 100644
    a b  
    1 .TH JOSM 1 "March 22, 2021"
     1.TH JOSM 1 "October 23, 2026"
    22.\" Please adjust this date whenever revising the manpage.
     3.\" Keep in sync with MainApplication.getHelp(), RenderingCLI, ProjectionCLI and ValidatorCLI.
    34.SH NAME
    45josm \- Java OpenStreetMap Editor
    56.SH SYNOPSIS
    67.B josm
     8[\fIcommand\fR] [\fIoptions\fR] [\fIfile\fR|\fIURL\fR|\fIbbox\fR...]
    79.SH DESCRIPTION
    8 .B JOSM 
    9 is an editor for OpenStreetMap written in Java 8.
     10.B JOSM
     11is an editor for OpenStreetMap written in Java.
    1012.PP
    11 .B OpenStreetMap 
     13.B OpenStreetMap
    1214is a project aimed squarely at creating and providing free geographic data such as street maps to anyone
    13 who wants them. It allows you to view, edit and use geographical data in a collaborative way from 
     15who wants them. It allows you to view, edit and use geographical data in a collaborative way from
    1416anywhere on earth.
    15 The project was started because most maps you think of as free actually have legal or technical 
     17The project was started because most maps you think of as free actually have legal or technical
    1618restrictions on their use, holding back people from using them in creative, productive or unexpected
    1719ways.
     20.SH COMMANDS
     21.TP
     22.B runjosm
     23Launch JOSM (default, performed when no command is specified)
     24.TP
     25.B render
     26Render data and save the result to an image file
     27.TP
     28.B project
     29Convert coordinates from one coordinate reference system to another
     30.TP
     31.B validate
     32Validate data
     33.PP
     34Run a command with \fB\-\-help\fR for details on its options.
    1835.SH OPTIONS
     36The following options apply to the \fBrunjosm\fR command.
    1937.TP
    20 .B \-h, \-?, \-\-help
     38.B \-h, \-\-help
    2139Show help
    2240.TP
    23 .B \-\-geometry=<width>x<height>(+|-)x(+|-)y
     41.B \-\-geometry=<width>x<height>(+|\-)x(+|\-)y
    2442Standard X geometry argument
    2543.TP
    2644.B [\-\-download=]minlat,minlon,maxlat,maxlon
    2745Download the bounding box
    2846.TP
    29 .B [\-\-download=]<url>
    30 Download the location at the url (with lat=x&lon=y&zoom=z)
     47.B [\-\-download=]<URL>
     48Download the location at the URL (with lat=x&lon=y&zoom=z)
    3149.TP
    3250.B [\-\-download=]<filename>
    33 Open file (any file type that can be opened with File/Open)
     51Open a file (any file type that can be opened with File/Open)
    3452.TP
    3553.B \-\-downloadgps=minlat,minlon,maxlat,maxlon
    36 Download the bounding box as raw gps
     54Download the bounding box as raw GPS
     55.TP
     56.B \-\-downloadgps=<URL>
     57Download the location at the URL (with lat=x&lon=y&zoom=z) as raw GPS
    3758.TP
    3859.B \-\-selection=<searchstring>
    39 Select with the given search
     60Select with the given search. Make sure you load some data if you use \-\-selection.
    4061.TP
    4162.B \-\-[no\-]maximize
    4263Do [not] launch in maximized mode
    4364.TP
    4465.B \-\-reset\-preferences
    45 Reset the preferences to the default
     66Reset the preferences to default
    4667.TP
    4768.B \-\-load\-preferences=<url\-to\-xml>
    4869Change preferences according to the XML file
    … … Set preference key to value  
    5374.B \-\-language=<language>
    5475Set the language
    5576.TP
    56 .B \-\-version
    57 Display the JOSM version
     77.B \-v, \-\-version
     78Display the JOSM version and exit
    5879.TP
    59 .B \-\-status-report
     80.B \-\-status\-report
    6081Show status report with useful information that can be attached to bugs
    6182.TP
     83.B \-\-warn
     84Print only warning or error messages to console
     85.TP
    6286.B \-\-debug
    6387Print debugging messages to console
    6488.TP
     89.B \-\-skip\-plugins
     90Skip loading plugins
     91.TP
    6592.B \-\-offline=<OSM_API|JOSM_WEBSITE|CACHE_UPDATES|CERTIFICATES|ALL>
    6693Disable access to the given resource(s), separated by comma
     94.PP
     95Parameters \-\-download, \-\-downloadgps and \-\-selection are processed in this order.
     96.SS render
     97.B josm render
     98\fIoptions\fR
     99.PP
     100Renders data and saves the result to an image file.
     101.TP
     102.B \-h, \-\-help
     103Show help
     104.TP
     105.B \-i, \-\-input <file>
     106Input data file name (.osm)
     107.TP
     108.B \-o, \-\-output <file>
     109Output image file name (.png); defaults to out.png
     110.TP
     111.B \-s, \-\-style <file>
     112Style file to use for rendering (.mapcss or .zip).
     113This option can be repeated to load multiple styles.
     114.TP
     115.B \-\-setting <key>:<value>
     116Style setting (in JOSM accessible in the style list dialog right click menu).
     117Applies to the last style loaded with the \-\-style option.
     118.TP
     119.B \-z, \-\-zoom <lvl>
     120Select zoom level to render (integer value, 0=entire earth, 18=street level)
     121.TP
     122.B \-\-scale <scale>
     123Select the map scale. A value of 10000 denotes a scale of 1:10000
     124(1 cm on the map equals 100 m on the ground; display resolution: 96 dpi).
     125Options \-\-zoom and \-\-scale are mutually exclusive.
     126.TP
     127.B \-b, \-\-bounds auto|<min_lon>,<min_lat>,<max_lon>,<max_lat>
     128Area to render, default value is auto.
     129With keyword auto, the downloaded area in the .osm input file will be used (if recorded).
     130.TP
     131.B \-\-anchor <lon>,<lat>
     132Specify bottom left corner of the rendering area.
     133Used in combination with width and height options to determine the area to render.
     134.TP
     135.B \-\-width\-m <number>
     136Width of the rendered area, in meter
     137.TP
     138.B \-\-height\-m <number>
     139Height of the rendered area, in meter
     140.TP
     141.B \-\-width\-px <number>
     142Width of the target image, in pixel
     143.TP
     144.B \-\-height\-px <number>
     145Height of the target image, in pixel
     146.TP
     147.B \-\-projection <code>
     148Projection to use, default value epsg:3857 (web\-Mercator)
     149.TP
     150.B \-\-max\-image\-size <number>
     151Maximum image width/height in pixel (0 means no limit), default value: 20000
     152.TP
     153.B \-\-debug, \-\-trace
     154Print (detailed) debugging messages to console
     155.PP
     156To specify the rendered area and scale, the options can be combined in various ways:
     157.nf
     158  \-\-bounds (\-\-zoom|\-\-scale|\-\-width\-px|\-\-height\-px)
     159  \-\-anchor (\-\-width\-m|\-\-width\-px) (\-\-height\-m|\-\-height\-px) (\-\-zoom|\-\-scale)
     160  \-\-anchor \-\-width\-m \-\-height\-m (\-\-width\-px|\-\-height\-px)
     161  \-\-anchor \-\-width\-px \-\-height\-px (\-\-width\-m|\-\-height\-m)
     162.fi
     163If neither bounds nor anchor is given, the default value \-\-bounds=auto takes effect
     164and the bounds of the download area in the .osm input file are used.
     165.SS project
     166.B josm project
     167\fIoptions\fR \fIcrs\fR +to \fIcrs\fR [\fIfile\fR...]
     168.PP
     169Converts coordinates from one coordinate reference system to another.
     170The format for input and output coordinate reference system is similar to that of the PROJ.4 software.
     171Input data is read from the files given as positional arguments; when no files are given,
     172or the filename is "\-", data is read from standard input.
     173.TP
     174.B \-h, \-\-help
     175Show help
     176.TP
     177.B \-I, \-\-inverse
     178Switch input and output crs
     179.TP
     180.B \-r, \-\-switch\-input
     181Switch order of input coordinates (east/north, lon/lat)
     182.TP
     183.B \-s, \-\-switch\-output
     184Switch order of output coordinates (east/north, lon/lat)
     185.SS validate
     186.B josm validate
     187\fIoptions\fR
     188.PP
     189Validates data and saves the result to a file.
     190.TP
     191.B \-h, \-\-help
     192Show help
     193.TP
     194.B \-i, \-\-input <file>
     195Input data file name (.osm, .validator.mapcss, .mapcss).
     196OSM files can be specified multiple times. Required.
     197\&.validator.mapcss and .mapcss files will stop processing on first error.
     198Non\-osm files do not use \-\-output or \-\-change\-file.
     199.TP
     200.B \-o, \-\-output <file>
     201Output data file name (.geojson, line\-by\-line delimited for MapRoulette). Optional.
     202.TP
     203.B \-c, \-\-change\-file <file>
     204Change file name (.osc). Can be specified multiple times per input.
     205Changes will be applied in the specified order. Optional.
     206.TP
     207.B \-l, \-\-language <language>
     208Set the language
     209.TP
     210.B \-p, \-\-load\-preferences <file>
     211Change preferences according to the XML file
     212.TP
     213.B \-s, \-\-set <key>=<value>
     214Set preference key to value
     215.TP
     216.B \-\-warn, \-\-debug, \-\-trace
     217Set the logging level
    67218.SH FILES
    68219JOSM files are saved according to the XDG Base Directory Specification:
    69220.TP
    … … User data  
    77228Cache
    78229.TP
    79230If the directory $HOME/.josm exists, all files are stored there.
     231.TP
     232.B /etc/default/josm
     233Shell file sourced by the launcher script, e.g. to set JAVA_OPTS or JAVACMD.
    80234.SH JAVA PROPERTIES
    81235The following options can be set by using Java system properties (i.e. \-Dkey=value
    82236passed to java, or specified inside JAVA_OPTS).
    … … Set the JOSM cache directory.  
    92246.TP
    93247.B josm.home=<homedir>
    94248Relocate all 3 directories to homedir. Cache directory will be in <homedir>/cache.
     249josm.home has lower precedence, i.e. the specific settings above override it.
    95250.TP
    96251.B josm.dir.name=<JOSM>
    97252Change the JOSM directory name.
    98253.SH ENVIRONMENT
    99254.IP JAVA_HOME
    100255Specify an alternate Java environment.
     256.IP JAVACMD
     257Specify the java executable to use, overriding the automatic selection.
    101258.IP JAVA_OPTS
    102259Specify Java options.
    103260For example, to use a HTTP proxy server with this program, set this environment variable
    104261to something like
    105 .I JAVA_OPTS="-Dhttp.proxyHost=yourProxyURL"
     262.I JAVA_OPTS="\-Dhttp.proxyHost=yourProxyURL"
    106263before starting josm.
     264If unset and the machine has more than 8 GB of memory, the launcher uses
     265.IR "\-XX:MaxRAMPercentage=75.0 \-Xms256m" .
     266.IP JAVAFX_HOME
     267Location of the OpenJFX modules (default /usr/share/openjfx/lib).
     268.IP JOSM_MODULEPATH
     269Additional Java module path entries.
     270.IP JOSM_PATH
     271Location of the JOSM jar file (default /usr/share/josm/josm.jar).
     272.SH EXAMPLES
     273.nf
     274josm track1.gpx track2.gpx london.osm
     275josm https://www.openstreetmap.org/#map=13/43.2/11.1
     276josm london.osm \-\-selection=http://www.ostertag.name/osm/OSM_errors_node\-duplicate.xml
     277josm 43.2,11.1,43.4,11.4
     278josm render \-i data.osm \-s style.mapcss \-z 16 \-o image.png
     279josm project +init=epsg:4326 +to +init=epsg:3857 <<<"11.232274 50.5685716"
     280josm validate \-i data.osm \-o errors.geojson
     281JAVA_OPTS="\-Xmx1024m" josm
     282.fi
    107283.SH AUTHOR
    108284JOSM was originally designed and coded by Immanuel Scholz,
    109285and is now maintained by the OpenStreetMap community.
    … … Ulf Lamping  
    126302Simon Legner
    127303Raphael Mack
    128304Upliner Mikhalych
     305Gerd Petermann
    129306Vincent Privat
    130307Frederik Ramm
     308Taylor Smock
    131309Dirk Stöcker
     310Stefan Volke
     311Michael Zangl
    132312.PP
    133313Many minor contributions and patches by others; see SVN history
    134314at https://josm.openstreetmap.de/svn/ for details. Use

  • src/org/openstreetmap/josm/gui/MainApplication.java 

    diff --git a/src/org/openstreetmap/josm/gui/MainApplication.java b/src/org/openstreetmap/josm/gui/MainApplication.java
index 9cdc48cc57..c6f538dabb 100644
    a b public class MainApplication {  
    687687                "\trender      "+tr("render data and save the result to an image file")+'\n'+
    688688                "\tproject     " + tr("convert coordinates from one coordinate reference system to another")+ '\n' +
    689689                "\tvalidate    " + tr("validate data") + "\n\n" +
    690                 tr("For details on the {0} and {1} commands, run them with the {2} option.", "render", "project", "--help")+'\n'+
     690                tr("For details on the {0}, {1} and {2} commands, run them with the {3} option.",
     691                        "render", "project", "validate", "--help")+'\n'+
    691692                tr("The remainder of this help page documents the {0} command.", "runjosm")+"\n\n"+
    692693                tr("options")+":\n"+
    693694                "\t--help|-h                                 "+tr("Show this help")+'\n'+