]> git.openstreetmap.org Git - nominatim.git/log
nominatim.git
9 months agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Mon, 18 Mar 2024 13:37:25 +0000 (14:37 +0100)]
Merge remote-tracking branch 'upstream/master'

9 months agoMerge pull request #3367 from lonvia/address-word-counts
Sarah Hoffmann [Mon, 18 Mar 2024 13:32:26 +0000 (14:32 +0100)]
Merge pull request #3367 from lonvia/address-word-counts

Introduce word usage statistics for addresses

9 months agouse address counts for improving index lookup
Sarah Hoffmann [Sat, 16 Mar 2024 15:56:04 +0000 (16:56 +0100)]
use address counts for improving index lookup

9 months agoadd penalty for single words that look like stop words
Sarah Hoffmann [Sat, 16 Mar 2024 10:26:00 +0000 (11:26 +0100)]
add penalty for single words that look like stop words

9 months agoadd address counts to tokens
Sarah Hoffmann [Fri, 15 Mar 2024 09:54:13 +0000 (10:54 +0100)]
add address counts to tokens

9 months agoextend word statistics to address index
Sarah Hoffmann [Wed, 13 Mar 2024 14:10:25 +0000 (15:10 +0100)]
extend word statistics to address index

Word frequency in names is not sufficient to interpolate word
frequency in the address because names of towns, states etc. are
much more frequently used than, say street names.

9 months agoMerge pull request #3363 from mtmail/docs-link-correction
Sarah Hoffmann [Thu, 14 Mar 2024 16:46:34 +0000 (17:46 +0100)]
Merge pull request #3363 from mtmail/docs-link-correction

Docs: correct URL of an internal link

9 months agodocs: correct URL of an internal link
marc tobias [Thu, 14 Mar 2024 12:50:24 +0000 (13:50 +0100)]
docs: correct URL of an internal link

9 months agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Tue, 12 Mar 2024 16:11:02 +0000 (17:11 +0100)]
Merge remote-tracking branch 'upstream/master'

9 months agoadd geometry details for postcode area output
Sarah Hoffmann [Tue, 12 Mar 2024 12:51:29 +0000 (13:51 +0100)]
add geometry details for postcode area output

9 months agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Tue, 12 Mar 2024 09:05:43 +0000 (10:05 +0100)]
Merge remote-tracking branch 'upstream/master'

9 months agoMerge pull request #3362 from lonvia/find-postcode-areas
Sarah Hoffmann [Tue, 12 Mar 2024 09:05:16 +0000 (10:05 +0100)]
Merge pull request #3362 from lonvia/find-postcode-areas

Lookup postcode areas for postcode results

9 months agoremove BDD test for place_id details
Sarah Hoffmann [Mon, 11 Mar 2024 20:07:14 +0000 (21:07 +0100)]
remove BDD test for place_id details

It is not reliable.

9 months agoexclude postcode test from legacy and php
Sarah Hoffmann [Mon, 11 Mar 2024 14:28:57 +0000 (15:28 +0100)]
exclude postcode test from legacy and php

9 months agopostcodes: exclude seen places later
Sarah Hoffmann [Mon, 11 Mar 2024 14:18:57 +0000 (15:18 +0100)]
postcodes: exclude seen places later

The seen list will only have the postcode area when available but
we want the postcode point excluded as well if the area has been seen.

9 months agolook for postcode areas when finding something in the postcode table
Sarah Hoffmann [Mon, 11 Mar 2024 13:48:24 +0000 (14:48 +0100)]
look for postcode areas when finding something in the postcode table

9 months agoprepare release 4.4.0 v4.4.0
Sarah Hoffmann [Thu, 7 Mar 2024 10:43:01 +0000 (11:43 +0100)]
prepare release 4.4.0

9 months agoMerge pull request #3358 from lonvia/pg-module-for-pg16
Sarah Hoffmann [Thu, 7 Mar 2024 10:39:24 +0000 (11:39 +0100)]
Merge pull request #3358 from lonvia/pg-module-for-pg16

Fix compilation of legacy module for PostgreSQL 16

