Fix codeberg url and updates teams

Signed-off-by: jeanbaptisteC <jeanbaptistec@noreply.codeberg.org>

.forgejo/workflows/android-release.yaml

@@ -156,7 +156,7 @@ jobs:
             cat ${{ env.RELEASE_NOTES }}
             echo ""
             echo "See [a detailed announce](https://organicmaps.app/news/) on our website when app updates are published in all stores."
-            echo "You can get automatic app updates from Codeberg [using Obtainium](https://codeberg.com/comaps/comaps/wiki/Installing-Organic-Maps-from-GitHub-using-Obtainium)."
+            echo "You can get automatic app updates from Codeberg [using Obtainium](https://codeberg.org/comaps/comaps/wiki/Installing-Organic-Maps-from-GitHub-using-Obtainium)."
             echo ""
             echo "sha256sum:"
             echo -e '\n```'

docs/CONTRIBUTING.md

@@ -18,7 +18,7 @@ If you'd like to help in any other way or if there are any related questions - p
 
 ### Bug Reports and Feature Requests
 
-[Submit an issue](https://codeberg.com/comaps/comaps/issues) and describe your feature idea or report a bug.
+[Submit an issue](https://codeberg.org/comaps/comaps/issues) and describe your feature idea or report a bug.
 Please check if there are no similar issues already submitted by someone else.
 
 When reporting a bug please provide as much information as possible: OS and application versions,
@@ -71,7 +71,7 @@ Please help us:
 - processing users questions and feedback in chats, app stores, email and social media and creating follow-up issues or updating existing ones
 - reproducing and triaging reported bugs
 - testing upcoming features and bug fixes for Android, iOS and desktop versions
-- keeping [issues](https://codeberg.com/comaps/comaps/issues) in order (check for duplicates, organize, assign labels, link related issues, etc.)
+- keeping [issues](https://codeberg.org/comaps/comaps/issues) in order (check for duplicates, organize, assign labels, link related issues, etc.)
 - composing nice user-centric release notes and news items
 - etc.
 

docs/DCO.md

@@ -50,4 +50,4 @@ In the past, once someone wanted to contribute they needed to go through the CLA
 
 ## Contributors
 
-Please feel free to add your name to [CONTRIBUTORS](https://codeberg.com/comaps/comaps/blob/master/CONTRIBUTORS) in your first PR.
+Please feel free to add your name to [CONTRIBUTORS](https://codeberg.org/comaps/comaps/blob/master/CONTRIBUTORS) in your first PR.

docs/ROADMAP.md

@@ -3,4 +3,4 @@
 ## Milestones
 
 Milestones define when an issue, pull request, and/or roadmap item is to be completed. Issues are the what, milestones are the when. Development is complex therefore roadmap items can move between milestones depending on the remaining development and testing required to release a change.
-[View active milestones](https://codeberg.com/comaps/comaps/milestones).
+[View active milestones](https://codeberg.org/comaps/comaps/milestones).

docs/STYLES.md

@@ -10,10 +10,10 @@ Here is the basic workflow to update styles:
 Please prepend `[styles]` to your commit message and add [Developers Certificate of Origin](CONTRIBUTING.md#legal-requirements) to it.
 Files changed by the script should be added as a separate `[styles] Regenerated` commit.
 
-Please check [a list of current styling issues](https://codeberg.com/comaps/comaps/issues?q=is%3Aopen+is%3Aissue+label%3AStyles)
+Please check [a list of current styling issues](https://codeberg.org/comaps/comaps/issues?q=is%3Aopen+is%3Aissue+label%3AStyles)
-and ["icons wanted" issues](https://codeberg.com/comaps/comaps/issues?q=is%3Aopen+is%3Aissue+label%3AIcons+label%3A%22Good+first+issue%22).
+and ["icons wanted" issues](https://codeberg.org/comaps/comaps/issues?q=is%3Aopen+is%3Aissue+label%3AIcons+label%3A%22Good+first+issue%22).
 
-An overview of currently used icons can be found in the [Wiki](https://codeberg.com/comaps/comaps/wiki/Icons).
+An overview of currently used icons can be found in the [Wiki](https://codeberg.org/comaps/comaps/wiki/Icons).
 
 ## Requirements
 
@@ -107,7 +107,7 @@ A whole map needs to be [regenerated](MAPS.md) for the changes to take effect if
 Map style files syntax is based on [MapCSS/0.2](https://wiki.openstreetmap.org/wiki/MapCSS/0.2),
 though the specification is not supported in full and there are OM-specific extensions to it.
 
-The `tools/unix/generate_drules.sh` script uses a customized version of [Kothic](https://codeberg.com/comaps/kothic)
+The `tools/unix/generate_drules.sh` script uses a customized version of [Kothic](https://codeberg.org/comaps/kothic)
 stylesheet processor to compile MapCSS files into binary drawing rules files `data/drules_proto*.bin`.
 The processor also produces text versions of these files (`data/drules_proto*.txt`) to ease debugging.
 

docs/SUBWAY_GENERATION.md

@@ -2,7 +2,7 @@
 
 For the subway layer to be available in CoMaps, a `SUBWAY_URL`
 parameter ought to be provided to the
-[map generator](https://codeberg.com/comaps/comaps/tree/master/tools/python/maps_generator).
+[map generator](https://codeberg.org/comaps/comaps/tree/master/tools/python/maps_generator).
 Normally you can specify this link https://cdn.comaps.app/subway.json,
 which provides a regularly updated file.
 These instructions describe how to manually build a subway layer file.
@@ -21,7 +21,7 @@ whole planet is also applicable.
     If you already have some not too outdated \*.o5m version, it is enough
     because the subway generation script will update it with `osmupdate`.
 
-1.  With the [CoMaps subways](https://codeberg.com/comaps/subways) repository deployed,
+1.  With the [CoMaps subways](https://codeberg.org/comaps/subways) repository deployed,
     run `scripts/process_subways.sh` bash script or prepare your own script
     which launches `process_subways.py` and `validation_to_html.py` scripts
     with suitable options.

docs/TEAMS.md

@@ -1,24 +1,24 @@
 # Teams
 
-CoMaps is led by community contributors, with functional domains occasionally establishing or dissolving their leadership structures, formal or informal. This file outlines the functional project structure that has evolved over time. The current list of teams is available on [Codeberg](https://codeberg.com/orgs/comaps/teams).
+CoMaps is led by community contributors, with functional domains occasionally establishing or dissolving their leadership structures, formal or informal. This file outlines the functional project structure that has evolved over time. The current list of teams is available on [Codeberg](https://codeberg.org/orgs/comaps/teams).
 
-Teams are typically assigned as code owners for certain sections of the repository. Codeberg will automatically request a review from the responsible team when changes are made to the relevant part of the repository in a pull request. See the [CODEOWNERS](../.forgejo/CODEOWNERS) file for more information. Please feel free to tag the relevant team in the comments if you need assistance in a specific area. If you are unsure which team to contact, please tag [@comaps/triage](https://codeberg.com/orgs/comaps/teams/contributors/triage) for help.
+Teams are typically assigned as code owners for certain sections of the repository. Codeberg will automatically request a review from the responsible team when changes are made to the relevant part of the repository in a pull request. See the [CODEOWNERS](../.forgejo/CODEOWNERS) file for more information. Please feel free to tag the relevant team in the comments if you need assistance in a specific area. If you are unsure which team to contact, please tag [@comaps/triage](https://codeberg.org/orgs/comaps/teams/contributors/triage) for help.
 
 ## Triage
 
-- [@comaps/triage](https://github.com/orgs/comaps/teams/triage/members)
+- [@comaps/triage](https://codeberg.org/org/comaps/teams)
 
 People who help with triaging incoming issues and pull requests. Tag this group if you are unsure which team to tag.
 
 ## Mergers
 
-- [@comaps/mergers](https://github.com/orgs/comaps/teams/mergers/members)
+- [@comaps/mergers](https://codeberg.org/org/comaps/teams)
 
 People who can merge pull requests that are ready.
 
 ## Android
 
-- [@comaps/android](https://github.com/orgs/comaps/teams/android/members)
+- [@comaps/android](https://codeberg.org/org/comaps/teams)
 
 Android experts.
 
@@ -26,91 +26,91 @@ Android experts.
 
 Android Auto experts (a subteam of Android).
 
-- [@comaps/android-auto](https://github.com/orgs/comaps/teams/android-auto/members)
+- [@comaps/android-auto](https://codeberg.org/org/comaps/teams)
 
 ## iOS
 
-- [@comaps/ios](https://github.com/orgs/comaps/teams/ios/members)
+- [@comaps/ios](https://codeberg.org/org/comaps/teams)
 
 iOS experts.
 
 ## Qt
 
-- [@comaps/qt](https://github.com/orgs/comaps/teams/qt/members)
+- [@comaps/qt](https://codeberg.org/org/comaps/teams)
 
 Qt Desktop & Convergent UI experts.
 
 ## C++
 
-- [@comaps/cpp](https://github.com/orgs/comaps/teams/cpp/members)
+- [@comaps/cpp](https://codeberg.org/org/comaps/teams)
 
 C++ experts.
 
 ## Rendering
 
-- [@comaps/rendering](https://github.com/orgs/comaps/teams/rendering/members)
+- [@comaps/rendering](https://codeberg.org/org/comaps/teams)
 
 Rendering experts.
 
 ## Data
 
-- [@comaps/map](https://github.com/orgs/comaps/teams/data/members)
+- [@comaps/map](https://codeberg.org/org/comaps/teams)
 - [#data](https://comaps.zulipchat.com/#narrow/channel/477127-Data)
 
 Map data generation team.
 
 ## Styles
 
-- [@comaps/styles](https://github.com/orgs/comaps/teams/styles/members)
+- [@comaps/styles](https://codeberg.org/org/comaps/teams)
 
 Map styles team.
 
 ## DevOps
 
-- [@comaps/devops](https://github.com/orgs/comaps/teams/devops/members)
+- [@comaps/devops](https://codeberg.org/org/comaps/teams)
 
 DevOps team.
 
 ## Design
 
-- [@comaps/design](https://github.com/orgs/comaps/teams/design/members)
+- [@comaps/design](https://codeberg.org/org/comaps/teams)
 
 Visual design (icons, graphics, colors, contrast, etc.).
 
 ## Web
 
-- [@comaps/web](https://github.com/orgs/comaps/teams/web/members)
+- [@comaps/web](https://codeberg.org/org/comaps/teams)
 
 Web development experts.
 
 ## Growth
 
-- [@comaps/growth](https://github.com/orgs/comaps/teams/growth/members)
+- [@comaps/growth](https://codeberg.org/org/comaps/teams)
 
 Marketing, ASO, SEO, and SMM experts.
 
 ## Product
 
-- [@comaps/product](https://github.com/orgs/comaps/teams/product/members)
+- [@comaps/product](https://codeberg.org/org/comaps/teams)
 
 Product management group.
 
 ## Translations
 
-- [@comaps/translations](https://github.com/orgs/comaps/teams/translations)
+- [@comaps/translations](https://codeberg.org/org/comaps/teams)
 
 Internationalization and localization.
 
-Tag [@comaps/translations-langcode](https://github.com/orgs/comaps/teams/translations/teams) (e.g. @comaps/translations-fr) for specific language.
+Tag [@comaps/translations-langcode](https://codeberg.org/org/comaps/teams) (e.g. @comaps/translations-fr) for specific language.
 
 ## Support
 
-- [@comaps/support](https://github.com/orgs/comaps/teams/support/members)
+- [@comaps/support](https://codeberg.org/org/comaps/teams)
 
 End-user support: feedback in stores, emails, user-facing docs (FAQs).
 
 ## Legal
 
-- [@comaps/legal](https://github.com/orgs/comaps/teams/legal/members)
+- [@comaps/legal](https://codeberg.org/org/comaps/teams)
 
 Legal team.

docs/building_pybindings.txt

@@ -9,7 +9,7 @@ This document describes how to build these python bindings.
 
 Preparing source tree
 ---------------------
-The Organic Maps project comes with its own version of Boost (https://www.boost.org/)
+The CoMaps project comes with its own version of Boost (https://www.boost.org/)
 in a submodule. You have to recursively update submodules before you start
 building anything.
 

pyhelpers/setup.py

@@ -504,7 +504,7 @@ def setup_omim_pybinding(
     version=None,
     author='CoMaps',
     author_email='info@comaps.app',
-    url='https://codeberg.com/comaps/comaps',
+    url='https://codeberg.org/comaps/comaps',
     license='Apache-2.0',
     supported_pythons=('2', '2.7', '3', '3.5', '3.6', '3.7', '3.8', '3.9'),
 ):

pyhelpers/specs/python35-mapsme-modules.spec

@@ -32,7 +32,7 @@ License:	Apache Public License 2.0
 Vendor:         Mail.Ru Group
 
 Group:          Development/Languages/Python
-URL:		https://codeberg.com/comaps/comaps
+URL:		https://codeberg.org/comaps/comaps
 Source:		omim-py-modules-%{version}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -63,7 +63,7 @@ if [ -e %{S:0} ]; then
         %{__tar} xzf %{S:0}
         %{__chmod} -Rf a+rX,u+w,g-w,o-w %{_builddir}/%{name}-%{version}
 else
-        git clone --depth=1 https://codeberg.com/comaps/comaps.git %{_builddir}/%{name}-%{version}/omim
+        git clone --depth=1 https://codeberg.org/comaps/comaps.git %{_builddir}/%{name}-%{version}/omim
         pushd %{_builddir}/%{name}-%{version}/omim
 	git fetch origin tag %{tag} --depth=1
         git checkout %{tag}

search/search_quality/README.txt

@@ -3,7 +3,7 @@ This document describes how to use the tools for search quality analysis.
 
 1. Prerequisites.
 
-   * Get the latest version of the project (https://codeberg.com/comaps/comaps) and build it.
+   * Get the latest version of the project (https://codeberg.org/comaps/comaps) and build it.
 
    * Get the latest samples.lisp file with search queries. If you don't know
      how to get it, please, contact the search team.

tools/python/airmaps/setup.py

@@ -19,7 +19,7 @@ with chdir(os.path.abspath(os.path.dirname(__file__))):
         author="CoMaps",
         author_email="info@comaps.app",
         description="This package contains tools for generating maps with Apache Airflow.",
-        url="https://codeberg.com/comaps",
+        url="https://codeberg.org/comaps",
         package_dir={"airmaps": ""},
         package_data={"": ["var/**/*"]},
         packages=[

tools/python/data/base.py

@@ -55,7 +55,7 @@ def setup(
             author="CoMaps",
             author_email="info@comaps.app",
             description="This package contains {} data files.".format(suffix),
-            url="https://codeberg.com/comaps",
+            url="https://codeberg.org/comaps",
             packages=[] if packages is None else packages,
             package_dir={} if package_dir is None else package_dir,
             cmdclass={} if cmdclass is None else cmdclass,

tools/python/data_files/setup.py

@@ -19,7 +19,7 @@ with chdir(os.path.abspath(os.path.dirname(__file__))):
         author="CoMaps",
         author_email="info@comaps.app",
         description="This package is a library for dealing with data files.",
-        url="https://codeberg.com/comaps",
+        url="https://codeberg.org/comaps",
         package_dir={"data_files": ""},
         packages=["data_files",],
         classifiers=["License :: OSI Approved :: Apache Software License",]

tools/python/descriptions/setup.py

@@ -20,7 +20,7 @@ with chdir(os.path.abspath(os.path.dirname(__file__))):
         author_email="info@comaps.app",
         description="This package is a library that provides descriptions "
         "(such as those from Wikipedia) to geographic objects.",
-        url="https://codeberg.com/comaps",
+        url="https://codeberg.org/comaps",
         package_dir={"descriptions": ""},
         packages=["descriptions"],
         classifiers=[

tools/python/maps_generator/README.md

@@ -8,7 +8,7 @@ maps built by a generator_tool newer than the app.**
 ## What are maps?
 
 Maps are `.mwm` binary files with special meta-information for rendering, searching, routing, and other use cases.
-Files from [data/borders](https://codeberg.com/comaps/comaps/src/branch/main/data/borders) define map boundaries for each individual file. The world is segmented into separate files by these boundaries, with the intent of having manageably small files to download. These files are referred to as *maps* or *countries*. A country is referring to one of these files, not necessarily a geographic country. Also note that there are two special countries called *World* and *WorldCoasts*. These are small simplified maps of the world and coastlines (sea and ocean watercover) used when other maps have not yet been downloaded.
+Files from [data/borders](https://codeberg.org/comaps/comaps/src/branch/main/data/borders) define map boundaries for each individual file. The world is segmented into separate files by these boundaries, with the intent of having manageably small files to download. These files are referred to as *maps* or *countries*. A country is referring to one of these files, not necessarily a geographic country. Also note that there are two special countries called *World* and *WorldCoasts*. These are small simplified maps of the world and coastlines (sea and ocean watercover) used when other maps have not yet been downloaded.
 
 ## Setup
 
@@ -42,7 +42,7 @@ cd tools/python/maps_generator
 pip3 install -r requirements_dev.txt
 ```
 
-5. Create a [configuration file with defaults](https://codeberg.com/comaps/comaps/src/branch/main/tools/python/maps_generator/var/etc/map_generator.ini.default):
+5. Create a [configuration file with defaults](https://codeberg.org/comaps/comaps/src/branch/main/tools/python/maps_generator/var/etc/map_generator.ini.default):
 
 ```sh
 cp var/etc/map_generator.ini.default var/etc/map_generator.ini
@@ -172,4 +172,4 @@ In this example we skipped generation of the World\* files because they are ones
 
 ### Subways layer
 
-You can manually generate a subway layer file to use in the `SUBWAY_URL` ini setting. See [instructions](https://codeberg.com/comaps/comaps/src/branch/main/docs/SUBWAY_GENERATION.md).
+You can manually generate a subway layer file to use in the `SUBWAY_URL` ini setting. See [instructions](https://codeberg.org/comaps/comaps/src/branch/main/docs/SUBWAY_GENERATION.md).

tools/python/maps_generator/setup.py

@@ -19,7 +19,7 @@ with chdir(os.path.abspath(os.path.dirname(__file__))):
         author="CoMaps",
         author_email="info@comaps.app",
         description="This package contains tools for maps generation.",
-        url="https://codeberg.com/comaps",
+        url="https://codeberg.org/comaps",
         package_dir={"maps_generator": ""},
         package_data={"": ["var/**/*"]},
         packages=[

tools/python/mwm/setup.py

@@ -19,7 +19,7 @@ with chdir(os.path.abspath(os.path.dirname(__file__))):
         author="CoMaps",
         author_email="info@comaps.app",
         description="This package is a library that can work with mwm files.",
-        url="https://codeberg.com/comaps",
+        url="https://codeberg.org/comaps",
         package_dir={"mwm": ""},
         packages=["mwm"],
         classifiers=[

tools/python/post_generation/setup.py

@@ -19,7 +19,7 @@ with chdir(os.path.abspath(os.path.dirname(__file__))):
         author="CoMaps",
         author_email="info@comaps.app",
         description="This package is a library for post-processing the generated maps.",
-        url="https://codeberg.com/comaps",
+        url="https://codeberg.org/comaps",
         package_dir={"post_generation": ""},
         packages=["post_generation"],
         classifiers=[