update to 22.12

4 files changed, 57 insertions, 157 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 928a92457bb7..af50f1be55e1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 pkgbase = josm-stable
 	pkgdesc = An editor for OpenStreetMap written in Java. Stable releases
-	pkgver = 22.10
-	pkgrel = 3
+	pkgver = 22.12
+	pkgrel = 1
 	url = https://josm.openstreetmap.de/
-	changelog = josm-stable.changelog
+	changelog = changelog
 	arch = any
 	license = GPL
 	depends = hicolor-icon-theme
@@ -13,32 +13,32 @@ pkgbase = josm-stable
 	provides = josm
 	conflicts = josm
 	conflicts = josm-tested
-	noextract = josm-snapshot-18583.jar
+	noextract = josm-snapshot-18621.jar
 	backup = etc/conf.d/josm
-	source = https://josm.openstreetmap.de/download/josm-snapshot-18583.jar
+	source = https://josm.openstreetmap.de/download/josm-snapshot-18621.jar
 	source = josm.conf.d
-	source = https://josm.openstreetmap.de/export/18583/josm/trunk/native/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop
-	source = https://josm.openstreetmap.de/export/18583/josm/trunk/native/linux/tested/usr/share/man/man1/josm.1
-	source = https://josm.openstreetmap.de/export/18583/josm/trunk/native/linux/tested/usr/share/metainfo/org.openstreetmap.josm.appdata.xml
-	source = https://josm.openstreetmap.de/export/18583/josm/trunk/native/linux/tested/usr/share/icons/hicolor/scalable/apps/org.openstreetmap.josm.svg
-	source = 8x8_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18583/josm/trunk/native/linux/tested/usr/share/icons/hicolor/8x8/apps/org.openstreetmap.josm.png
-	source = 16x16_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18583/josm/trunk/native/linux/tested/usr/share/icons/hicolor/16x16/apps/org.openstreetmap.josm.png
-	source = 22x22_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18583/josm/trunk/native/linux/tested/usr/share/icons/hicolor/22x22/apps/org.openstreetmap.josm.png
-	source = 24x24_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18583/josm/trunk/native/linux/tested/usr/share/icons/hicolor/24x24/apps/org.openstreetmap.josm.png
-	source = 32x32_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18583/josm/trunk/native/linux/tested/usr/share/icons/hicolor/32x32/apps/org.openstreetmap.josm.png
-	source = 36x36_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18583/josm/trunk/native/linux/tested/usr/share/icons/hicolor/36x36/apps/org.openstreetmap.josm.png
-	source = 40x40_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18583/josm/trunk/native/linux/tested/usr/share/icons/hicolor/40x40/apps/org.openstreetmap.josm.png
-	source = 42x42_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18583/josm/trunk/native/linux/tested/usr/share/icons/hicolor/42x42/apps/org.openstreetmap.josm.png
-	source = 48x48_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18583/josm/trunk/native/linux/tested/usr/share/icons/hicolor/48x48/apps/org.openstreetmap.josm.png
-	source = 64x64_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18583/josm/trunk/native/linux/tested/usr/share/icons/hicolor/64x64/apps/org.openstreetmap.josm.png
-	source = 72x72_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18583/josm/trunk/native/linux/tested/usr/share/icons/hicolor/72x72/apps/org.openstreetmap.josm.png
-	source = 80x80_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18583/josm/trunk/native/linux/tested/usr/share/icons/hicolor/80x80/apps/org.openstreetmap.josm.png
-	source = 96x96_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18583/josm/trunk/native/linux/tested/usr/share/icons/hicolor/96x96/apps/org.openstreetmap.josm.png
-	source = 128x128_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18583/josm/trunk/native/linux/tested/usr/share/icons/hicolor/128x128/apps/org.openstreetmap.josm.png
-	source = 192x192_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18583/josm/trunk/native/linux/tested/usr/share/icons/hicolor/192x192/apps/org.openstreetmap.josm.png
-	source = 256x256_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18583/josm/trunk/native/linux/tested/usr/share/icons/hicolor/256x256/apps/org.openstreetmap.josm.png
-	source = 512x512_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18583/josm/trunk/native/linux/tested/usr/share/icons/hicolor/512x512/apps/org.openstreetmap.josm.png
-	b2sums = 1f661090db02278a05f457093ac6ff8aff060c00ead6347e283892e114ea7bf5c0a96279dd645cf97cbb45a3bf8f8919b5523cc847f52b703b19c4bfa909f463
+	source = https://josm.openstreetmap.de/export/18621/josm/trunk/native/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop
+	source = https://josm.openstreetmap.de/export/18621/josm/trunk/native/linux/tested/usr/share/man/man1/josm.1
+	source = https://josm.openstreetmap.de/export/18621/josm/trunk/native/linux/tested/usr/share/metainfo/org.openstreetmap.josm.appdata.xml
+	source = https://josm.openstreetmap.de/export/18621/josm/trunk/native/linux/tested/usr/share/icons/hicolor/scalable/apps/org.openstreetmap.josm.svg
+	source = 8x8_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18621/josm/trunk/native/linux/tested/usr/share/icons/hicolor/8x8/apps/org.openstreetmap.josm.png
+	source = 16x16_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18621/josm/trunk/native/linux/tested/usr/share/icons/hicolor/16x16/apps/org.openstreetmap.josm.png
+	source = 22x22_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18621/josm/trunk/native/linux/tested/usr/share/icons/hicolor/22x22/apps/org.openstreetmap.josm.png
+	source = 24x24_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18621/josm/trunk/native/linux/tested/usr/share/icons/hicolor/24x24/apps/org.openstreetmap.josm.png
+	source = 32x32_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18621/josm/trunk/native/linux/tested/usr/share/icons/hicolor/32x32/apps/org.openstreetmap.josm.png
+	source = 36x36_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18621/josm/trunk/native/linux/tested/usr/share/icons/hicolor/36x36/apps/org.openstreetmap.josm.png
+	source = 40x40_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18621/josm/trunk/native/linux/tested/usr/share/icons/hicolor/40x40/apps/org.openstreetmap.josm.png
+	source = 42x42_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18621/josm/trunk/native/linux/tested/usr/share/icons/hicolor/42x42/apps/org.openstreetmap.josm.png
+	source = 48x48_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18621/josm/trunk/native/linux/tested/usr/share/icons/hicolor/48x48/apps/org.openstreetmap.josm.png
+	source = 64x64_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18621/josm/trunk/native/linux/tested/usr/share/icons/hicolor/64x64/apps/org.openstreetmap.josm.png
+	source = 72x72_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18621/josm/trunk/native/linux/tested/usr/share/icons/hicolor/72x72/apps/org.openstreetmap.josm.png
+	source = 80x80_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18621/josm/trunk/native/linux/tested/usr/share/icons/hicolor/80x80/apps/org.openstreetmap.josm.png
+	source = 96x96_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18621/josm/trunk/native/linux/tested/usr/share/icons/hicolor/96x96/apps/org.openstreetmap.josm.png
+	source = 128x128_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18621/josm/trunk/native/linux/tested/usr/share/icons/hicolor/128x128/apps/org.openstreetmap.josm.png
+	source = 192x192_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18621/josm/trunk/native/linux/tested/usr/share/icons/hicolor/192x192/apps/org.openstreetmap.josm.png
+	source = 256x256_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18621/josm/trunk/native/linux/tested/usr/share/icons/hicolor/256x256/apps/org.openstreetmap.josm.png
+	source = 512x512_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18621/josm/trunk/native/linux/tested/usr/share/icons/hicolor/512x512/apps/org.openstreetmap.josm.png
+	b2sums = c462434be5bd664cb1799179183c4a185b1ca77fc49d773b83f8fc0ab68ccdf6d6a78c76bfd51bffdccffed86d2629b80d9a200b5929424a36c02ade53599630
 	b2sums = 6ab22295febf20e8124da5f224d28722210345b33a091b948dd02e1897ab7767cdf6b65ee42bf777f3d52dfb88e14b7af9a013ee60e6949964618bb33416b6ee
 	b2sums = d3a5e0204d0188e72eed65e71edd079b5aa025b82f13c515605f7d5bb9f96fc93e4a24c9eea76c6c4027f54f1c449cda811f5c59e0f2ab54975ab3b1bf221ee7
 	b2sums = 095c9a52e8efaf90a41d322c89cee6828ff05a20999a864f438e1b8c101382588e58f455f8339235493a27a16326b9114add69aeab9709e9bf8a28d1ce5594d5