9 months agoactions: run legacy test against newest postgresql 16
Sarah Hoffmann [Tue, 5 Mar 2024 15:33:35 +0000 (16:33 +0100)]
actions: run legacy test against newest postgresql 16

9 months agofix compilation of PG module for PostgreSQL 16
Sarah Hoffmann [Tue, 5 Mar 2024 15:31:02 +0000 (16:31 +0100)]
fix compilation of PG module for PostgreSQL 16

This version requires an additional include for the macros used.

9 months agoMerge pull request #3356 from lonvia/use-date-from-osm2pgsql-prop
Sarah Hoffmann [Tue, 5 Mar 2024 14:32:16 +0000 (15:32 +0100)]
Merge pull request #3356 from lonvia/use-date-from-osm2pgsql-prop

Use import date from osm2pgsql property table if available

9 months agouse import date from osm2pgsql property table if available
Sarah Hoffmann [Tue, 5 Mar 2024 10:33:32 +0000 (11:33 +0100)]
use import date from osm2pgsql property table if available

9 months agoMerge pull request #3353 from mtmail/add-codespell
Sarah Hoffmann [Mon, 4 Mar 2024 13:02:00 +0000 (14:02 +0100)]
Merge pull request #3353 from mtmail/add-codespell

Github Actions: add codespell linter, warn only

9 months agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Mon, 4 Mar 2024 08:36:25 +0000 (09:36 +0100)]
Merge remote-tracking branch 'upstream/master'

9 months agoGithub Actions: add codespell linter, warn only
marc tobias [Sun, 3 Mar 2024 23:17:57 +0000 (00:17 +0100)]
Github Actions: add codespell linter, warn only

9 months agoMerge pull request #3350 from lonvia/improve-postcode-handling
Sarah Hoffmann [Wed, 28 Feb 2024 17:45:31 +0000 (18:45 +0100)]
Merge pull request #3350 from lonvia/improve-postcode-handling

Improve handling of postcode areas

9 months agoMerge pull request #3349 from lonvia/remove-way-geometry-table-after-import
Sarah Hoffmann [Wed, 28 Feb 2024 16:47:34 +0000 (17:47 +0100)]
Merge pull request #3349 from lonvia/remove-way-geometry-table-after-import

Drop lower-rank-ways index after import

9 months agoimprove display name for postcodes
Sarah Hoffmann [Tue, 27 Feb 2024 15:58:57 +0000 (16:58 +0100)]
improve display name for postcodes

Don't add the postcode again in the list of address details and
make sure that the result proper always comes before anything else
independently of the address rank.

9 months agofor postcodes use rank_search as base rank for finding addresses
Sarah Hoffmann [Tue, 27 Feb 2024 15:57:35 +0000 (16:57 +0100)]
for postcodes use rank_search as base rank for finding addresses

The rank_address reflects the position in the address which is
usually lower than what one would expect for a postcode area.

9 months agodrop lower-rank-ways index after import
Sarah Hoffmann [Wed, 28 Feb 2024 13:35:56 +0000 (14:35 +0100)]
drop lower-rank-ways index after import

The index becomes quite big and is only needed during import
because the full geometry import does not exist yet.

9 months agoMerge pull request #3342 from mtmail/tyops
Sarah Hoffmann [Wed, 28 Feb 2024 13:25:16 +0000 (14:25 +0100)]
Merge pull request #3342 from mtmail/tyops

Correct some typos

9 months agoMerge pull request #3347 from lonvia/tweak-boundary-imports
Sarah Hoffmann [Wed, 28 Feb 2024 13:22:08 +0000 (14:22 +0100)]
Merge pull request #3347 from lonvia/tweak-boundary-imports

Assorted style tweaks

9 months agoMerge pull request #3346 from lonvia/reduce-artificial-importance
Sarah Hoffmann [Wed, 28 Feb 2024 13:21:46 +0000 (14:21 +0100)]
Merge pull request #3346 from lonvia/reduce-artificial-importance

Reduce default importance

9 months agoMerge pull request #3345 from lonvia/simplify-large-geometries
Sarah Hoffmann [Wed, 28 Feb 2024 11:06:49 +0000 (12:06 +0100)]
Merge pull request #3345 from lonvia/simplify-large-geometries

Simplify very large polygons that are not used in addresses

9 months agoMerge pull request #3344 from lonvia/osm2pgsql-new-middle
Sarah Hoffmann [Wed, 28 Feb 2024 11:06:33 +0000 (12:06 +0100)]
Merge pull request #3344 from lonvia/osm2pgsql-new-middle

Update osm2pgsql to latest 1.11.0 and add support for new middle format

9 months agoadd support for new middle table format of osm2pgsql
Sarah Hoffmann [Thu, 15 Feb 2024 15:19:56 +0000 (16:19 +0100)]
add support for new middle table format of osm2pgsql

Functions are adapted according to the format detected from the
osm2pgsql property table.

9 months agosimplify very large polygons non used in addresses
Sarah Hoffmann [Wed, 14 Feb 2024 10:26:33 +0000 (11:26 +0100)]
simplify very large polygons non used in addresses

Polygons with rank_address = 0 are only used in search and (rarely)
for reverse lookup. Geometries do not need to be precise for that
because topology does not matter. OSM has some very large polygons
of natural features with sizes of more than 10MB. Simplify these
polygons to keep the database and indexes smaller.

9 months agoreduce importance when computed from search rank
Sarah Hoffmann [Fri, 9 Feb 2024 08:16:11 +0000 (09:16 +0100)]
reduce importance when computed from search rank

9 months agodo not send outdated parameters to osm2pgsql flex
Sarah Hoffmann [Wed, 14 Feb 2024 15:07:27 +0000 (16:07 +0100)]
do not send outdated parameters to osm2pgsql flex

9 months agoupdate osm2pgsql to 1.11.0
Sarah Hoffmann [Wed, 14 Feb 2024 14:19:26 +0000 (15:19 +0100)]
update osm2pgsql to 1.11.0

9 months agodrop more railway tags
Sarah Hoffmann [Thu, 15 Feb 2024 16:00:56 +0000 (17:00 +0100)]
drop more railway tags

9 months agodrop amenity=parking_space/entrance objects
Sarah Hoffmann [Thu, 15 Feb 2024 15:26:53 +0000 (16:26 +0100)]
drop amenity=parking_space/entrance objects

Parking is sufficiently covered with amenity=parking.

9 months agodrop boundary=land_area
Sarah Hoffmann [Wed, 14 Feb 2024 11:07:22 +0000 (12:07 +0100)]
drop boundary=land_area

Usually a version of administrative boundaries without ocean area.
Resulting polygons are pretty larrge and having the boundaries
should be enough.

9 months agoimport leisure=natural_reserve as fallback only
Sarah Hoffmann [Wed, 14 Feb 2024 10:47:10 +0000 (11:47 +0100)]
import leisure=natural_reserve as fallback only

About half of the natural reserves have a double tagging with
boundary=protected_area. Avoid importing these objects twice.

9 months agoprefer min() function over if construct
Sarah Hoffmann [Tue, 27 Feb 2024 08:26:50 +0000 (09:26 +0100)]
prefer min() function over if construct

Fixes a linter complaint.

9 months agoCorrect some typos
marc tobias [Mon, 26 Feb 2024 17:13:30 +0000 (18:13 +0100)]
Correct some typos

10 months agoMerge pull request #3341 from mtmail/remove-php-faq-entries
Sarah Hoffmann [Wed, 21 Feb 2024 07:56:18 +0000 (08:56 +0100)]
Merge pull request #3341 from mtmail/remove-php-faq-entries

PHP related FAQ entries are no longer needed

10 months agoPHP related FAQ entries are no longer needed
marc tobias [Tue, 20 Feb 2024 17:55:02 +0000 (18:55 +0100)]
PHP related FAQ entries are no longer needed

10 months agoMerge pull request #3340 from lonvia/fix-lua-liniting-issues
Sarah Hoffmann [Tue, 20 Feb 2024 11:00:01 +0000 (12:00 +0100)]
Merge pull request #3340 from lonvia/fix-lua-liniting-issues

Fix some issues in the style files found by luacheck

10 months agofix issues found by luacheck
Sarah Hoffmann [Tue, 20 Feb 2024 09:43:51 +0000 (10:43 +0100)]
fix issues found by luacheck