diff --git a/PKGBUILD b/PKGBUILD
index 96593a11bb60..38223612b2b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,9 +5,9 @@
 pkgname=josm-stable
 _name=josm
 _app_id="org.openstreetmap.${_name}"
-pkgver=22.10
-pkgrel=3
-_commit_id=18583
+pkgver=22.12 # REMEMBER TO UPDATE CHANGELOG!
+pkgrel=1
+_commit_id=18621
 pkgdesc="An editor for OpenStreetMap written in Java. Stable releases"
 arch=('any')
 url="https://josm.openstreetmap.de/"
@@ -16,7 +16,7 @@ depends=('hicolor-icon-theme' 'java-runtime>=11' 'ttf-font' 'sh')
 conflicts=('josm' 'josm-tested')
 provides=('josm')
 makedepends=()
-changelog=$pkgname.changelog
+changelog=changelog
 backup=('etc/conf.d/josm')
 source=("https://josm.openstreetmap.de/download/${_name}-snapshot-${_commit_id}.jar"
         "${_name}.conf.d"
@@ -33,7 +33,7 @@ done
 source=("${source[@]}" "${source_icons[@]}")
 
 noextract=(${_name}-snapshot-${_commit_id}.jar)
-b2sums=('1f661090db02278a05f457093ac6ff8aff060c00ead6347e283892e114ea7bf5c0a96279dd645cf97cbb45a3bf8f8919b5523cc847f52b703b19c4bfa909f463'
+b2sums=('c462434be5bd664cb1799179183c4a185b1ca77fc49d773b83f8fc0ab68ccdf6d6a78c76bfd51bffdccffed86d2629b80d9a200b5929424a36c02ade53599630'
         '6ab22295febf20e8124da5f224d28722210345b33a091b948dd02e1897ab7767cdf6b65ee42bf777f3d52dfb88e14b7af9a013ee60e6949964618bb33416b6ee'
         'd3a5e0204d0188e72eed65e71edd079b5aa025b82f13c515605f7d5bb9f96fc93e4a24c9eea76c6c4027f54f1c449cda811f5c59e0f2ab54975ab3b1bf221ee7'
         '095c9a52e8efaf90a41d322c89cee6828ff05a20999a864f438e1b8c101382588e58f455f8339235493a27a16326b9114add69aeab9709e9bf8a28d1ce5594d5'
diff --git a/changelog b/changelog
new file mode 100644
index 000000000000..a97878d021c2
--- /dev/null
+++ b/changelog
@@ -0,0 +1,25 @@
+# 2023-01-01: Stable release 18621 (22.12)
+
+Major enhancements
+	#21605: Add tabs to Image Viewer Dialog. This allows users to have multiple geotagged image layers, and quickly switch between them. 
+Medium enhancements
+	#22337: View GPX waypoint images also in Image Viewer Dialog
+	#22504: Enhance Align Nodes in Circle tool: When multiple ways are selected and they are not connected in a ring, then each of the selected closed ways will be circularized. 
+Minor enhancements
+	#22489: Display JOSMs Mastodon account in about dialog
+	#22487: Don't re-enable object hover preview on layer change
+	r18598: Set Look And Feel back to default if an external Look and Feel blocks the JOSM start
+	#22515: Fix shortcuts for search string icons on toolbar made with Search tool
+	#20528: Allow to copy from welcome screen
+	#21324: Display correct number x of tags in Command stack when pasting tags instead of always "1" ("pasting x tags to y objects")
+	#13097: Allow Angle Snapping in WGS84 projection
+	#22064: Make Save Session available outside of Expert Mode 
+Add/improve/fix/change Internal Presets, Map Paint Style and Validation rules
+	#19826: Fix cycleway rendering in combination with oneway:bicycle=no and for cycleway:both
+	#22375: Add subdivision Scotland (GB-SCT) and all subdivisions of Belgium - Flanders (BE-VLG), Wallonia (BE-WAL), Brussels (BE-BRU) to internal boundaries file
+	r18597: Update power=transformer preset: removed transformer=auto (replaced by windings:auto=true) and transformer=traction (replaced by transformer=main)
+	r18597: Update landuse=residential preset for newer in-use values: adds halting_site, single_family, and trailer_park 
+
+More minor bug fixes, enhancements, stability improvements, translation updates, code improvements and code documentation, see SVN log messages of milestone 22.12:
+
+https://josm.openstreetmap.de/log/josm/?rev=18621&stop_rev=18584
diff --git a/josm-stable.changelog b/josm-stable.changelog
deleted file mode 100644
index 50b1a0c02367..000000000000
--- a/josm-stable.changelog
+++ /dev/null
@@ -1,125 +0,0 @@
-2022-09-30: Stable release 18565 (22.09)
-
-    Medium enhancements
-        Fix #22333: Allow delete + move up/down actions in filter dialog to act on all selected filters (patch by Woazboat, modified)
-        Fix #22309: Add option to merge by default when dragging nodes (patch by Woazboat) (advanced preference only, edit.move.merge-by-default) 
-    Minor enhancements
-        Better tracking of suppressed exceptions in EDT and worker threads 
-    Add/improve/fix/change Internal Presets, Map Paint Style and Validation rules
-        Fix #22397: Warn about temporary image URLs starting with https://westnordost.de/p/
-        Fix #19340: Validator complains about maxweightrating:X:conditional
-        Fix #22359: Change default color of landuse=railway and landuse=quarry as they were too similar to untagged ways color (#808080)
-        Fix #22379: Warn about parking=yes, add parking=layby
-        Fix #22367, see #11499: Don't warn anymore about payment:credit_cards=yes and payment:debit_cards=yes, Reduce warning of payment:electronic_purses=yes and payment:cryptocurrencies=yes to info level
-        Fix #20716: Search for missing power line support features (patch by gaben, modified)
-        Fix #21396: Add/ignore popular tags
-            Ignore: maxspeed:type
-            Ignore (TODOs): advertising=board, amenity=loading_dock, amenity=parcel_locker, amenity=payment_terminal, barrier=sliding_gate, boundary=forest_compartment, craft=grinding_mill, emergency=access_point, healthcare:speciality=general, hedge=hedge_bank, historic=bomb_crater, indoor=area, leisure=sports_hall, man_made=courtyard, man_made=gantry, military=trench, natural=crevasse, path=crossing, railway=proposed, road_marking=solid_stop_line, oneway (F::oneway/S:oneway:, but this probably ought to have better software support)
-            Issues: Suggest paving_stones:length/paving_stones:width for paving_stones:<digits>, indicate type="turnlanes:turns" is deprecated
-            Preset updates: Modify lit to be more than yes/no, add rock to surfaces, add none to religions (in other_religitons), add locked, add pavilion to building, add shop as possible value for entrance, add product as an optional key for man_made=works, add fuel as possible value for vending 
-        Fix #22310: Rename "Parking Entrance" preset to "Parking Entrance/Exit"
-        Fix #22338: Warn about unnecessary area=yes on boundary, indoor, office, and place (patch by Famlam)
-        Fix #22295, see #18374: Don't warn about "collection_times with amenity=recycling. Probably opening_hours is meant." for cases where opening_hours is set.
-        Fix #22335: Deprecate toilet in favor of toilets
-        Fix #22336, see #13391: Autofix wood=deciduous to leaf_cycle=deciduous 
-    More minor bug fixes, enhancements, stability improvements, translation updates, code improvements and code documentation, see SVN log messages of milestone 22.09 
-
-2022-08-30: Stable release 18543 (22.08)
-
-    Medium enhancements
-        #22307: Add popup menu for notes (patch by Woazboat) 
-    Minor enhancements
-        #22250: Abort on XML error elements
-        #22160: Retry on various SocketExceptions 
-    Add/improve/fix/change Internal Presets, Map Paint Style and Validation rules
-        #21046: Add description to the default naming tags for relations
-        #20682: Add natural=arete
-        #21836: Add some power/voltage validation rules
-        #22225: Draw unclosed leisure=track sport=running without area style 
-    More minor bug fixes, enhancements, stability improvements, translation updates, code improvements and code documentation, see SVN log messages of milestone 22.08 
-
-2022-08-02: Stable release 18531 (22.07)
-
-    Medium enhancements
-        Vector layers can now be programmatically filtered (no support in UI yet) 
-    Minor enhancements
-        #22188: Add java.compiler module for scripting
-        #22176: Add subdivisions for the Federated States of Micronesia (patch by westnordost, modified)
-        Some performance fixes
-        Dependency updates (see r18514 for what changed)
-        Improve JOSM launchers for Linux platforms (may work on other Unix derivatives) (patch by sebastic) 
-    Add/improve/fix/change Internal Presets, Map Paint Style and Validation rules
-        #22048: building=construction preset missing some values (patch by skyper, modified)
-        #22102: Add a warning if surface does not match tracktype (patch by mkoniecz)
-        #22120: Add school=entrance to deprecation warnings
-        #21235: Stop whitelisting footway=* and add footway=separate to blacklist candidates for sidewalk=* (patch by JeroenHoek)
-        #22166: Ignore more barrier types for psv suspicious tag combination
-        #22225: Don't warn about sport=running on unclosed ways
-        #21630: Drop the "Riverbank" template (patch by zelonewolf) 
-    More minor bug fixes, enhancements, stability improvements, translation updates, code improvements and code documentation, see SVN log messages of milestone 22.07 
-
-2022-07-07: Stable release 18513 (22.06)
-
-    (First version r18511 was released as stable version and due to major bug version r18513 was released as hotfix.)
-
-    Minor enhancements
-        Various reductions to memory allocations
-        #21720: Remove vi localization
-        #22088: Debian start script doesn't ensure that the chosen java path is executable
-        #20823: Reject uploads that do not follow either the comment policy or the source policy
-        #21600: Fire selectionChanged events when setting/updating notes to ensure that notes are properly selected
-        #21794: Allow for cases where tags can be URL or key values in Tag2Link
-        #21813: Improve marker handling in sessions (patch by Bjoeni)
-        #21923: Improve session workflow / Add "save session" (patch by Bjoeni) 
-    Add/improve/fix/change Internal Presets, Map Paint Style and Validation rules
-        #22187: "Empty relation" and "Role of relation member does not match template expression" shared the same error code, but had two different severities
-        #22172: Don't warn about barrier=berm looking like barrier=kerb
-        #22154: Add incline, surface, and fee to the slipway preset
-        #21997: Add general preset for power=generator (patch by skyper) 
-    More minor bug fixes, enhancements, stability improvements, translation updates, code improvements and code documentation, see SVN log messages of milestone 22.06 
-
-2022-05-29: Stable release 18463 (22.05)
-
-(Stable release 22.04 was skipped.)
-
-    Major enhancements
-        #22065: Mac now uses ⌘ instead of ctrl for most `Select` map mode actions (including `Rotate` and `Scale`) 
-    Minor enhancements
-        #17288: Notes progress bar shows no progress (patch by gaben, modified)
-        #21792: Request focus in Split Way window segment list (patch by gaben)
-        #22022: Allow for recursive geojson parsing
-        #17906: When dragging and dropping relation members to the same position, they are removed
-        #21935: Avoid leaking Authorization headers on redirects in HttpClient 
-    Add/improve/fix/change Internal Presets, Map Paint Style and Validation rules
-        #22084: Remove obsolete payment methods payment:ep_monedero and payment:ep_moneo
-        #22073: Optimized regexes (string starts with, ends with, contains) do not work
-        #22072: Add tunnel:name
-        #21973: Add building:levels:underground (patch by skyper)
-        #22033: Don't warn about "alternative name without name" in case of NHD:subbasin_name=Des Moines Headwaters|Upper Des Moines|East Fork Des Moines
-        #22009: Fix incorrect warning message *:lanes without highway (instead of lanes) (patch by skyper)
-        #22039: Remove warning about construction without highway/railway/waterway/building/landuse as it produces too much false positives 
-    More minor bug fixes, enhancements, stability improvements, translation updates, code improvements and code documentation, see SVN log messages of milestone 22.05 
-
-2022-04-05: Stable release 18427 (22.03)
-
-    Minor enhancements
-        #21825: Delete relations by default when all members are deleted
-        #21953: Overpass now correctly remembers custom URLs 
-    Add/improve/fix/change Internal Presets, Map Paint Style and Validation rules
-        #20960: Warn about construction=* without or conflicting primary tag
-        #20963: Update preset for landuse=construction and add building=construction
-        #21954: Change surface=DecoTurf to surface=acrylic 
-    More minor bug fixes, enhancements, stability improvements, translation updates, code improvements and code documentation, see SVN log messages of milestone 22.03 
-
-2022-03-06: Stable release 18387 (22.02)
-
-(Stable release 22.01 was skipped.)
-
-    Minor enhancements
-        #21850: Improve support for {apikey} replacement for WMTS and WMS. 
-    Add/improve/fix/change Internal Presets, Map Paint Style and Validation rules
-        #21859: Move addr:place into optional
-        #21866: Improve railway gauge values and add validator tests for them
-        #21853: Improve interval validator test
-        #21736: Fix a false positive with oneway=yes, lanes:backward or lanes:forward, and oneway:* 
-    More minor bug fixes, enhancements, stability improvements, translation updates, code improvements and code documentation, see SVN log messages of milestone 22.02