The variable shadowing causes bad results when used with LuaJIT.

10 months agoMerge pull request #3339 from lonvia/python-frontend-as-default
Sarah Hoffmann [Tue, 20 Feb 2024 09:17:21 +0000 (10:17 +0100)]
Merge pull request #3339 from lonvia/python-frontend-as-default

Switch to Python frontend as the default

10 months agoswitch Ubuntu installation scripts to Python frontend
Sarah Hoffmann [Mon, 19 Feb 2024 16:08:23 +0000 (17:08 +0100)]
switch Ubuntu installation scripts to Python frontend

10 months agoAPI debug: properly escape non-highlighted code
Sarah Hoffmann [Fri, 16 Feb 2024 16:27:28 +0000 (17:27 +0100)]
API debug: properly escape non-highlighted code

10 months agobdd: be more verbose on HTML parsing error
Sarah Hoffmann [Fri, 16 Feb 2024 15:40:24 +0000 (16:40 +0100)]
bdd: be more verbose on HTML parsing error

10 months agoalso switch unit tests for cli
Sarah Hoffmann [Fri, 16 Feb 2024 10:17:43 +0000 (11:17 +0100)]
also switch unit tests for cli

10 months agoactions: make php the legacy tests
Sarah Hoffmann [Thu, 15 Feb 2024 18:54:32 +0000 (19:54 +0100)]
actions: make php the legacy tests

10 months agoupdate documentation to recommend Python frontend
Sarah Hoffmann [Thu, 15 Feb 2024 18:48:32 +0000 (19:48 +0100)]
update documentation to recommend Python frontend

10 months agomake Python frontend default and PHP optional
Sarah Hoffmann [Thu, 15 Feb 2024 18:44:04 +0000 (19:44 +0100)]
make Python frontend default and PHP optional

10 months agoMerge pull request #3338 from lonvia/remove-nested-cli-groups
Sarah Hoffmann [Fri, 16 Feb 2024 18:27:25 +0000 (19:27 +0100)]
Merge pull request #3338 from lonvia/remove-nested-cli-groups

Add documentation for importing without superuser rights

10 months agoactions: switch no-superuser test to PostgreSQL 16
Sarah Hoffmann [Fri, 16 Feb 2024 11:05:12 +0000 (12:05 +0100)]
actions: switch no-superuser test to PostgreSQL 16

The new premission restrictions on the public schema took only
place in PG15, so the previsouly used PG14 does not show any issues.

10 months agoadd documentation for non-superuser import
Sarah Hoffmann [Fri, 16 Feb 2024 11:03:58 +0000 (12:03 +0100)]
add documentation for non-superuser import

10 months agoremove unnecessary nested group in CLI import command
Sarah Hoffmann [Fri, 16 Feb 2024 10:32:50 +0000 (11:32 +0100)]
remove unnecessary nested group in CLI import command

10 months agoMerge pull request #3333 from lonvia/set-empty-extratags-to-null
Sarah Hoffmann [Thu, 8 Feb 2024 13:26:49 +0000 (14:26 +0100)]
Merge pull request #3333 from lonvia/set-empty-extratags-to-null

Extratags should become null when empty

10 months agoextratags should become null when empty
Sarah Hoffmann [Thu, 8 Feb 2024 09:21:48 +0000 (10:21 +0100)]
extratags should become null when empty

Removing the artifical entries in the extratags may lead to
an empty hstore. Set it to null in that case.

Fixes #3055.

10 months agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Wed, 7 Feb 2024 10:02:23 +0000 (11:02 +0100)]
Merge remote-tracking branch 'upstream/master'

10 months agoMerge pull request #3332 from lonvia/improve-cutting-of-result-list
Sarah Hoffmann [Wed, 7 Feb 2024 09:50:32 +0000 (10:50 +0100)]
Merge pull request #3332 from lonvia/improve-cutting-of-result-list

Prefilter bad results before adding details and reranking

10 months agoprefilter bad results before adding details and reranking
Sarah Hoffmann [Tue, 6 Feb 2024 19:29:48 +0000 (20:29 +0100)]
prefilter bad results before adding details and reranking

Move the first cutting of the result list before reranking
by result match. This means that results with significantly
less importance are removed early and independently of the
fact how well they match the original query.

Fixes #3266.

10 months agoMerge pull request #3331 from lonvia/fix-word-table-rights
Sarah Hoffmann [Tue, 6 Feb 2024 19:21:25 +0000 (20:21 +0100)]
Merge pull request #3331 from lonvia/fix-word-table-rights

Properly grant rights to read-only user when switching out word table

10 months agoproperly grant rights to read-only user when switching out word table
Sarah Hoffmann [Tue, 6 Feb 2024 16:30:01 +0000 (17:30 +0100)]
properly grant rights to read-only user when switching out word table

10 months agodocs: mark layer parameter as python-only
Sarah Hoffmann [Tue, 6 Feb 2024 14:59:04 +0000 (15:59 +0100)]
docs: mark layer parameter as python-only

10 months agoMerge pull request #3328 from lonvia/word-count-into-new-table
Sarah Hoffmann [Mon, 5 Feb 2024 10:58:11 +0000 (11:58 +0100)]
Merge pull request #3328 from lonvia/word-count-into-new-table

Recreate word table when refreshing counts

10 months agorecreate word table when refreshing counts
Sarah Hoffmann [Sun, 4 Feb 2024 15:43:33 +0000 (16:43 +0100)]
recreate word table when refreshing counts

The counting touches a large part of the word table, leaving
bloated tables and indexes. Thus recreate the table instead and
swap it in.

10 months agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Mon, 29 Jan 2024 18:44:46 +0000 (19:44 +0100)]
Merge remote-tracking branch 'upstream/master'

10 months agoavoid LookupAny with address and too many name tokens
Sarah Hoffmann [Mon, 29 Jan 2024 15:52:14 +0000 (16:52 +0100)]
avoid LookupAny with address and too many name tokens

The index for nameaddress_vector has grown so large that PostgreSQL
will resort to a sequential scan if there are too many items
in the LookupAny list.

10 months agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Mon, 29 Jan 2024 08:14:34 +0000 (09:14 +0100)]
Merge remote-tracking branch 'upstream/master'

10 months agoprint any collected debug output when returning a timeout error
Sarah Hoffmann [Sun, 28 Jan 2024 19:20:25 +0000 (20:20 +0100)]
print any collected debug output when returning a timeout error

10 months agoMerge pull request #3321 from lonvia/remove-duplicate-partials
Sarah Hoffmann [Sun, 28 Jan 2024 19:32:58 +0000 (20:32 +0100)]
Merge pull request #3321 from lonvia/remove-duplicate-partials

Improvements to query parsing

10 months agohousenumber-only searches cannot be combined with qualifiers
Sarah Hoffmann [Sun, 28 Jan 2024 17:09:48 +0000 (18:09 +0100)]
housenumber-only searches cannot be combined with qualifiers

10 months agoadjust rankings for housenumber-only searches
Sarah Hoffmann [Sun, 28 Jan 2024 16:54:22 +0000 (17:54 +0100)]
adjust rankings for housenumber-only searches

A normal address search with housenumber will use name rankings for
the street name. This is slightly different than weighing for
address parts. Use the same ranking for the first part of the
address for housenumber-only searches to make sure that penalties
remain comparable.

10 months agoalways add a penalty for name + address search fallback
Sarah Hoffmann [Sun, 28 Jan 2024 10:48:03 +0000 (11:48 +0100)]
always add a penalty for name + address search fallback

If there already was a search by full names, the search is likely
a repeatition that yields the same results, only running slower.

10 months agodisallow category tokens in the middle of a query string
Sarah Hoffmann [Sun, 28 Jan 2024 10:35:30 +0000 (11:35 +0100)]
disallow category tokens in the middle of a query string

This already worked for left-to-right readings and now is also
implemented for right-to-left reading. A qualifier must always be
before or after the name.

10 months agoprotect against very frequent bad partials
Sarah Hoffmann [Sat, 27 Jan 2024 20:26:03 +0000 (21:26 +0100)]
protect against very frequent bad partials

10 months agoavoid duplicates in the list of partial tokens for a query
Sarah Hoffmann [Sat, 27 Jan 2024 19:48:40 +0000 (20:48 +0100)]
avoid duplicates in the list of partial tokens for a query

This messes with the estimates for expected results.

10 months agoMerge pull request #3320 from lonvia/fix-timeout-return-code
Sarah Hoffmann [Sun, 28 Jan 2024 09:37:37 +0000 (10:37 +0100)]
Merge pull request #3320 from lonvia/fix-timeout-return-code

Fix returned HTTP error when query runs too long

10 months agocatch special async timeout error in servers
Sarah Hoffmann [Sat, 27 Jan 2024 18:53:13 +0000 (19:53 +0100)]
catch special async timeout error in servers

In Python <= 3.10 this is not yet the same as TimeoutError.

Fixes #3303.

10 months agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Fri, 26 Jan 2024 18:52:20 +0000 (19:52 +0100)]
Merge remote-tracking branch 'upstream/master'

10 months agoMerge pull request #3317 from lonvia/postcodes-for-highway-areas
Sarah Hoffmann [Fri, 26 Jan 2024 18:51:02 +0000 (19:51 +0100)]
Merge pull request #3317 from lonvia/postcodes-for-highway-areas

Search postcodes for highway areas around the area

10 months agosearch postcodes for highway areas around the area
Sarah Hoffmann [Fri, 26 Jan 2024 16:26:29 +0000 (17:26 +0100)]
search postcodes for highway areas around the area

So far the code would only accept postcodes that are inside the area.

Fixes #3304.

11 months agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Wed, 17 Jan 2024 09:48:11 +0000 (10:48 +0100)]
Merge remote-tracking branch 'upstream/master'

11 months agoMerge pull request #3301 from lonvia/fix-class-search-regression
Sarah Hoffmann [Wed, 17 Jan 2024 09:47:35 +0000 (10:47 +0100)]
Merge pull request #3301 from lonvia/fix-class-search-regression

Interpret stand-alone special terms always as near term

11 months agointerpret stand-alone special terms always as near term
Sarah Hoffmann [Tue, 16 Jan 2024 16:19:21 +0000 (17:19 +0100)]
interpret stand-alone special terms always as near term

Fixes #3298.

11 months agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Mon, 8 Jan 2024 17:49:40 +0000 (18:49 +0100)]
Merge remote-tracking branch 'upstream/master'

11 months agoMerge pull request #3293 from lonvia/rematch-against-country-code
Sarah Hoffmann [Mon, 8 Jan 2024 17:48:32 +0000 (18:48 +0100)]
Merge pull request #3293 from lonvia/rematch-against-country-code

Add country code to words to be rematched

11 months agoadd country code to words to be rematched
Sarah Hoffmann [Mon, 8 Jan 2024 11:23:23 +0000 (12:23 +0100)]
add country code to words to be rematched

11 months agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Sun, 7 Jan 2024 19:42:55 +0000 (20:42 +0100)]
Merge remote-tracking branch 'upstream/master'

11 months agoMerge pull request #3292 from lonvia/faster-country-search
Sarah Hoffmann [Sun, 7 Jan 2024 19:42:20 +0000 (20:42 +0100)]
Merge pull request #3292 from lonvia/faster-country-search

Speed up country search

11 months agowhen a country is in the results, restrict further searches to places
Sarah Hoffmann [Sun, 7 Jan 2024 16:29:12 +0000 (17:29 +0100)]
when a country is in the results, restrict further searches to places

A country search result usually comes with a very high importance.
As a result only other very well known places will show up together
with country results and that means only places with lower address
ranks. Name searches for country names tend to yield a lot of POI
results because the country name is part of the name
(think "embassy of Sweden"). By excluding POIs from further searches,
the search is sped up quite a bit.

11 months agodump params in log view
Sarah Hoffmann [Sun, 7 Jan 2024 14:37:53 +0000 (15:37 +0100)]
dump params in log view

11 months agoprioritize country searches when penaly is equal
Sarah Hoffmann [Sun, 7 Jan 2024 10:11:11 +0000 (11:11 +0100)]
prioritize country searches when penaly is equal

11 months agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Sun, 7 Jan 2024 14:24:30 +0000 (15:24 +0100)]
Merge remote-tracking branch 'upstream/master'