mirror of
https://codeberg.org/comaps/comaps
synced 2025-12-20 05:13:58 +00:00
Compare commits
19 Commits
yannikblos
...
fix-ci
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
62fb50e95c | ||
|
|
664a156cc6 | ||
|
|
08b773dfa8 | ||
|
|
c31d3b6926 | ||
|
|
7469b0ecb4 | ||
|
|
2b78118310 | ||
|
|
70622bdca0 | ||
|
|
5b3e327ff8 | ||
|
|
8395e8d9a9 | ||
|
|
b7971b5cc0 | ||
|
|
8fb8be6a00 | ||
|
|
273afe052a | ||
|
|
9b5419b6d4 | ||
|
|
835ee4ab8d | ||
|
|
5bc8aae623 | ||
|
|
72439bd6d7 | ||
|
|
a3db039232 | ||
|
|
ffcaf3640b | ||
|
|
289f4c4343 |
@@ -3,6 +3,7 @@ BasedOnStyle: Google
|
|||||||
|
|
||||||
AccessModifierOffset: -2
|
AccessModifierOffset: -2
|
||||||
AlignAfterOpenBracket: Align
|
AlignAfterOpenBracket: Align
|
||||||
|
AlignArrayOfStructures: Right
|
||||||
AlignConsecutiveMacros: AcrossEmptyLinesAndComments
|
AlignConsecutiveMacros: AcrossEmptyLinesAndComments
|
||||||
AlignEscapedNewlines: LeftWithLastLine
|
AlignEscapedNewlines: LeftWithLastLine
|
||||||
AlignOperands: AlignAfterOperator
|
AlignOperands: AlignAfterOperator
|
||||||
@@ -39,10 +40,8 @@ ColumnLimit: 120
|
|||||||
ConstructorInitializerIndentWidth: 2
|
ConstructorInitializerIndentWidth: 2
|
||||||
ContinuationIndentWidth: 4
|
ContinuationIndentWidth: 4
|
||||||
DerivePointerAlignment: false
|
DerivePointerAlignment: false
|
||||||
EmptyLineBeforeAccessModifier: Always
|
|
||||||
IncludeBlocks: Preserve
|
IncludeBlocks: Preserve
|
||||||
IndentAccessModifiers: false
|
IndentAccessModifiers: false
|
||||||
IndentCaseLabels: false
|
|
||||||
IndentExternBlock: NoIndent
|
IndentExternBlock: NoIndent
|
||||||
InsertBraces: false
|
InsertBraces: false
|
||||||
InsertNewlineAtEOF: true
|
InsertNewlineAtEOF: true
|
||||||
@@ -50,7 +49,6 @@ LambdaBodyIndentation: OuterScope
|
|||||||
PackConstructorInitializers: CurrentLine
|
PackConstructorInitializers: CurrentLine
|
||||||
PointerAlignment: Middle
|
PointerAlignment: Middle
|
||||||
RemoveBracesLLVM: true
|
RemoveBracesLLVM: true
|
||||||
RemoveSemicolon: true
|
|
||||||
QualifierAlignment: Right
|
QualifierAlignment: Right
|
||||||
SpacesInContainerLiterals: false
|
SpacesInContainerLiterals: false
|
||||||
Standard: Latest
|
Standard: Latest
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
# Files that should not be formatted.
|
|
||||||
./3party
|
|
||||||
# A patched copy of the https://registry.khronos.org/OpenGL/api/GLES3/gl3.h
|
|
||||||
./android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/gl3stub.h
|
|
||||||
# Formatting it leads to crashes in runtime. Newer protobuf may fix it.
|
|
||||||
./libs/indexer/drules_struct.pb.cc
|
|
||||||
# No need to format this 3party tool.
|
|
||||||
tools/osmctools/*.c
|
|
||||||
@@ -3,7 +3,7 @@ on:
|
|||||||
workflow_dispatch: # Manual trigger
|
workflow_dispatch: # Manual trigger
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- fix-ci
|
||||||
paths-ignore:
|
paths-ignore:
|
||||||
- .gitignore
|
- .gitignore
|
||||||
- .forgejo/**
|
- .forgejo/**
|
||||||
@@ -41,11 +41,11 @@ jobs:
|
|||||||
- name: Install build tools and dependencies
|
- name: Install build tools and dependencies
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update -y
|
apt-get update -y
|
||||||
sudo apt-get install -y ninja-build
|
apt-get install -y cmake ninja-build
|
||||||
|
|
||||||
- name: Checkout sources
|
- name: Checkout sources
|
||||||
uses: actions/checkout@v4
|
uses: https://github.com/actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 100 # enough to get all commits for the current day
|
fetch-depth: 100 # enough to get all commits for the current day
|
||||||
|
|
||||||
@@ -69,6 +69,8 @@ jobs:
|
|||||||
RELEASE_KEYSTORE: ${{ secrets.RELEASE_KEYSTORE }}
|
RELEASE_KEYSTORE: ${{ secrets.RELEASE_KEYSTORE }}
|
||||||
|
|
||||||
- name: Compile
|
- name: Compile
|
||||||
|
container:
|
||||||
|
image: runmymind/docker-android-sdk:latest
|
||||||
shell: bash
|
shell: bash
|
||||||
working-directory: android
|
working-directory: android
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
name: Android Check Store Metadata
|
name: Android Check Metadata
|
||||||
on:
|
on:
|
||||||
workflow_dispatch: # Manual trigger
|
workflow_dispatch: # Manual trigger
|
||||||
pull_request:
|
pull_request:
|
||||||
@@ -14,15 +14,12 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: https://github.com/actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 1
|
fetch-depth: 1
|
||||||
sparse-checkout: |
|
sparse-checkout: |
|
||||||
android
|
android
|
||||||
tools/python/check_store_metadata.py
|
tools/python/check_store_metadata.py
|
||||||
|
|
||||||
- name: Check Google Play metadata
|
- name: Check metadata
|
||||||
run: ./tools/python/check_store_metadata.py gplay
|
run: ./tools/python/check_store_metadata.py android
|
||||||
|
|
||||||
- name: Check F-Droid metadata
|
|
||||||
run: ./tools/python/check_store_metadata.py fdroid
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ on:
|
|||||||
workflow_dispatch: # Manual trigger
|
workflow_dispatch: # Manual trigger
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- fix-ci
|
||||||
pull_request:
|
pull_request:
|
||||||
paths-ignore:
|
paths-ignore:
|
||||||
- .gitignore
|
- .gitignore
|
||||||
@@ -38,9 +38,17 @@ jobs:
|
|||||||
lint:
|
lint:
|
||||||
name: Android Lint
|
name: Android Lint
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
container:
|
||||||
|
image: runmymind/docker-android-sdk:latest
|
||||||
steps:
|
steps:
|
||||||
|
- name: Install Node.JS
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
apt-get update -y
|
||||||
|
apt-get install -y nodejs
|
||||||
|
|
||||||
- name: Checkout sources
|
- name: Checkout sources
|
||||||
uses: actions/checkout@v4
|
uses: https://github.com/actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 1
|
fetch-depth: 1
|
||||||
|
|
||||||
@@ -56,6 +64,8 @@ jobs:
|
|||||||
android-check:
|
android-check:
|
||||||
name: Build Android Debug
|
name: Build Android Debug
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
container:
|
||||||
|
image: runmymind/docker-android-sdk:latest
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
@@ -74,11 +84,11 @@ jobs:
|
|||||||
- name: Install build tools and dependencies
|
- name: Install build tools and dependencies
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update -y
|
apt-get update -y
|
||||||
sudo apt-get install -y ninja-build
|
apt-get install -y cmake ninja-build nodejs
|
||||||
|
|
||||||
- name: Checkout sources
|
- name: Checkout sources
|
||||||
uses: actions/checkout@v4
|
uses: httpa://github.com/actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 200 # enough to get all commits for the current day
|
fetch-depth: 200 # enough to get all commits for the current day
|
||||||
|
|
||||||
@@ -87,7 +97,7 @@ jobs:
|
|||||||
run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
|
run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
|
||||||
|
|
||||||
- name: Configure ccache
|
- name: Configure ccache
|
||||||
uses: hendrikmuhs/ccache-action@v1.2
|
uses: https://github.com/hendrikmuhs/ccache-action@v1.2
|
||||||
with:
|
with:
|
||||||
key: ${{ github.workflow }}-${{ matrix.flavor }}
|
key: ${{ github.workflow }}-${{ matrix.flavor }}
|
||||||
|
|
||||||
@@ -106,5 +116,5 @@ jobs:
|
|||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: android-${{ matrix.flavor }}
|
name: android-${{ matrix.flavor }}
|
||||||
path: android/app/build/outputs/apk/**/OrganicMaps-*.apk
|
path: android/app/build/outputs/apk/**/CoMaps-*.apk
|
||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ jobs:
|
|||||||
name: Check preconditions
|
name: Check preconditions
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout sources
|
- name: Checkout sources
|
||||||
uses: actions/checkout@v4
|
uses: https://github.com/actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 1000 # fetch month or so
|
fetch-depth: 1000 # fetch month or so
|
||||||
|
|
||||||
@@ -31,6 +31,8 @@ jobs:
|
|||||||
android-google-beta:
|
android-google-beta:
|
||||||
name: Android Google Beta
|
name: Android Google Beta
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
container:
|
||||||
|
image: runmymind/docker-android-sdk:latest
|
||||||
needs: precondition
|
needs: precondition
|
||||||
if: ${{ needs.precondition.outputs.updated != '' }}
|
if: ${{ needs.precondition.outputs.updated != '' }}
|
||||||
environment: beta
|
environment: beta
|
||||||
@@ -38,14 +40,14 @@ jobs:
|
|||||||
- name: Install build tools and dependencies
|
- name: Install build tools and dependencies
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update -y
|
apt-get update -y
|
||||||
sudo apt-get install -y ninja-build
|
apt-get install -y ninja-build
|
||||||
|
|
||||||
- name: Install Google SDK
|
- name: Install Google SDK
|
||||||
uses: google-github-actions/setup-gcloud@v0
|
uses: google-github-actions/setup-gcloud@v0
|
||||||
|
|
||||||
- name: Checkout sources
|
- name: Checkout sources
|
||||||
uses: actions/checkout@v4
|
uses: https://github.com/actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 100 # enough to get all commits for the current day
|
fetch-depth: 100 # enough to get all commits for the current day
|
||||||
|
|
||||||
@@ -82,7 +84,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
gcloud auth activate-service-account --key-file android/app/firebase-test-lab.json
|
gcloud auth activate-service-account --key-file android/app/firebase-test-lab.json
|
||||||
gcloud config set project omapsapp
|
gcloud config set project omapsapp
|
||||||
gcloud firebase test android run --app ./android/app/build/outputs/apk/google/beta/OrganicMaps-*-google-beta.apk \
|
gcloud firebase test android run --app ./android/app/build/outputs/apk/google/beta/CoMaps-*-google-beta.apk \
|
||||||
--device model=husky,version=34 \
|
--device model=husky,version=34 \
|
||||||
--device model=tangorpro,version=33,orientation=landscape \
|
--device model=tangorpro,version=33,orientation=landscape \
|
||||||
--device model=bluejay,version=32 \
|
--device model=bluejay,version=32 \
|
||||||
|
|||||||
@@ -6,21 +6,25 @@ jobs:
|
|||||||
android-release-metadata:
|
android-release-metadata:
|
||||||
name: Upload Google Play metadata
|
name: Upload Google Play metadata
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
container:
|
||||||
|
image: runmymind/docker-android-sdk:latest
|
||||||
environment: production
|
environment: production
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout sources
|
||||||
uses: actions/checkout@v4
|
# TODO: use shallow (and sparse?) checkout
|
||||||
with:
|
uses: https://github.com/actions/checkout@v4
|
||||||
fetch-depth: 1
|
|
||||||
sparse-checkout: |
|
# - name: Parallel submodules checkout
|
||||||
android
|
# shell: bash
|
||||||
tools/python/check_store_metadata.py
|
# run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
|
||||||
|
|
||||||
- name: Restore release keys
|
- name: Restore release keys
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
|
echo "$PRIVATE_H" | base64 -d > private.h
|
||||||
echo "$GOOGLE_PLAY_JSON" | base64 -d > android/app/google-play.json
|
echo "$GOOGLE_PLAY_JSON" | base64 -d > android/app/google-play.json
|
||||||
env:
|
env:
|
||||||
|
PRIVATE_H: ${{ secrets.PRIVATE_H }}
|
||||||
GOOGLE_PLAY_JSON: ${{ secrets.GOOGLE_PLAY_JSON }}
|
GOOGLE_PLAY_JSON: ${{ secrets.GOOGLE_PLAY_JSON }}
|
||||||
|
|
||||||
- name: Upload
|
- name: Upload
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ jobs:
|
|||||||
environment: production
|
environment: production
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout sources
|
- name: Checkout sources
|
||||||
uses: actions/checkout@v4
|
uses: https://github.com/actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 100 # Enough to get all commits for the last day.
|
fetch-depth: 100 # Enough to get all commits for the last day.
|
||||||
ssh-key: ${{ secrets.RELEASE_SSH_KEY }}
|
ssh-key: ${{ secrets.RELEASE_SSH_KEY }}
|
||||||
@@ -71,11 +71,11 @@ jobs:
|
|||||||
- name: Install build tools and dependencies
|
- name: Install build tools and dependencies
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update -y
|
apt-get update -y
|
||||||
sudo apt-get install -y ninja-build
|
apt-get install -y cmake ninja-build
|
||||||
|
|
||||||
- name: Checkout sources
|
- name: Checkout sources
|
||||||
uses: actions/checkout@v4
|
uses: https://github.com/actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 100 # enough to get all commits for the current day
|
fetch-depth: 100 # enough to get all commits for the current day
|
||||||
ref: 'refs/tags/${{ needs.tag.outputs.tag }}'
|
ref: 'refs/tags/${{ needs.tag.outputs.tag }}'
|
||||||
@@ -92,7 +92,7 @@ jobs:
|
|||||||
run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
|
run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
|
||||||
|
|
||||||
- name: Checkout screenshots
|
- name: Checkout screenshots
|
||||||
uses: actions/checkout@v4
|
uses: https://github.com/actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
repository: ${{ secrets.SCREENSHOTS_REPO }}
|
repository: ${{ secrets.SCREENSHOTS_REPO }}
|
||||||
ssh-key: ${{ secrets.SCREENSHOTS_SSH_KEY }}
|
ssh-key: ${{ secrets.SCREENSHOTS_SSH_KEY }}
|
||||||
@@ -121,6 +121,8 @@ jobs:
|
|||||||
run: echo "sdk.dir=$ANDROID_SDK_ROOT" > android/local.properties
|
run: echo "sdk.dir=$ANDROID_SDK_ROOT" > android/local.properties
|
||||||
|
|
||||||
- name: Compile and upload to Google Play
|
- name: Compile and upload to Google Play
|
||||||
|
container:
|
||||||
|
image: runmymind/docker-android-sdk:latest
|
||||||
shell: bash
|
shell: bash
|
||||||
working-directory: android
|
working-directory: android
|
||||||
run: |
|
run: |
|
||||||
@@ -128,6 +130,8 @@ jobs:
|
|||||||
if: ${{ matrix.flavor == 'google' }}
|
if: ${{ matrix.flavor == 'google' }}
|
||||||
|
|
||||||
- name: Compile and upload to Huawei AppGallery
|
- name: Compile and upload to Huawei AppGallery
|
||||||
|
container:
|
||||||
|
image: runmymind/docker-android-sdk:latest
|
||||||
shell: bash
|
shell: bash
|
||||||
working-directory: android
|
working-directory: android
|
||||||
run: |
|
run: |
|
||||||
@@ -136,6 +140,8 @@ jobs:
|
|||||||
if: ${{ matrix.flavor == 'huawei' }}
|
if: ${{ matrix.flavor == 'huawei' }}
|
||||||
|
|
||||||
- name: Compile universal APK
|
- name: Compile universal APK
|
||||||
|
container:
|
||||||
|
image: runmymind/docker-android-sdk:latest
|
||||||
shell: bash
|
shell: bash
|
||||||
working-directory: android
|
working-directory: android
|
||||||
run: |
|
run: |
|
||||||
@@ -146,16 +152,16 @@ jobs:
|
|||||||
if: ${{ matrix.flavor == 'web' }}
|
if: ${{ matrix.flavor == 'web' }}
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
(cd ./android/app/build/outputs/apk/web/release/ && sha256sum OrganicMaps-${{ needs.tag.outputs.code }}-web-release.apk > OrganicMaps-${{ needs.tag.outputs.code }}-web-release.apk.sha256sum)
|
(cd ./android/app/build/outputs/apk/web/release/ && sha256sum CoMaps-${{ needs.tag.outputs.code }}-web-release.apk > CoMaps-${{ needs.tag.outputs.code }}-web-release.apk.sha256sum)
|
||||||
{
|
{
|
||||||
cat ${{ env.RELEASE_NOTES }}
|
cat ${{ env.RELEASE_NOTES }}
|
||||||
echo ""
|
echo ""
|
||||||
echo "See [a detailed announce](https://organicmaps.app/news/) on our website when app updates are published in all stores."
|
echo "See [a detailed announce](https://comaps.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.org/comaps/comaps/wiki/Installing-Organic-Maps-from-GitHub-using-Obtainium)."
|
echo "You can get automatic app updates from Codeberg [using Obtainium](https://apps.obtainium.imranr.dev/redirect?r=obtainium://add/https://codeberg.org/comaps/comaps)."
|
||||||
echo ""
|
echo ""
|
||||||
echo "sha256sum:"
|
echo "sha256sum:"
|
||||||
echo -e '\n```'
|
echo -e '\n```'
|
||||||
tr -d '\n' < ./android/app/build/outputs/apk/web/release/OrganicMaps-${{ needs.tag.outputs.code }}-web-release.apk.sha256sum
|
tr -d '\n' < ./android/app/build/outputs/apk/web/release/CoMaps-${{ needs.tag.outputs.code }}-web-release.apk.sha256sum
|
||||||
echo -e '\n```'
|
echo -e '\n```'
|
||||||
} > ${{ runner.temp }}/release-notes.txt
|
} > ${{ runner.temp }}/release-notes.txt
|
||||||
|
|
||||||
@@ -170,6 +176,6 @@ jobs:
|
|||||||
discussion_category_name: 'Announcements'
|
discussion_category_name: 'Announcements'
|
||||||
prerelease: true
|
prerelease: true
|
||||||
files: |
|
files: |
|
||||||
./android/app/build/outputs/apk/web/release/OrganicMaps-${{ needs.tag.outputs.code }}-web-release.apk
|
./android/app/build/outputs/apk/web/release/CoMaps-${{ needs.tag.outputs.code }}-web-release.apk
|
||||||
./android/app/build/outputs/apk/web/release/OrganicMaps-${{ needs.tag.outputs.code }}-web-release.apk.sha256sum
|
./android/app/build/outputs/apk/web/release/CoMaps-${{ needs.tag.outputs.code }}-web-release.apk.sha256sum
|
||||||
fail_on_unmatched_files: true
|
fail_on_unmatched_files: true
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ on:
|
|||||||
workflow_dispatch: # Manual trigger
|
workflow_dispatch: # Manual trigger
|
||||||
pull_request:
|
pull_request:
|
||||||
paths:
|
paths:
|
||||||
- packaging/app.comaps.comaps.metainfo.xml
|
- packaging/app.comaps.desktop.metainfo.xml
|
||||||
- .forgejo/workflows/appstream-check.yaml # Run check on self change
|
- .forgejo/workflows/appstream-check.yaml # Run check on self change
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
@@ -12,25 +12,25 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout sources
|
- name: Checkout sources
|
||||||
uses: actions/checkout@v4
|
uses: https://github.com/actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 1
|
fetch-depth: 1
|
||||||
sparse-checkout: |
|
sparse-checkout: |
|
||||||
packaging/app.comaps.comaps.metainfo.xml
|
packaging/app.comaps.desktop.metainfo.xml
|
||||||
|
|
||||||
- name: Install appstream validator and flatpak Builder
|
- name: Install appstream validator and flatpak Builder
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
sudo apt update -y
|
apt update -y
|
||||||
sudo apt install -y \
|
apt install -y \
|
||||||
flatpak
|
flatpak
|
||||||
sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
|
flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
|
||||||
sudo flatpak install -y org.flatpak.Builder
|
flatpak install -y org.flatpak.Builder
|
||||||
|
|
||||||
- name: Lint appstream data with flatpak Builder
|
- name: Lint appstream data with flatpak Builder
|
||||||
shell: bash
|
shell: bash
|
||||||
run: flatpak run --command=flatpak-builder-lint org.flatpak.Builder appstream packaging/app.comaps.comaps.metainfo.xml
|
run: flatpak run --command=flatpak-builder-lint org.flatpak.Builder appstream packaging/app.comaps.desktop.metainfo.xml
|
||||||
|
|
||||||
- name: Run appstreamcli in pedantic mode
|
- name: Run appstreamcli in pedantic mode
|
||||||
shell: bash
|
shell: bash
|
||||||
run: flatpak run --command=appstreamcli org.flatpak.Builder validate --pedantic packaging/app.comaps.comaps.metainfo.xml
|
run: flatpak run --command=appstreamcli org.flatpak.Builder validate --pedantic packaging/app.comaps.desktop.metainfo.xml
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ jobs:
|
|||||||
if: ${{ needs.should-run-check.outputs.run-from-pr == 'true' || needs.should-run-check.outputs.manually-triggered == 'true'}}
|
if: ${{ needs.should-run-check.outputs.run-from-pr == 'true' || needs.should-run-check.outputs.manually-triggered == 'true'}}
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout sources
|
- name: Checkout sources
|
||||||
uses: actions/checkout@v4
|
uses: https://github.com/actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 100 # enough to get all commits for the current day
|
fetch-depth: 100 # enough to get all commits for the current day
|
||||||
|
|
||||||
@@ -74,8 +74,8 @@ jobs:
|
|||||||
- name: Install build tools and dependencies
|
- name: Install build tools and dependencies
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
sudo apt update -y
|
apt update -y
|
||||||
sudo apt install -y \
|
apt install -y \
|
||||||
ninja-build \
|
ninja-build \
|
||||||
libgl1-mesa-dev \
|
libgl1-mesa-dev \
|
||||||
libglvnd-dev \
|
libglvnd-dev \
|
||||||
@@ -90,7 +90,7 @@ jobs:
|
|||||||
gcovr
|
gcovr
|
||||||
|
|
||||||
- name: Configure ccache
|
- name: Configure ccache
|
||||||
uses: hendrikmuhs/ccache-action@v1.2
|
uses: https://github.com/hendrikmuhs/ccache-action@v1.2
|
||||||
with:
|
with:
|
||||||
key: ${{ github.workflow }}-coverage
|
key: ${{ github.workflow }}-coverage
|
||||||
|
|
||||||
@@ -124,15 +124,15 @@ jobs:
|
|||||||
# world_feed_integration_tests - https://github.com/organicmaps/organicmaps/issues/215
|
# world_feed_integration_tests - https://github.com/organicmaps/organicmaps/issues/215
|
||||||
CTEST_EXCLUDE_REGEX: "generator_integration_tests|opening_hours_integration_tests|opening_hours_supported_features_tests|routing_benchmarks|routing_integration_tests|routing_quality_tests|search_quality_tests|storage_integration_tests|shaders_tests|world_feed_integration_tests"
|
CTEST_EXCLUDE_REGEX: "generator_integration_tests|opening_hours_integration_tests|opening_hours_supported_features_tests|routing_benchmarks|routing_integration_tests|routing_quality_tests|search_quality_tests|storage_integration_tests|shaders_tests|world_feed_integration_tests"
|
||||||
run: |
|
run: |
|
||||||
sudo locale-gen en_US
|
locale-gen en_US
|
||||||
sudo locale-gen en_US.UTF-8
|
locale-gen en_US.UTF-8
|
||||||
sudo locale-gen es_ES
|
locale-gen es_ES
|
||||||
sudo locale-gen es_ES.UTF-8
|
locale-gen es_ES.UTF-8
|
||||||
sudo locale-gen fr_FR
|
locale-gen fr_FR
|
||||||
sudo locale-gen fr_FR.UTF-8
|
locale-gen fr_FR.UTF-8
|
||||||
sudo locale-gen ru_RU
|
locale-gen ru_RU
|
||||||
sudo locale-gen ru_RU.UTF-8
|
locale-gen ru_RU.UTF-8
|
||||||
sudo update-locale
|
update-locale
|
||||||
ctest -L "omim-test" -E "$CTEST_EXCLUDE_REGEX" --output-on-failure
|
ctest -L "omim-test" -E "$CTEST_EXCLUDE_REGEX" --output-on-failure
|
||||||
|
|
||||||
- name: Run coverage report generation
|
- name: Run coverage report generation
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
name: DCO
|
name: dco
|
||||||
on: [pull_request]
|
on: [pull_request]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
check:
|
check:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Check for Developer Certificate of Origin (DCO) compliance
|
- uses: https://github.com/KineticCafe/actions-dco@v1
|
||||||
uses: https://github.com/KineticCafe/actions-dco@fb284c903a7673a3d4b0bdd104479a6f0d46dae7 # v1.3.6
|
|
||||||
@@ -3,7 +3,7 @@ on:
|
|||||||
workflow_dispatch: # Manual trigger
|
workflow_dispatch: # Manual trigger
|
||||||
pull_request:
|
pull_request:
|
||||||
paths:
|
paths:
|
||||||
- qt/res/linux/app.comaps.comaps.desktop
|
- qt/res/app.comaps.desktop.desktop
|
||||||
- .forgejo/workflows/desktop-file-check.yaml # Run check on self change
|
- .forgejo/workflows/desktop-file-check.yaml # Run check on self change
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
@@ -12,19 +12,19 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout sources
|
- name: Checkout sources
|
||||||
uses: actions/checkout@v4
|
uses: https://github.com/actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 1
|
fetch-depth: 1
|
||||||
sparse-checkout: |
|
sparse-checkout: |
|
||||||
qt/res/linux/app.comaps.comaps.desktop
|
qt/res/app.comaps.desktop.desktop
|
||||||
|
|
||||||
- name: Install desktop-file-validate tool
|
- name: Install desktop-file-validate tool
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
sudo apt update -y
|
apt update -y
|
||||||
sudo apt install -y \
|
apt install -y \
|
||||||
desktop-file-utils
|
desktop-file-utils
|
||||||
|
|
||||||
- name: Validate desktop file
|
- name: Validate desktop file
|
||||||
shell: bash
|
shell: bash
|
||||||
run: desktop-file-validate qt/res/linux/app.comaps.comaps.desktop && echo "Successfully validated .desktop file"
|
run: desktop-file-validate qt/res/app.comaps.desktop.desktop && echo "Successfully validated .desktop file"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ on:
|
|||||||
workflow_dispatch: # Manual trigger
|
workflow_dispatch: # Manual trigger
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- fix-ci
|
||||||
paths-ignore:
|
paths-ignore:
|
||||||
- .gitignore
|
- .gitignore
|
||||||
- .forgejo/**
|
- .forgejo/**
|
||||||
@@ -35,7 +35,7 @@ jobs:
|
|||||||
name: Apple TestFlight
|
name: Apple TestFlight
|
||||||
runs-on: macos-15
|
runs-on: macos-15
|
||||||
env:
|
env:
|
||||||
DEVELOPER_DIR: /Applications/Xcode_26.app/Contents/Developer
|
DEVELOPER_DIR: /Applications/Xcode_16.app/Contents/Developer
|
||||||
LANG: en_US.UTF-8 # Fastlane complains that the terminal is using ASCII.
|
LANG: en_US.UTF-8 # Fastlane complains that the terminal is using ASCII.
|
||||||
LANGUAGE: en_US.UTF-8
|
LANGUAGE: en_US.UTF-8
|
||||||
LC_ALL: en_US.UTF-8
|
LC_ALL: en_US.UTF-8
|
||||||
@@ -45,7 +45,7 @@ jobs:
|
|||||||
shell: bash
|
shell: bash
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout sources
|
- name: Checkout sources
|
||||||
uses: actions/checkout@v4
|
uses: https://github.com/actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 100 # enough to get all commits for the current day
|
fetch-depth: 100 # enough to get all commits for the current day
|
||||||
|
|
||||||
@@ -66,10 +66,6 @@ jobs:
|
|||||||
CERTIFICATES_DEV_P12: ${{ secrets.CERTIFICATES_DEV_P12 }}
|
CERTIFICATES_DEV_P12: ${{ secrets.CERTIFICATES_DEV_P12 }}
|
||||||
CERTIFICATES_DISTR_P12: ${{ secrets.CERTIFICATES_DISTR_P12 }}
|
CERTIFICATES_DISTR_P12: ${{ secrets.CERTIFICATES_DISTR_P12 }}
|
||||||
|
|
||||||
- name: Configure repository
|
|
||||||
shell: bash
|
|
||||||
run: ./configure.sh
|
|
||||||
|
|
||||||
- name: Compile and upload to TestFlight
|
- name: Compile and upload to TestFlight
|
||||||
run: |
|
run: |
|
||||||
echo "IOS_VERSION=$(../tools/unix/version.sh ios_version)-$(../tools/unix/version.sh ios_build)" >> "$GITHUB_ENV"
|
echo "IOS_VERSION=$(../tools/unix/version.sh ios_version)-$(../tools/unix/version.sh ios_build)" >> "$GITHUB_ENV"
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: https://github.com/actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 1
|
fetch-depth: 1
|
||||||
sparse-checkout: |
|
sparse-checkout: |
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ on:
|
|||||||
workflow_dispatch: # Manual trigger
|
workflow_dispatch: # Manual trigger
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- fix-ci
|
||||||
pull_request:
|
pull_request:
|
||||||
paths-ignore:
|
paths-ignore:
|
||||||
- .gitignore
|
- .gitignore
|
||||||
@@ -37,7 +37,7 @@ jobs:
|
|||||||
name: Build iOS
|
name: Build iOS
|
||||||
runs-on: macos-15
|
runs-on: macos-15
|
||||||
env:
|
env:
|
||||||
DEVELOPER_DIR: /Applications/Xcode_26.app/Contents/Developer
|
DEVELOPER_DIR: /Applications/Xcode_16.app/Contents/Developer
|
||||||
LANG: en_US.UTF-8 # Fastlane complains that the terminal is using ASCII.
|
LANG: en_US.UTF-8 # Fastlane complains that the terminal is using ASCII.
|
||||||
LANGUAGE: en_US.UTF-8
|
LANGUAGE: en_US.UTF-8
|
||||||
LC_ALL: en_US.UTF-8
|
LC_ALL: en_US.UTF-8
|
||||||
@@ -53,16 +53,12 @@ jobs:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout sources
|
- name: Checkout sources
|
||||||
uses: actions/checkout@v4
|
uses: https://github.com/actions/checkout@v4
|
||||||
|
|
||||||
- name: Parallel submodules checkout
|
- name: Parallel submodules checkout
|
||||||
shell: bash
|
shell: bash
|
||||||
run: git submodule update --depth 1 --init --recursive --jobs=$(($(sysctl -n hw.logicalcpu) * 20))
|
run: git submodule update --depth 1 --init --recursive --jobs=$(($(sysctl -n hw.logicalcpu) * 20))
|
||||||
|
|
||||||
- name: Configure repository
|
|
||||||
shell: bash
|
|
||||||
run: ./configure.sh
|
|
||||||
|
|
||||||
- name: Configure XCode cache
|
- name: Configure XCode cache
|
||||||
uses: irgaly/xcode-cache@v1
|
uses: irgaly/xcode-cache@v1
|
||||||
with:
|
with:
|
||||||
|
|||||||
@@ -7,14 +7,14 @@ jobs:
|
|||||||
name: iOS Release
|
name: iOS Release
|
||||||
runs-on: macos-15
|
runs-on: macos-15
|
||||||
env:
|
env:
|
||||||
DEVELOPER_DIR: /Applications/Xcode_26.app/Contents/Developer
|
DEVELOPER_DIR: /Applications/Xcode_16.app/Contents/Developer
|
||||||
LANG: en_US.UTF-8 # Fastlane complains that the terminal is using ASCII.
|
LANG: en_US.UTF-8 # Fastlane complains that the terminal is using ASCII.
|
||||||
LANGUAGE: en_US.UTF-8
|
LANGUAGE: en_US.UTF-8
|
||||||
LC_ALL: en_US.UTF-8
|
LC_ALL: en_US.UTF-8
|
||||||
environment: production
|
environment: production
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: https://github.com/actions/checkout@v4
|
||||||
|
|
||||||
- name: Restore release keys
|
- name: Restore release keys
|
||||||
shell: bash
|
shell: bash
|
||||||
@@ -25,7 +25,7 @@ jobs:
|
|||||||
APPSTORE_JSON: ${{ secrets.APPSTORE_JSON }}
|
APPSTORE_JSON: ${{ secrets.APPSTORE_JSON }}
|
||||||
|
|
||||||
- name: Checkout screenshots
|
- name: Checkout screenshots
|
||||||
uses: actions/checkout@v4
|
uses: https://github.com/actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
repository: ${{ secrets.SCREENSHOTS_REPO }}
|
repository: ${{ secrets.SCREENSHOTS_REPO }}
|
||||||
ssh-key: ${{ secrets.SCREENSHOTS_SSH_KEY }}
|
ssh-key: ${{ secrets.SCREENSHOTS_SSH_KEY }}
|
||||||
@@ -33,7 +33,7 @@ jobs:
|
|||||||
path: screenshots
|
path: screenshots
|
||||||
|
|
||||||
- name: Checkout keywords
|
- name: Checkout keywords
|
||||||
uses: actions/checkout@v4
|
uses: https://github.com/actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
repository: ${{ secrets.KEYWORDS_REPO }}
|
repository: ${{ secrets.KEYWORDS_REPO }}
|
||||||
ssh-key: ${{ secrets.KEYWORDS_SSH_KEY }}
|
ssh-key: ${{ secrets.KEYWORDS_SSH_KEY }}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ on:
|
|||||||
workflow_dispatch: # Manual trigger
|
workflow_dispatch: # Manual trigger
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- fix-ci
|
||||||
pull_request:
|
pull_request:
|
||||||
paths-ignore:
|
paths-ignore:
|
||||||
- .gitignore
|
- .gitignore
|
||||||
@@ -39,7 +39,7 @@ jobs:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout sources
|
- name: Checkout sources
|
||||||
uses: actions/checkout@v4
|
uses: https://github.com/actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 100 # enough to get all commits for the current day
|
fetch-depth: 100 # enough to get all commits for the current day
|
||||||
|
|
||||||
@@ -50,9 +50,10 @@ jobs:
|
|||||||
- name: Install build tools and dependencies
|
- name: Install build tools and dependencies
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
sudo apt update -y
|
apt update -y
|
||||||
sudo apt install -y \
|
apt install -y \
|
||||||
ninja-build \
|
ninja-build \
|
||||||
|
cmake \
|
||||||
libgl1-mesa-dev \
|
libgl1-mesa-dev \
|
||||||
libglvnd-dev \
|
libglvnd-dev \
|
||||||
libharfbuzz-dev \
|
libharfbuzz-dev \
|
||||||
@@ -67,7 +68,7 @@ jobs:
|
|||||||
libqt6positioning6
|
libqt6positioning6
|
||||||
|
|
||||||
- name: Configure ccache
|
- name: Configure ccache
|
||||||
uses: hendrikmuhs/ccache-action@v1.2
|
uses: https://github.com/hendrikmuhs/ccache-action@v1.2
|
||||||
with:
|
with:
|
||||||
key: ${{ github.workflow }}-no-unity
|
key: ${{ github.workflow }}-no-unity
|
||||||
|
|
||||||
@@ -103,7 +104,7 @@ jobs:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout sources
|
- name: Checkout sources
|
||||||
uses: actions/checkout@v4
|
uses: https://github.com/actions/checkout@v4
|
||||||
|
|
||||||
- name: Parallel submodules checkout
|
- name: Parallel submodules checkout
|
||||||
shell: bash
|
shell: bash
|
||||||
@@ -112,8 +113,8 @@ jobs:
|
|||||||
- name: Install build tools and dependencies
|
- name: Install build tools and dependencies
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
sudo apt update -y
|
apt update -y
|
||||||
sudo apt install -y \
|
apt install -y \
|
||||||
ninja-build \
|
ninja-build \
|
||||||
libgl1-mesa-dev \
|
libgl1-mesa-dev \
|
||||||
libglvnd-dev \
|
libglvnd-dev \
|
||||||
@@ -129,18 +130,10 @@ jobs:
|
|||||||
libqt6positioning6
|
libqt6positioning6
|
||||||
|
|
||||||
- name: Configure ccache
|
- name: Configure ccache
|
||||||
uses: hendrikmuhs/ccache-action@v1.2
|
uses: https://github.com/hendrikmuhs/ccache-action@v1.2
|
||||||
with:
|
with:
|
||||||
key: ${{ github.workflow }}-unity-${{ matrix.compiler.CC }}-${{ matrix.CMAKE_BUILD_TYPE }}
|
key: ${{ github.workflow }}-unity-${{ matrix.compiler.CC }}-${{ matrix.CMAKE_BUILD_TYPE }}
|
||||||
|
|
||||||
- name: Configure repository
|
|
||||||
shell: bash
|
|
||||||
env:
|
|
||||||
SKIP_MAP_DOWNLOAD: 1
|
|
||||||
SKIP_GENERATE_SYMBOLS: 1
|
|
||||||
SKIP_GENERATE_DRULES: 1
|
|
||||||
run: ./configure.sh
|
|
||||||
|
|
||||||
- name: CMake
|
- name: CMake
|
||||||
shell: bash
|
shell: bash
|
||||||
env:
|
env:
|
||||||
@@ -172,13 +165,13 @@ jobs:
|
|||||||
# world_feed_integration_tests - https://github.com/organicmaps/organicmaps/issues/215
|
# world_feed_integration_tests - https://github.com/organicmaps/organicmaps/issues/215
|
||||||
CTEST_EXCLUDE_REGEX: "generator_integration_tests|opening_hours_integration_tests|opening_hours_supported_features_tests|routing_benchmarks|routing_integration_tests|routing_quality_tests|search_quality_tests|storage_integration_tests|shaders_tests|world_feed_integration_tests"
|
CTEST_EXCLUDE_REGEX: "generator_integration_tests|opening_hours_integration_tests|opening_hours_supported_features_tests|routing_benchmarks|routing_integration_tests|routing_quality_tests|search_quality_tests|storage_integration_tests|shaders_tests|world_feed_integration_tests"
|
||||||
run: |
|
run: |
|
||||||
sudo locale-gen en_US
|
locale-gen en_US
|
||||||
sudo locale-gen en_US.UTF-8
|
locale-gen en_US.UTF-8
|
||||||
sudo locale-gen es_ES
|
locale-gen es_ES
|
||||||
sudo locale-gen es_ES.UTF-8
|
locale-gen es_ES.UTF-8
|
||||||
sudo locale-gen fr_FR
|
locale-gen fr_FR
|
||||||
sudo locale-gen fr_FR.UTF-8
|
locale-gen fr_FR.UTF-8
|
||||||
sudo locale-gen ru_RU
|
locale-gen ru_RU
|
||||||
sudo locale-gen ru_RU.UTF-8
|
locale-gen ru_RU.UTF-8
|
||||||
sudo update-locale
|
update-locale
|
||||||
ctest -L "omim-test" -E "$CTEST_EXCLUDE_REGEX" --output-on-failure
|
ctest -L "omim-test" -E "$CTEST_EXCLUDE_REGEX" --output-on-failure
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ on:
|
|||||||
workflow_dispatch: # Manual trigger
|
workflow_dispatch: # Manual trigger
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- fix-ci
|
||||||
pull_request:
|
pull_request:
|
||||||
paths-ignore:
|
paths-ignore:
|
||||||
- .gitignore
|
- .gitignore
|
||||||
@@ -32,7 +32,7 @@ jobs:
|
|||||||
name: macOS builds and tests
|
name: macOS builds and tests
|
||||||
runs-on: macos-15
|
runs-on: macos-15
|
||||||
env:
|
env:
|
||||||
DEVELOPER_DIR: /Applications/Xcode_26.app/Contents/Developer
|
DEVELOPER_DIR: /Applications/Xcode_16.app/Contents/Developer
|
||||||
HOMEBREW_NO_ANALYTICS: 1
|
HOMEBREW_NO_ANALYTICS: 1
|
||||||
HOMEBREW_NO_INSTALL_CLEANUP: 1
|
HOMEBREW_NO_INSTALL_CLEANUP: 1
|
||||||
strategy:
|
strategy:
|
||||||
@@ -46,7 +46,7 @@ jobs:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout sources
|
- name: Checkout sources
|
||||||
uses: actions/checkout@v4
|
uses: https://github.com/actions/checkout@v4
|
||||||
|
|
||||||
- name: Parallel submodules checkout
|
- name: Parallel submodules checkout
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|||||||
@@ -1,382 +0,0 @@
|
|||||||
name: map-generator
|
|
||||||
on:
|
|
||||||
workflow_dispatch: # Manual trigger
|
|
||||||
inputs:
|
|
||||||
jobs:
|
|
||||||
description: 'Which job(s) to run right now?'
|
|
||||||
required: true
|
|
||||||
default: 'all'
|
|
||||||
type: choice
|
|
||||||
options:
|
|
||||||
- all
|
|
||||||
- copy-coasts
|
|
||||||
- planet
|
|
||||||
- wiki
|
|
||||||
- isolines
|
|
||||||
- subways
|
|
||||||
- tiger
|
|
||||||
- maps
|
|
||||||
|
|
||||||
env:
|
|
||||||
WIKIMEDIA_USERNAME: ${{ secrets.WIKIMEDIA_USERNAME }}
|
|
||||||
WIKIMEDIA_PASSWORD: ${{ secrets.WIKIMEDIA_PASSWORD }}
|
|
||||||
S3_KEY_ID: ${{ secrets.S3_KEY_ID }}
|
|
||||||
S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}
|
|
||||||
S3_ENDPOINT: ${{ secrets.S3_ENDPOINT }}
|
|
||||||
S3_BUCKET: ${{ secrets.S3_BUCKET }}
|
|
||||||
SFTP_USER: ${{ secrets.SFTP_USER }}
|
|
||||||
SFTP_PASSWORD: ${{ secrets.SFTP_PASSWORD }}
|
|
||||||
SFTP_HOST: ${{ secrets.SFTP_HOST }}
|
|
||||||
SFTP_PATH: ${{ secrets.SFTP_PATH }}
|
|
||||||
DEBIAN_FRONTEND: noninteractive
|
|
||||||
TZ: Etc/UTC
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
copy-coasts:
|
|
||||||
if: inputs.jobs == 'copy-coasts' || inputs.jobs == 'all'
|
|
||||||
name: Copy Previously Generated Coasts
|
|
||||||
runs-on: mapfilemaker
|
|
||||||
container:
|
|
||||||
image: ubuntu:latest
|
|
||||||
volumes:
|
|
||||||
- /media/4tbexternal:/media/4tbexternal
|
|
||||||
concurrency:
|
|
||||||
group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
|
|
||||||
cancel-in-progress: true
|
|
||||||
steps:
|
|
||||||
- name: Copy Coasts
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
if [ -f /media/4tbexternal/osm-maps/*/intermediate_data/WorldCoasts.geom ]; then
|
|
||||||
cp /media/4tbexternal/osm-maps/*/intermediate_data/WorldCoasts.geom /media/4tbexternal/osm-planet/latest_coasts.geom
|
|
||||||
cp /media/4tbexternal/osm-maps/*/intermediate_data/WorldCoasts.rawgeom /media/4tbexternal/osm-planet/latest_coasts.rawgeom
|
|
||||||
fi
|
|
||||||
|
|
||||||
update-planet:
|
|
||||||
if: inputs.jobs == 'planet' || inputs.jobs == 'all'
|
|
||||||
name: Update Planet
|
|
||||||
runs-on: mapfilemaker
|
|
||||||
container:
|
|
||||||
image: ubuntu:latest
|
|
||||||
volumes:
|
|
||||||
- /media/4tbexternal:/media/4tbexternal
|
|
||||||
concurrency:
|
|
||||||
group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
|
|
||||||
cancel-in-progress: true
|
|
||||||
steps:
|
|
||||||
- name: Install dependencies
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
apt-get update -y
|
|
||||||
apt-get install -y pyosmium osmium-tool python3-venv python3-pip wget2
|
|
||||||
rm -f /usr/lib/python*/EXTERNALLY-MANAGED
|
|
||||||
pip3 install "protobuf<4"
|
|
||||||
- name: Download Planet File if Absent
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
if [ ! -d /media/4tbexternal/osm-planet/planet/ ]; then
|
|
||||||
mkdir -p /media/4tbexternal/osm-planet/planet/
|
|
||||||
fi
|
|
||||||
if [ ! -f /media/4tbexternal/osm-planet/planet/planet-latest.osm.pbf ]; then
|
|
||||||
cd /media/4tbexternal/osm-planet/planet/
|
|
||||||
wget2 --verbose --progress=bar --continue --debug https://ftpmirror.your.org/pub/openstreetmap/pbf/planet-latest.osm.pbf
|
|
||||||
fi
|
|
||||||
- name: Update Planet
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
cd /media/4tbexternal/osm-planet/planet/
|
|
||||||
pyosmium-up-to-date planet-latest.osm.pbf -o planet-latest-new.osm.pbf -vv --size 16384
|
|
||||||
mv planet-latest-new.osm.pbf planet-latest.osm.pbf
|
|
||||||
- name: Converting planet-latest.osm.pbf to planet.o5m
|
|
||||||
run: /root/OM/osmctools/osmconvert planet-latest.osm.pbf -o=planet.o5m
|
|
||||||
|
|
||||||
wiki-update:
|
|
||||||
if: inputs.jobs == 'wiki' || inputs.jobs == 'all'
|
|
||||||
name: Update Wikipedia
|
|
||||||
runs-on: mapfilemaker
|
|
||||||
container:
|
|
||||||
image: ubuntu:latest
|
|
||||||
volumes:
|
|
||||||
- /media/4tbexternal:/media/4tbexternal
|
|
||||||
concurrency:
|
|
||||||
group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
|
|
||||||
cancel-in-progress: true
|
|
||||||
steps:
|
|
||||||
- name: Install dependencies
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
apt-get update -y
|
|
||||||
apt-get install -y jq curl wget2 rustc cargo git ca-certificates
|
|
||||||
- name: Clone wikiparser if necessary
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
if [ ! -d /media/4tbexternal/wikiparser ]; then
|
|
||||||
cd /media/4tbexternal
|
|
||||||
git clone https://codeberg.org/comaps/wikiparser.git
|
|
||||||
fi
|
|
||||||
- name: Check for planet file
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
if [ ! -f /media/4tbexternal/osm-planet/planet/planet-latest.osm.pbf ]; then
|
|
||||||
echo "ERROR: No file at /media/4tbexternal/osm-planet/planet/planet-latest.osm.pbf"
|
|
||||||
ls -al /media/4tbexternal/
|
|
||||||
ls -al /media/4tbexternal/osm-planet/
|
|
||||||
ls -al /media/4tbexternal/osm-planet/planet/
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
- name: Update Wikipedia from Enterprise API
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
mkdir -p /media/4tbexternal/osm-planet/wikipedia/dumps
|
|
||||||
mkdir -p /media/4tbexternal/osm-planet/wikipedia/build
|
|
||||||
cd /media/4tbexternal/wikiparser
|
|
||||||
ls -al
|
|
||||||
echo "Downloading ..."
|
|
||||||
./download.sh /media/4tbexternal/osm-planet/wikipedia/dumps
|
|
||||||
echo "Running ..."
|
|
||||||
./run.sh /media/4tbexternal/osm-planet/wikipedia/build \
|
|
||||||
/media/4tbexternal/osm-planet/planet/planet-latest.osm.pbf \
|
|
||||||
/media/4tbexternal/osm-planet/wikipedia/dumps/latest/*.tar.gz
|
|
||||||
echo "DONE"
|
|
||||||
|
|
||||||
update-isolines:
|
|
||||||
if: inputs.jobs == 'isolines' || inputs.jobs == 'all'
|
|
||||||
name: Update Isolines
|
|
||||||
runs-on: mapfilemaker
|
|
||||||
container:
|
|
||||||
image: ubuntu:latest
|
|
||||||
volumes:
|
|
||||||
- /media/4tbexternal:/media/4tbexternal
|
|
||||||
concurrency:
|
|
||||||
group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
|
|
||||||
cancel-in-progress: true
|
|
||||||
steps:
|
|
||||||
- name: Install dependencies
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
apt-get update -qq \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
curl \
|
|
||||||
osmctools \
|
|
||||||
rclone \
|
|
||||||
git \
|
|
||||||
ca-certificates \
|
|
||||||
openssh-client \
|
|
||||||
sshpass \
|
|
||||||
vim \
|
|
||||||
wget \
|
|
||||||
build-essential \
|
|
||||||
clang \
|
|
||||||
cmake \
|
|
||||||
python3 \
|
|
||||||
python3-pip \
|
|
||||||
python3.12-venv \
|
|
||||||
qt6-base-dev \
|
|
||||||
qt6-positioning-dev \
|
|
||||||
libc++-dev \
|
|
||||||
libfreetype-dev \
|
|
||||||
libglvnd-dev \
|
|
||||||
libgl1-mesa-dev \
|
|
||||||
libharfbuzz-dev \
|
|
||||||
libicu-dev \
|
|
||||||
libqt6svg6-dev \
|
|
||||||
libqt6positioning6-plugins \
|
|
||||||
libqt6positioning6 \
|
|
||||||
libsqlite3-dev \
|
|
||||||
libxrandr-dev \
|
|
||||||
libxinerama-dev \
|
|
||||||
libxcursor-dev \
|
|
||||||
libxi-dev \
|
|
||||||
zlib1g-dev
|
|
||||||
rm -f /usr/lib/python*/EXTERNALLY-MANAGED
|
|
||||||
pip3 install "protobuf<4"
|
|
||||||
- name: Clone main repo if necessary
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
if [ ! -d /media/4tbexternal/comaps-init ]; then
|
|
||||||
apt-get update -qq && apt-get install -y --no-install-recommends git
|
|
||||||
cd /media/4tbexternal
|
|
||||||
git clone --recurse-submodules --shallow-submodules -b rebase-generator-pastk-wb251014 --single-branch https://codeberg.org/comaps/comaps.git comaps-init
|
|
||||||
fi
|
|
||||||
- name: Update Isolines
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
cd /media/4tbexternal/comaps-init/
|
|
||||||
./tools/unix/build_omim.sh -R topography_generator_tool
|
|
||||||
rm -rf ../osm-planet/isolines/
|
|
||||||
mkdir ../osm-planet/isolines/
|
|
||||||
../omim-build-relwithdebinfo/topography_generator_tool \
|
|
||||||
--profiles_path=./data/conf/isolines/isolines-profiles.json \
|
|
||||||
--countries_to_generate_path=./data/conf/isolines/countries-to-generate.json \
|
|
||||||
--tiles_isolines_out_dir=../osm-planet/isolines/tmp-tiles/ \
|
|
||||||
--countries_isolines_out_dir=../osm-planet/isolines/ \
|
|
||||||
--data_dir=./data/ \
|
|
||||||
--srtm_path=../osm-planet/SRTM-patched-europe/ \
|
|
||||||
--threads=22
|
|
||||||
|
|
||||||
update-subways:
|
|
||||||
if: inputs.jobs == 'subways' || inputs.jobs == 'all'
|
|
||||||
name: Update Subways
|
|
||||||
runs-on: mapfilemaker
|
|
||||||
container:
|
|
||||||
image: ubuntu:latest
|
|
||||||
volumes:
|
|
||||||
- /media/4tbexternal:/media/4tbexternal
|
|
||||||
concurrency:
|
|
||||||
group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
|
|
||||||
cancel-in-progress: true
|
|
||||||
steps:
|
|
||||||
- name: Install dependencies
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
apt-get update -qq && apt-get install -y --no-install-recommends curl osmctools osmium-tool python3-venv ca-certificates git python3-pip
|
|
||||||
rm -f /usr/lib/python*/EXTERNALLY-MANAGED
|
|
||||||
pip3 install "protobuf<4"
|
|
||||||
- name: Clone subways if necessary
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
if [ ! -d /media/4tbexternal/subways ]; then
|
|
||||||
cd /media/4tbexternal
|
|
||||||
git clone https://codeberg.org/comaps/subways.git
|
|
||||||
fi
|
|
||||||
- name: Clone main repo if necessary
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
if [ ! -d /media/4tbexternal/comaps-init ]; then
|
|
||||||
cd /media/4tbexternal
|
|
||||||
git clone --recurse-submodules --shallow-submodules -b rebase-generator-pastk-wb251014 --single-branch https://codeberg.org/comaps/comaps.git comaps-init
|
|
||||||
fi
|
|
||||||
- name: Update Subways
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
cd /media/4tbexternal/comaps-init/
|
|
||||||
cp tools/unix/maps/settings.sh.prod tools/unix/maps/settings.sh
|
|
||||||
./tools/unix/maps/generate_subways.sh
|
|
||||||
|
|
||||||
update-tiger:
|
|
||||||
if: inputs.jobs == 'tiger' || inputs.jobs == 'all'
|
|
||||||
name: Update TIGER
|
|
||||||
runs-on: mapfilemaker
|
|
||||||
container:
|
|
||||||
image: ubuntu:latest
|
|
||||||
volumes:
|
|
||||||
- /media/4tbexternal:/media/4tbexternal
|
|
||||||
concurrency:
|
|
||||||
group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
|
|
||||||
cancel-in-progress: true
|
|
||||||
steps:
|
|
||||||
- name: Install dependencies
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
apt-get update -qq && apt-get install -y --no-install-recommends \
|
|
||||||
build-essential \
|
|
||||||
clang \
|
|
||||||
cmake \
|
|
||||||
ninja-build \
|
|
||||||
ca-certificates \
|
|
||||||
git \
|
|
||||||
wget2
|
|
||||||
- name: Clone main repo if necessary
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
if [ ! -d /media/4tbexternal/comaps-init ]; then
|
|
||||||
cd /media/4tbexternal
|
|
||||||
git clone --recurse-submodules --shallow-submodules -b rebase-generator-pastk-wb251014 --single-branch https://codeberg.org/comaps/comaps.git comaps-init
|
|
||||||
fi
|
|
||||||
- name: Build address_parser
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
cd /media/4tbexternal/comaps-init
|
|
||||||
rm -rf ../omim-build-relwithdebinfo/CMakeCache.txt
|
|
||||||
rm -rf ../omim-build-relwithdebinfo/CMakeFiles
|
|
||||||
./tools/unix/build_omim.sh -R address_parser_tool
|
|
||||||
- name: Update TIGER from Nominatim
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
cd /media/4tbexternal/osm-planet/
|
|
||||||
wget2 https://nominatim.org/data/tiger-nominatim-preprocessed-latest.csv.tar.gz
|
|
||||||
tar -xOzf tiger-nominatim-preprocessed-latest.csv.tar.gz | /media/4tbexternal/omim-build-relwithdebinfo/address_parser_tool --output_path=./tiger
|
|
||||||
|
|
||||||
generate-maps:
|
|
||||||
if: inputs.jobs == 'maps' || inputs.jobs == 'all'
|
|
||||||
name: Generate Maps
|
|
||||||
runs-on: mapfilemaker
|
|
||||||
container:
|
|
||||||
image: ubuntu:latest
|
|
||||||
volumes:
|
|
||||||
- /media/4tbexternal:/media/4tbexternal
|
|
||||||
options: --ulimit nofile=262144:262144
|
|
||||||
concurrency:
|
|
||||||
group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
|
|
||||||
cancel-in-progress: true
|
|
||||||
steps:
|
|
||||||
- name: Install dependencies
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
apt-get update -qq \
|
|
||||||
&& apt-get install -y --no-install-recommends \
|
|
||||||
curl \
|
|
||||||
osmctools \
|
|
||||||
rclone \
|
|
||||||
git \
|
|
||||||
ca-certificates \
|
|
||||||
openssh-client \
|
|
||||||
sshpass \
|
|
||||||
vim \
|
|
||||||
wget \
|
|
||||||
build-essential \
|
|
||||||
clang \
|
|
||||||
cmake \
|
|
||||||
ninja-build \
|
|
||||||
python3 \
|
|
||||||
python3-pip \
|
|
||||||
python3.12-venv \
|
|
||||||
qt6-base-dev \
|
|
||||||
qt6-positioning-dev \
|
|
||||||
libc++-dev \
|
|
||||||
libfreetype-dev \
|
|
||||||
libglvnd-dev \
|
|
||||||
libgl1-mesa-dev \
|
|
||||||
libharfbuzz-dev \
|
|
||||||
libicu-dev \
|
|
||||||
libqt6svg6-dev \
|
|
||||||
libqt6positioning6-plugins \
|
|
||||||
libqt6positioning6 \
|
|
||||||
libsqlite3-dev \
|
|
||||||
libxrandr-dev \
|
|
||||||
libxinerama-dev \
|
|
||||||
libxcursor-dev \
|
|
||||||
libxi-dev \
|
|
||||||
zlib1g-dev
|
|
||||||
- name: Clone repo if necessary
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
if [ ! -d /media/4tbexternal/comaps-init ]; then
|
|
||||||
cd /media/4tbexternal
|
|
||||||
git clone --recurse-submodules --shallow-submodules -b rebase-generator-pastk-wb251014 --single-branch https://codeberg.org/comaps/comaps.git comaps-init
|
|
||||||
fi
|
|
||||||
- name: Make output folders if necessary
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
if [ ! -d /media/4tbexternal/osm-maps ]; then
|
|
||||||
mkdir -p /media/4tbexternal/osm-maps
|
|
||||||
fi
|
|
||||||
- name: Get SRTM if necessary
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
if [ ! -d /media/4tbexternal/osm-planet/SRTM-patched-europe/ ]; then
|
|
||||||
echo "ERROR: NO SRTM"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
- name: Symlink paths for repo scripts
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
mkdir -p /root/OM
|
|
||||||
ln -s /media/4tbexternal/comaps-init /root/OM/organicmaps
|
|
||||||
ln -s /media/4tbexternal/osm-planet /home/planet
|
|
||||||
ln -s /media/4tbexternal/osm-maps /root/OM/maps_build
|
|
||||||
- name: Run docker_maps_generator.sh
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
cd /root/OM/organicmaps
|
|
||||||
./tools/unix/docker_maps_generator.sh
|
|
||||||
22
.forgejo/workflows/stale.yml
Normal file
22
.forgejo/workflows/stale.yml
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
name: Close stale PRs
|
||||||
|
on:
|
||||||
|
schedule:
|
||||||
|
- cron: "0 0 * * *" # Runs every day at midnight
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
stale:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
pull-requests: write
|
||||||
|
steps:
|
||||||
|
- uses: actions/stale@v9
|
||||||
|
with:
|
||||||
|
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
days-before-pr-stale: 180 # 6 months before warning
|
||||||
|
days-before-pr-close: 365 # Closed after 12 months
|
||||||
|
stale-pr-label: "stale"
|
||||||
|
stale-pr-message: "Hi! This PR has been inactive for 6 months. If it's still relevant, please update it to let us know you’d like to keep it open 😊"
|
||||||
|
close-pr-message: "This PR has been automatically closed after 12 months of inactivity."
|
||||||
|
days-before-issue-stale: -1 # Issues are never stale
|
||||||
|
days-before-issue-close: -1 # Issues are never closed
|
||||||
|
remove-stale-when-updated: true
|
||||||
15
.github/workflows/android-check.yaml
vendored
15
.github/workflows/android-check.yaml
vendored
@@ -6,7 +6,7 @@ on:
|
|||||||
- main
|
- main
|
||||||
|
|
||||||
env:
|
env:
|
||||||
JAVA_HOME: /usr/lib/jvm/temurin-21-jdk-amd64 # Java 21 is required for Android Gradle 8 plugin
|
JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64 # Java 17 is required for Android Gradle 8 plugin
|
||||||
SKIP_MAP_DOWNLOAD: true
|
SKIP_MAP_DOWNLOAD: true
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
@@ -23,17 +23,6 @@ jobs:
|
|||||||
shell: bash
|
shell: bash
|
||||||
run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
|
run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
|
||||||
|
|
||||||
- name: Install protobuf
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
sudo apt-get update -y
|
|
||||||
sudo apt-get install -y python3-pip
|
|
||||||
pip install "protobuf<3.21" --break-system-packages
|
|
||||||
|
|
||||||
- name: Configure repository
|
|
||||||
shell: bash
|
|
||||||
run: ./configure.sh
|
|
||||||
|
|
||||||
- name: Lint
|
- name: Lint
|
||||||
shell: bash
|
shell: bash
|
||||||
working-directory: android
|
working-directory: android
|
||||||
@@ -73,9 +62,7 @@ jobs:
|
|||||||
libxinerama-dev \
|
libxinerama-dev \
|
||||||
libxcursor-dev \
|
libxcursor-dev \
|
||||||
libxi-dev \
|
libxi-dev \
|
||||||
python3-pip \
|
|
||||||
zlib1g-dev
|
zlib1g-dev
|
||||||
pip install "protobuf<3.21" --break-system-packages
|
|
||||||
|
|
||||||
- name: Checkout sources
|
- name: Checkout sources
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|||||||
43
.github/workflows/clang-format.yaml
vendored
Normal file
43
.github/workflows/clang-format.yaml
vendored
Normal file
@@ -0,0 +1,43 @@
|
|||||||
|
name: clang-format
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [ master ]
|
||||||
|
paths:
|
||||||
|
- 'android/app/src/**.java'
|
||||||
|
- '.clang-format'
|
||||||
|
- '.github/workflows/clang-format.yml'
|
||||||
|
pull_request:
|
||||||
|
branches: [ master ]
|
||||||
|
paths:
|
||||||
|
- 'android/app/src/**.java'
|
||||||
|
- '.clang-format'
|
||||||
|
- '.github/workflows/clang-format.yml'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
check-formatting:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
continue-on-error: true # TODO(AB): Remove this line when ready to enforce formatting.
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Install clang-format
|
||||||
|
run: |
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y clang-format-19
|
||||||
|
clang-format-19 --version
|
||||||
|
|
||||||
|
- name: Check Java formatting
|
||||||
|
run: |
|
||||||
|
JAVA_FILES=($(find android/app/src -name '*.java'))
|
||||||
|
|
||||||
|
FORMATTING_ISSUES=$(clang-format-19 --dry-run --Werror $JAVA_FILES 2>&1 || true)
|
||||||
|
|
||||||
|
if [ -n "$FORMATTING_ISSUES" ]; then
|
||||||
|
echo "$FORMATTING_ISSUES"
|
||||||
|
echo ""
|
||||||
|
echo "To fix formatting, please run:"
|
||||||
|
echo " clang-format -i <file>"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
51
.github/workflows/code-style-check.yaml
vendored
51
.github/workflows/code-style-check.yaml
vendored
@@ -1,51 +0,0 @@
|
|||||||
name: Code style check
|
|
||||||
|
|
||||||
on:
|
|
||||||
pull_request:
|
|
||||||
branches: [ master ]
|
|
||||||
paths: # Should stay in sync with tools/unix/clang-format.sh
|
|
||||||
- '.github/workflows/code-style-check.yaml'
|
|
||||||
- 'android/app/src/**.java'
|
|
||||||
- 'android/sdk/src/**.java'
|
|
||||||
- 'android/sdk/src/main/cpp/**.[ch]pp'
|
|
||||||
- 'dev_sandbox/**.[ch]pp'
|
|
||||||
- 'generator/**.[ch]pp'
|
|
||||||
- 'iphone/**.[ch]pp'
|
|
||||||
- 'iphone/**.[hm]'
|
|
||||||
- 'iphone/**.mm'
|
|
||||||
- 'libs/**.[ch]pp'
|
|
||||||
- 'libs/**.[hm]'
|
|
||||||
- '!libs/indexer/drules_struct.pb.h'
|
|
||||||
- 'libs/**.mm'
|
|
||||||
- 'qt/**.[ch]pp'
|
|
||||||
- 'qt/**.h'
|
|
||||||
- 'tools/**.[ch]pp'
|
|
||||||
- '.clang-format'
|
|
||||||
- '.clang-format-ignore'
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
code-style-check:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Install clang-format
|
|
||||||
run: |
|
|
||||||
sudo apt purge -y clang-format-18 # Remove default old version of clang-format
|
|
||||||
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
|
|
||||||
echo 'deb http://apt.llvm.org/noble/ llvm-toolchain-noble-20 main' | sudo tee /etc/apt/sources.list.d/llvm-toolchain-noble-20.list
|
|
||||||
sudo apt-get update
|
|
||||||
sudo apt-get install -y clang-format-20
|
|
||||||
sudo update-alternatives --force --install /usr/bin/clang-format clang-format /usr/bin/clang-format-20 10
|
|
||||||
sudo update-alternatives --force --install /usr/bin/git-clang-format git-clang-format /usr/bin/git-clang-format-20 10
|
|
||||||
clang-format --version
|
|
||||||
- name: Checkout sources
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Check code style
|
|
||||||
run: tools/unix/clang-format.sh
|
|
||||||
|
|
||||||
- name: Post clang-format comments
|
|
||||||
if: failure()
|
|
||||||
uses: reviewdog/action-suggester@v1.21.0
|
|
||||||
with:
|
|
||||||
tool_name: clang-format
|
|
||||||
fail_level: error
|
|
||||||
7
.github/workflows/ios-check.yaml
vendored
7
.github/workflows/ios-check.yaml
vendored
@@ -10,7 +10,7 @@ jobs:
|
|||||||
name: Build iOS
|
name: Build iOS
|
||||||
runs-on: macos-15
|
runs-on: macos-15
|
||||||
env:
|
env:
|
||||||
DEVELOPER_DIR: /Applications/Xcode_26.app/Contents/Developer
|
DEVELOPER_DIR: /Applications/Xcode_16.app/Contents/Developer
|
||||||
LANG: en_US.UTF-8 # Fastlane complains that the terminal is using ASCII.
|
LANG: en_US.UTF-8 # Fastlane complains that the terminal is using ASCII.
|
||||||
LANGUAGE: en_US.UTF-8
|
LANGUAGE: en_US.UTF-8
|
||||||
LC_ALL: en_US.UTF-8
|
LC_ALL: en_US.UTF-8
|
||||||
@@ -30,7 +30,6 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
brew install qt \
|
brew install qt \
|
||||||
optipng
|
optipng
|
||||||
pip3 install "protobuf<3.21" --break-system-packages
|
|
||||||
- name: Checkout sources
|
- name: Checkout sources
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
@@ -38,10 +37,6 @@ jobs:
|
|||||||
shell: bash
|
shell: bash
|
||||||
run: git submodule update --depth 1 --init --recursive --jobs=$(($(sysctl -n hw.logicalcpu) * 20))
|
run: git submodule update --depth 1 --init --recursive --jobs=$(($(sysctl -n hw.logicalcpu) * 20))
|
||||||
|
|
||||||
- name: Configure repository
|
|
||||||
shell: bash
|
|
||||||
run: ./configure.sh
|
|
||||||
|
|
||||||
- name: Configure XCode cache
|
- name: Configure XCode cache
|
||||||
uses: irgaly/xcode-cache@v1
|
uses: irgaly/xcode-cache@v1
|
||||||
with:
|
with:
|
||||||
|
|||||||
28
.gitignore
vendored
28
.gitignore
vendored
@@ -14,29 +14,20 @@ stxxl.errlog
|
|||||||
stxxl.log
|
stxxl.log
|
||||||
screenlog.0
|
screenlog.0
|
||||||
|
|
||||||
|
data/styles/*/*/out/*
|
||||||
|
data/resources-*_design/*
|
||||||
# symbols png/sdf are now generated at build
|
# symbols png/sdf are now generated at build
|
||||||
data/symbols/**/symbols.png
|
data/resources-*_*/symbols.png
|
||||||
data/symbols/**/symbols.sdf
|
data/resources-*_*/symbols.sdf
|
||||||
|
data/drules_proto_default_design.bin
|
||||||
|
data/colors_design.txt
|
||||||
|
data/patterns_design.txt
|
||||||
data/bookmarks
|
data/bookmarks
|
||||||
data/edits.xml
|
data/edits.xml
|
||||||
data/World.mwm
|
data/World.mwm
|
||||||
data/WorldCoasts.mwm
|
data/WorldCoasts.mwm
|
||||||
data/world_mwm/*
|
data/world_mwm/*
|
||||||
data/*_hash
|
data/*_hash
|
||||||
data/drules_proto*
|
|
||||||
data/classificator.txt*
|
|
||||||
data/types.txt*
|
|
||||||
data/visibility.txt*
|
|
||||||
data/colors.txt*
|
|
||||||
data/patterns.txt*
|
|
||||||
# TODO: designer is not used at the moment
|
|
||||||
# data/symbols/*/design/
|
|
||||||
# data/colors_design.txt
|
|
||||||
# data/patterns_design.txt
|
|
||||||
|
|
||||||
# Auto-generated from data/categories-strings/* by tools/unix/generate_categories.sh
|
|
||||||
data/categories.txt
|
|
||||||
|
|
||||||
# Compiled Python
|
# Compiled Python
|
||||||
*.pyc
|
*.pyc
|
||||||
@@ -55,9 +46,10 @@ omim.sdf
|
|||||||
*.suo
|
*.suo
|
||||||
*.aps
|
*.aps
|
||||||
*.rc
|
*.rc
|
||||||
!qt/res/windows/windows.rc
|
!qt/res/windows.rc
|
||||||
*.pdb
|
*.pdb
|
||||||
out/
|
out/*
|
||||||
|
qt/mapswithme.log
|
||||||
|
|
||||||
# XCode
|
# XCode
|
||||||
xcode/keys/*
|
xcode/keys/*
|
||||||
|
|||||||
4
.gitmodules
vendored
4
.gitmodules
vendored
@@ -65,7 +65,3 @@
|
|||||||
[submodule "3party/imgui/imgui"]
|
[submodule "3party/imgui/imgui"]
|
||||||
path = 3party/imgui/imgui
|
path = 3party/imgui/imgui
|
||||||
url = https://github.com/ocornut/imgui
|
url = https://github.com/ocornut/imgui
|
||||||
[submodule "3party/glaze"]
|
|
||||||
path = 3party/glaze
|
|
||||||
url = https://github.com/stephenberry/glaze
|
|
||||||
branch = main
|
|
||||||
|
|||||||
@@ -57,7 +57,6 @@ endif()
|
|||||||
|
|
||||||
add_subdirectory(agg)
|
add_subdirectory(agg)
|
||||||
add_subdirectory(bsdiff-courgette)
|
add_subdirectory(bsdiff-courgette)
|
||||||
add_subdirectory(glaze)
|
|
||||||
add_subdirectory(minizip)
|
add_subdirectory(minizip)
|
||||||
add_subdirectory(open-location-code)
|
add_subdirectory(open-location-code)
|
||||||
add_subdirectory(opening_hours)
|
add_subdirectory(opening_hours)
|
||||||
|
|||||||
Submodule 3party/Vulkan-Headers updated: f69f0433ba...595c8d4794
@@ -4,9 +4,7 @@ set(FT_DISABLE_HARFBUZZ ON)
|
|||||||
add_subdirectory(freetype)
|
add_subdirectory(freetype)
|
||||||
|
|
||||||
# Fix warning with ONE_PIXEL macro clash.
|
# Fix warning with ONE_PIXEL macro clash.
|
||||||
if(NOT MSVC)
|
target_compile_options(freetype PRIVATE -Wno-macro-redefined)
|
||||||
target_compile_options(freetype PRIVATE -Wno-macro-redefined)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Use ft2build.h from the current directory instead of the default.
|
# Use ft2build.h from the current directory instead of the default.
|
||||||
target_include_directories(freetype
|
target_include_directories(freetype
|
||||||
|
|||||||
Submodule 3party/glaze deleted from 5a58d7936e
@@ -11,23 +11,14 @@ target_include_directories(${PROJECT_NAME}
|
|||||||
harfbuzz/src
|
harfbuzz/src
|
||||||
)
|
)
|
||||||
|
|
||||||
if (MSVC)
|
# Keep these settigns in sync with xcode/harfbuzz project.
|
||||||
target_compile_options(${PROJECT_NAME}
|
target_compile_options(${PROJECT_NAME}
|
||||||
PRIVATE
|
|
||||||
/GR-
|
|
||||||
/EHsc-
|
|
||||||
/Zc:threadSafeInit-
|
|
||||||
)
|
|
||||||
else()
|
|
||||||
# Keep these settings in sync with xcode/harfbuzz project.
|
|
||||||
target_compile_options(${PROJECT_NAME}
|
|
||||||
PRIVATE
|
PRIVATE
|
||||||
-fno-rtti
|
-fno-rtti
|
||||||
-fno-exceptions
|
-fno-exceptions
|
||||||
-fno-threadsafe-statics
|
-fno-threadsafe-statics
|
||||||
$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:-Wno-format-pedantic>
|
$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:-Wno-format-pedantic>
|
||||||
)
|
)
|
||||||
endif()
|
|
||||||
|
|
||||||
target_compile_definitions(${PROJECT_NAME}
|
target_compile_definitions(${PROJECT_NAME}
|
||||||
PRIVATE
|
PRIVATE
|
||||||
@@ -37,19 +28,13 @@ target_compile_definitions(${PROJECT_NAME}
|
|||||||
#$<$<BOOL:${APPLE}>:HAVE_CORETEXT>
|
#$<$<BOOL:${APPLE}>:HAVE_CORETEXT>
|
||||||
HAVE_ATEXIT
|
HAVE_ATEXIT
|
||||||
HAVE_GETPAGESIZE
|
HAVE_GETPAGESIZE
|
||||||
HAVE_MPROTECT
|
|
||||||
HAVE_SYSCONF
|
|
||||||
)
|
|
||||||
|
|
||||||
if (NOT MSVC)
|
|
||||||
target_compile_definitions(${PROJECT_NAME}
|
|
||||||
PRIVATE
|
|
||||||
HAVE_MMAP
|
HAVE_MMAP
|
||||||
|
HAVE_MPROTECT
|
||||||
HAVE_PTHREAD
|
HAVE_PTHREAD
|
||||||
|
HAVE_SYSCONF
|
||||||
HAVE_SYS_MMAN_H
|
HAVE_SYS_MMAN_H
|
||||||
HAVE_UNISTD_H
|
HAVE_UNISTD_H
|
||||||
)
|
)
|
||||||
endif()
|
|
||||||
|
|
||||||
target_link_libraries(${PROJECT_NAME} Freetype::Freetype)
|
target_link_libraries(${PROJECT_NAME} Freetype::Freetype)
|
||||||
|
|
||||||
|
|||||||
@@ -172,7 +172,6 @@ add_library(icuuc
|
|||||||
icu/icu4c/source/common/uvector.cpp
|
icu/icu4c/source/common/uvector.cpp
|
||||||
icu/icu4c/source/common/uvectr32.cpp
|
icu/icu4c/source/common/uvectr32.cpp
|
||||||
icu/icu4c/source/common/uvectr64.h
|
icu/icu4c/source/common/uvectr64.h
|
||||||
icu/icu4c/source/common/wintz.cpp
|
|
||||||
icu/icu4c/source/common/wintz.h
|
icu/icu4c/source/common/wintz.h
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ set(SRC
|
|||||||
protobuf/src/google/protobuf/message_lite.cc
|
protobuf/src/google/protobuf/message_lite.cc
|
||||||
protobuf/src/google/protobuf/repeated_field.cc
|
protobuf/src/google/protobuf/repeated_field.cc
|
||||||
protobuf/src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc
|
protobuf/src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc
|
||||||
protobuf/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc
|
|
||||||
protobuf/src/google/protobuf/stubs/bytestream.cc
|
protobuf/src/google/protobuf/stubs/bytestream.cc
|
||||||
protobuf/src/google/protobuf/stubs/common.cc
|
protobuf/src/google/protobuf/stubs/common.cc
|
||||||
protobuf/src/google/protobuf/stubs/int128.cc
|
protobuf/src/google/protobuf/stubs/int128.cc
|
||||||
|
|||||||
Submodule 3party/protobuf/protobuf updated: 9442c12e86...a6189acd18
@@ -7,6 +7,7 @@
|
|||||||
#include <boost/utility/enable_if.hpp>
|
#include <boost/utility/enable_if.hpp>
|
||||||
#include <boost/utility.hpp>
|
#include <boost/utility.hpp>
|
||||||
#include <boost/type_traits/is_pod.hpp>
|
#include <boost/type_traits/is_pod.hpp>
|
||||||
|
#include <boost/iostreams/device/mapped_file.hpp>
|
||||||
|
|
||||||
#include "mappable_vector.hpp"
|
#include "mappable_vector.hpp"
|
||||||
|
|
||||||
@@ -282,6 +283,12 @@ namespace succinct { namespace mapper {
|
|||||||
return mapper.bytes_read();
|
return mapper.bytes_read();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
size_t map(T& val, boost::iostreams::mapped_file_source const& m, uint64_t flags = 0, const char* friendly_name = "<TOP>")
|
||||||
|
{
|
||||||
|
return map(val, m.data(), flags, friendly_name);
|
||||||
|
}
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
uint64_t size_of(T& val)
|
uint64_t size_of(T& val)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
#include <boost/iterator/iterator_facade.hpp>
|
#include <boost/iterator/iterator_facade.hpp>
|
||||||
|
#include <boost/iostreams/device/mapped_file.hpp>
|
||||||
|
|
||||||
namespace succinct { namespace util {
|
namespace succinct { namespace util {
|
||||||
|
|
||||||
@@ -204,6 +205,29 @@ namespace succinct { namespace util {
|
|||||||
std::string m_cur_value;
|
std::string m_cur_value;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct mmap_lines
|
||||||
|
{
|
||||||
|
typedef buffer_line_iterator iterator;
|
||||||
|
typedef buffer_line_iterator const_iterator;
|
||||||
|
|
||||||
|
mmap_lines(std::string filename)
|
||||||
|
: m_map(filename)
|
||||||
|
{}
|
||||||
|
|
||||||
|
const_iterator begin() const
|
||||||
|
{
|
||||||
|
return const_iterator(m_map.data(), m_map.size());
|
||||||
|
}
|
||||||
|
|
||||||
|
const_iterator end() const
|
||||||
|
{
|
||||||
|
return const_iterator();
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
boost::iostreams::mapped_file_source m_map;
|
||||||
|
};
|
||||||
|
|
||||||
struct input_error : std::invalid_argument
|
struct input_error : std::invalid_argument
|
||||||
{
|
{
|
||||||
input_error(std::string const& what)
|
input_error(std::string const& what)
|
||||||
|
|||||||
@@ -19,18 +19,7 @@ extern "C" {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "vulkan_wrapper.h"
|
#include "vulkan_wrapper.h"
|
||||||
|
|
||||||
#if defined(_WIN32)
|
|
||||||
#ifndef WIN32_LEAN_AND_MEAN
|
|
||||||
#define WIN32_LEAN_AND_MEAN
|
|
||||||
#endif
|
|
||||||
#ifndef NOMINMAX
|
|
||||||
#define NOMINMAX
|
|
||||||
#endif
|
|
||||||
#include <windows.h>
|
|
||||||
#else
|
|
||||||
#include <dlfcn.h>
|
#include <dlfcn.h>
|
||||||
#endif
|
|
||||||
|
|
||||||
int InitVulkan(void) {
|
int InitVulkan(void) {
|
||||||
#if defined(__APPLE__)
|
#if defined(__APPLE__)
|
||||||
@@ -41,9 +30,6 @@ int InitVulkan(void) {
|
|||||||
if (!libvulkan) {
|
if (!libvulkan) {
|
||||||
libvulkan = dlopen("libMoltenVK.dylib", RTLD_NOW | RTLD_LOCAL);
|
libvulkan = dlopen("libMoltenVK.dylib", RTLD_NOW | RTLD_LOCAL);
|
||||||
}
|
}
|
||||||
#elif defined( _WIN32 )
|
|
||||||
HMODULE libvulkan = LoadLibraryA("vulkan-1.dll");
|
|
||||||
auto dlsym = [](HMODULE h, char const * name) { return GetProcAddress(h, name); };
|
|
||||||
#else
|
#else
|
||||||
void* libvulkan = dlopen("libvulkan.so.1", RTLD_NOW | RTLD_LOCAL);
|
void* libvulkan = dlopen("libvulkan.so.1", RTLD_NOW | RTLD_LOCAL);
|
||||||
if (!libvulkan) {
|
if (!libvulkan) {
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
cmake_minimum_required(VERSION 3.22.1)
|
cmake_minimum_required(VERSION 3.22.1)
|
||||||
|
|
||||||
project(omim C CXX)
|
project(omim C CXX)
|
||||||
|
|
||||||
set(CMAKE_CXX_STANDARD 23)
|
set(CMAKE_CXX_STANDARD 20)
|
||||||
set(CMAKE_C_STANDARD 23)
|
set(CMAKE_C_STANDARD 17)
|
||||||
# Our code does not rely on gnu extensions.
|
# Our code does not rely on gnu extensions.
|
||||||
set(CMAKE_CXX_EXTENSIONS OFF)
|
set(CMAKE_CXX_EXTENSIONS OFF)
|
||||||
set(CMAKE_C_EXTENSIONS OFF)
|
set(CMAKE_C_EXTENSIONS OFF)
|
||||||
@@ -39,16 +38,18 @@ if (APPLE AND NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL Android))
|
|||||||
# https://gitlab.kitware.com/cmake/cmake/-/issues/21963
|
# https://gitlab.kitware.com/cmake/cmake/-/issues/21963
|
||||||
enable_language(OBJC)
|
enable_language(OBJC)
|
||||||
set(CMAKE_OBJC_EXTENSIONS OFF)
|
set(CMAKE_OBJC_EXTENSIONS OFF)
|
||||||
set(CMAKE_OBJC_STANDARD 23)
|
set(CMAKE_OBJC_STANDARD 11)
|
||||||
set(CMAKE_OBJC_FLAGS -fobjc-arc)
|
set(CMAKE_OBJC_FLAGS -fobjc-arc)
|
||||||
set(CMAKE_OBJC_VISIBILITY_PRESET hidden)
|
set(CMAKE_OBJC_VISIBILITY_PRESET hidden)
|
||||||
enable_language(OBJCXX)
|
enable_language(OBJCXX)
|
||||||
set(CMAKE_OBJCXX_EXTENSIONS OFF)
|
set(CMAKE_OBJCXX_EXTENSIONS OFF)
|
||||||
set(CMAKE_OBJCXX_STANDARD 23)
|
set(CMAKE_OBJCXX_STANDARD 20)
|
||||||
set(CMAKE_OBJCXX_FLAGS -fobjc-arc)
|
set(CMAKE_OBJCXX_FLAGS -fobjc-arc)
|
||||||
set(CMAKE_OBJCXX_VISIBILITY_PRESET hidden)
|
set(CMAKE_OBJCXX_VISIBILITY_PRESET hidden)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
execute_process(COMMAND "./configure.sh" WORKING_DIRECTORY ${OMIM_ROOT})
|
||||||
|
|
||||||
message(STATUS "Using compiler ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}")
|
message(STATUS "Using compiler ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}")
|
||||||
|
|
||||||
if (CMAKE_UNITY_BUILD)
|
if (CMAKE_UNITY_BUILD)
|
||||||
@@ -85,7 +86,7 @@ if (MSVC)
|
|||||||
add_compile_options(/utf-8)
|
add_compile_options(/utf-8)
|
||||||
add_link_options(/INCREMENTAL:NO)
|
add_link_options(/INCREMENTAL:NO)
|
||||||
else()
|
else()
|
||||||
add_compile_options(-ffast-math $<$<CXX_COMPILER_ID:GNU>:-Wno-psabi>)
|
add_compile_options(-ffast-math)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (PLATFORM_WIN)
|
if (PLATFORM_WIN)
|
||||||
@@ -104,7 +105,7 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
|
|||||||
elseif (${CMAKE_BUILD_TYPE} MATCHES "Rel")
|
elseif (${CMAKE_BUILD_TYPE} MATCHES "Rel")
|
||||||
add_definitions(-DRELEASE)
|
add_definitions(-DRELEASE)
|
||||||
if (NOT MSVC)
|
if (NOT MSVC)
|
||||||
add_compile_options(-O3 $<$<CXX_COMPILER_ID:GNU>:-flto=auto>)
|
add_compile_options(-Ofast $<$<CXX_COMPILER_ID:GNU>:-flto=auto>) # Also enables -ffast-math
|
||||||
endif()
|
endif()
|
||||||
else()
|
else()
|
||||||
message(FATAL_ERROR "Unknown build type: " ${CMAKE_BUILD_TYPE})
|
message(FATAL_ERROR "Unknown build type: " ${CMAKE_BUILD_TYPE})
|
||||||
@@ -120,7 +121,7 @@ if (PLATFORM_LINUX AND (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_BUILD_T
|
|||||||
add_compile_options(-fno-fat-lto-objects)
|
add_compile_options(-fno-fat-lto-objects)
|
||||||
# To fix ar and ranlib "plugin needed to handle lto object".
|
# To fix ar and ranlib "plugin needed to handle lto object".
|
||||||
string(REGEX MATCH "[0-9]+" GCC_MAJOR_VERSION ${CMAKE_CXX_COMPILER_VERSION})
|
string(REGEX MATCH "[0-9]+" GCC_MAJOR_VERSION ${CMAKE_CXX_COMPILER_VERSION})
|
||||||
file(GLOB_RECURSE plugin /usr/lib/gcc/*/${GCC_MAJOR_VERSION}*/liblto_plugin.so)
|
file(GLOB_RECURSE plugin /usr/lib/gcc/*/${GCC_MAJOR_VERSION}/liblto_plugin.so)
|
||||||
set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> --plugin ${plugin} qcs <TARGET> <OBJECTS>")
|
set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> --plugin ${plugin} qcs <TARGET> <OBJECTS>")
|
||||||
set(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> --plugin ${plugin} <TARGET>")
|
set(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> --plugin ${plugin} <TARGET>")
|
||||||
set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> --plugin ${plugin} qcs <TARGET> <OBJECTS>")
|
set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> --plugin ${plugin} qcs <TARGET> <OBJECTS>")
|
||||||
@@ -175,15 +176,15 @@ if (NOT PLATFORM_IPHONE AND NOT PLATFORM_ANDROID)
|
|||||||
find_package(Qt6 COMPONENTS REQUIRED ${qt_components} PATHS $ENV{QT_PATH} /opt/homebrew/opt/qt@6 /usr/local/opt/qt@6 /usr/lib/x86_64-linux-gnu/qt6)
|
find_package(Qt6 COMPONENTS REQUIRED ${qt_components} PATHS $ENV{QT_PATH} /opt/homebrew/opt/qt@6 /usr/local/opt/qt@6 /usr/lib/x86_64-linux-gnu/qt6)
|
||||||
|
|
||||||
set(MINIMUM_REQUIRED_QT_VERSION 6.4.0)
|
set(MINIMUM_REQUIRED_QT_VERSION 6.4.0)
|
||||||
if (Qt6_VERSION VERSION_LESS ${MINIMUM_REQUIRED_QT_VERSION})
|
if (Qt6Widgets_VERSION VERSION_LESS ${MINIMUM_REQUIRED_QT_VERSION})
|
||||||
message(FATAL_ERROR "Unsupported Qt version: ${Qt6_VERSION}, the minimum required is ${MINIMUM_REQUIRED_QT_VERSION}")
|
message(FATAL_ERROR "Unsupported Qt version: ${Qt6Widgets_VERSION}, the minimum required is ${MINIMUM_REQUIRED_QT_VERSION}")
|
||||||
else()
|
else()
|
||||||
message(STATUS "Found Qt version: ${Qt6_VERSION}")
|
message(STATUS "Found Qt version: ${Qt6Widgets_VERSION}")
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# To allow #include "base/file_name.hpp" in all sources.
|
# To allow #include "base/file_name.hpp" in all sources.
|
||||||
include_directories("${CMAKE_HOME_DIRECTORY}" "${CMAKE_HOME_DIRECTORY}/libs" "${CMAKE_HOME_DIRECTORY}/tools")
|
include_directories(${CMAKE_HOME_DIRECTORY})
|
||||||
|
|
||||||
if (USE_PCH)
|
if (USE_PCH)
|
||||||
message(STATUS "Precompiled headers are ON")
|
message(STATUS "Precompiled headers are ON")
|
||||||
@@ -195,7 +196,7 @@ if (USE_PCH)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Should be on the root level, not in 3party, so tests can get these dependencies.
|
# Should be on the root level, not in 3party, so tests can get these dependencies.
|
||||||
if (PLATFORM_LINUX)
|
if (PLATFORM_LINUX OR PLATFORM_WIN)
|
||||||
find_package(ICU COMPONENTS uc i18n data REQUIRED)
|
find_package(ICU COMPONENTS uc i18n data REQUIRED)
|
||||||
find_package(Freetype REQUIRED)
|
find_package(Freetype REQUIRED)
|
||||||
find_package(harfbuzz REQUIRED)
|
find_package(harfbuzz REQUIRED)
|
||||||
@@ -225,42 +226,49 @@ endif()
|
|||||||
# Used in qt/ and shaders/
|
# Used in qt/ and shaders/
|
||||||
find_package(Python3 REQUIRED COMPONENTS Interpreter)
|
find_package(Python3 REQUIRED COMPONENTS Interpreter)
|
||||||
|
|
||||||
execute_process(
|
add_subdirectory(base)
|
||||||
COMMAND ${Python3_EXECUTABLE} -c "import google.protobuf;
|
add_subdirectory(coding)
|
||||||
print(google.protobuf.__version__)"
|
add_subdirectory(descriptions)
|
||||||
RESULT_VARIABLE PROTOBUF_CHECK
|
add_subdirectory(drape)
|
||||||
OUTPUT_VARIABLE PROTOBUF_VERSION
|
add_subdirectory(drape_frontend)
|
||||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
add_subdirectory(editor)
|
||||||
ERROR_QUIET
|
add_subdirectory(ge0)
|
||||||
)
|
add_subdirectory(generator/mwm_diff)
|
||||||
|
add_subdirectory(geometry)
|
||||||
if(PROTOBUF_CHECK EQUAL 0)
|
add_subdirectory(indexer)
|
||||||
if(PROTOBUF_VERSION VERSION_LESS "4.0.0")
|
add_subdirectory(kml)
|
||||||
message(STATUS "Python protobuf ${PROTOBUF_VERSION} found (< 4.0)")
|
add_subdirectory(map)
|
||||||
else()
|
add_subdirectory(cppjansson)
|
||||||
message(FATAL_ERROR "Python protobuf ${PROTOBUF_VERSION} found, but version < 4.0 required")
|
add_subdirectory(platform)
|
||||||
endif()
|
add_subdirectory(routing)
|
||||||
else()
|
add_subdirectory(routing_common)
|
||||||
message(FATAL_ERROR "Python protobuf not found. Install version <4.0")
|
add_subdirectory(search)
|
||||||
endif()
|
add_subdirectory(shaders)
|
||||||
|
add_subdirectory(storage)
|
||||||
|
add_subdirectory(tracking)
|
||||||
add_subdirectory(libs)
|
add_subdirectory(traffic)
|
||||||
|
add_subdirectory(transit)
|
||||||
|
|
||||||
if (PLATFORM_DESKTOP)
|
if (PLATFORM_DESKTOP)
|
||||||
add_subdirectory(dev_sandbox)
|
omim_add_tool_subdirectory(feature_list)
|
||||||
add_subdirectory(generator)
|
add_subdirectory(generator)
|
||||||
add_subdirectory(tools)
|
add_subdirectory(openlr)
|
||||||
|
add_subdirectory(poly_borders)
|
||||||
|
omim_add_tool_subdirectory(topography_generator)
|
||||||
|
add_subdirectory(track_analyzing)
|
||||||
|
omim_add_tool_subdirectory(track_generator)
|
||||||
if (NOT SKIP_QT_GUI)
|
if (NOT SKIP_QT_GUI)
|
||||||
add_subdirectory(qt)
|
add_subdirectory(qt)
|
||||||
|
omim_add_tool_subdirectory(skin_generator)
|
||||||
endif()
|
endif()
|
||||||
if (GENERATOR_TOOL)
|
if (GENERATOR_TOOL)
|
||||||
add_compile_options(-march=native -mtune=native)
|
add_compile_options(-march=native -mtune=native)
|
||||||
message(STATUS "target CPU optimizations enabled, produced binaries will NOT work on a different CPU")
|
message(STATUS "target CPU optimizations enabled, produced binaries will NOT work on a different CPU")
|
||||||
endif()
|
endif()
|
||||||
|
add_subdirectory(dev_sandbox)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
omim_add_test_subdirectory(libs/qt_tstfrm)
|
omim_add_test_subdirectory(qt_tstfrm)
|
||||||
|
|
||||||
if (PLATFORM_ANDROID)
|
if (PLATFORM_ANDROID)
|
||||||
add_subdirectory(android/sdk/src/main/cpp)
|
add_subdirectory(android/sdk/src/main/cpp)
|
||||||
|
|||||||
32
README.md
32
README.md
@@ -19,20 +19,20 @@
|
|||||||
</div>
|
</div>
|
||||||
<div align="center">
|
<div align="center">
|
||||||
<p align="center">
|
<p align="center">
|
||||||
<a href="https://codeberg.org/comaps/comaps/src/branch/main/LICENSE">
|
<a href="https://codeberg.org/comaps/comaps/releases">
|
||||||
<img src="https://img.shields.io/github/license/comaps/comaps?style=for-the-badge&logo=opensourceinitiative&logoColor=white&color=588157" alt="License"/>
|
<img src="https://img.shields.io/github/license/comaps/comaps?style=for-the-badge&logo=opensourceinitiative&logoColor=white&color=588157" alt="License" style="width: 90%; max-width: 150px;"/>
|
||||||
</a>
|
</a>
|
||||||
<a href="https://github.com/comaps/comaps/actions/workflows/android-check.yaml">
|
<a href="https://github.com/comaps/comaps/actions/workflows/android-check.yaml">
|
||||||
<img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/android-check.yaml?label=Android%20Build&logo=android&logoColor=white&style=for-the-badge" alt="Android Build Status"/>
|
<img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/android-check.yaml?label=Android%20Build&logo=android&logoColor=white&style=for-the-badge&color=588157" alt="Android Build Status" style="width: 90%; max-width: 170px;"/>
|
||||||
</a>
|
</a>
|
||||||
<a href="https://github.com/comaps/comaps/actions/workflows/ios-check.yaml">
|
<a href="https://github.com/comaps/comaps/actions/workflows/ios-check.yaml">
|
||||||
<img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/ios-check.yaml?label=iOS%20Build&logo=apple&logoColor=white&style=for-the-badge" alt="iOS Build Status"/>
|
<img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/ios-check.yaml?label=iOS%20Build&logo=apple&logoColor=white&style=for-the-badge&color=588157" alt="iOS Build Status" style="width: 90%; max-width: 145px;"/>
|
||||||
</a>
|
</a>
|
||||||
<a href="https://opencollective.com/comaps">
|
<a href="https://opencollective.com/comaps">
|
||||||
<img src="https://img.shields.io/opencollective/all/comaps?label=Open%20Collective%20Donors&logo=opencollective&logoColor=white&style=for-the-badge&color=588157" alt="Open Collective Donors"/>
|
<img src="https://img.shields.io/opencollective/all/comaps?label=Open%20Collective%20Donors&logo=opencollective&logoColor=white&style=for-the-badge&color=588157" alt="Open Collective Donors" style="width: 90%; max-width: 191px;"/>
|
||||||
</a>
|
</a>
|
||||||
<a href="https://liberapay.com/CoMaps">
|
<a href="https://liberapay.com/CoMaps">
|
||||||
<img src="https://img.shields.io/liberapay/patrons/CoMaps.svg?label=Liberapay%20Patrons&logo=liberapay&logoColor=white&style=for-the-badge&color=588157" alt="Liberapay Patrons"/>
|
<img src="https://img.shields.io/liberapay/patrons/CoMaps.svg?label=Liberapay%20Patrons&logo=liberapay&logoColor=white&style=for-the-badge&color=588157" alt="Liberapay Patrons" style="width: 90%; max-width: 160px;"/>
|
||||||
</a>
|
</a>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
@@ -41,6 +41,8 @@
|
|||||||
|
|
||||||
A community-led free & open source maps app based on [OpenStreetMap](https://www.openstreetmap.org), built for transparency, privacy, and not-for-profit values. A fork of Organic Maps, originally based on Maps.ME.
|
A community-led free & open source maps app based on [OpenStreetMap](https://www.openstreetmap.org), built for transparency, privacy, and not-for-profit values. A fork of Organic Maps, originally based on Maps.ME.
|
||||||
|
|
||||||
|
**Available for:** Android, iOS, ARM macOS, and alpha Linux/macOS desktop builds (also usable on Linux phones).
|
||||||
|
|
||||||
<p align="center">
|
<p align="center">
|
||||||
<a href="https://apps.apple.com/app/comaps/id6747180809">
|
<a href="https://apps.apple.com/app/comaps/id6747180809">
|
||||||
<img src="docs/badges/apple-appstore.png" alt="App Store" width="160"/>
|
<img src="docs/badges/apple-appstore.png" alt="App Store" width="160"/>
|
||||||
@@ -51,9 +53,6 @@ A community-led free & open source maps app based on [OpenStreetMap](https://www
|
|||||||
<a href="https://f-droid.org/en/packages/app.comaps.fdroid/">
|
<a href="https://f-droid.org/en/packages/app.comaps.fdroid/">
|
||||||
<img src="docs/badges/fdroid.png" alt="F-Droid" width="160"/>
|
<img src="docs/badges/fdroid.png" alt="F-Droid" width="160"/>
|
||||||
</a>
|
</a>
|
||||||
<a href="https://apt.izzysoft.de/fdroid/index/apk/app.comaps">
|
|
||||||
<img src="docs/badges/izzyondroid.png" alt="Obtainium" width="160"/>
|
|
||||||
</a>
|
|
||||||
<a href="https://apps.obtainium.imranr.dev/redirect?r=obtainium://add/https://codeberg.org/comaps/comaps">
|
<a href="https://apps.obtainium.imranr.dev/redirect?r=obtainium://add/https://codeberg.org/comaps/comaps">
|
||||||
<img src="docs/badges/obtainium.png" alt="Obtainium" width="160"/>
|
<img src="docs/badges/obtainium.png" alt="Obtainium" width="160"/>
|
||||||
</a>
|
</a>
|
||||||
@@ -78,10 +77,9 @@ A community-led free & open source maps app based on [OpenStreetMap](https://www
|
|||||||
## ⚡️ Highlights
|
## ⚡️ Highlights
|
||||||
|
|
||||||
- **Offline-first**: Navigate without a connection
|
- **Offline-first**: Navigate without a connection
|
||||||
- **Privacy-respecting**: No tracking, ads or data collection
|
- **Privacy-respecting**: No tracking, Ads or data collection
|
||||||
- **Lightweight**: Battery- and space-efficient
|
- **Lightweight**: Battery- and space-efficient
|
||||||
- **Simple**: Polished, user-focused interface
|
- **Simple**: Polished, user-focused interface
|
||||||
- **Cross-platform**: Available for Android, iOS, MacOS, and Linux.
|
|
||||||
- **Community-built**: Free, open source, and collaborative
|
- **Community-built**: Free, open source, and collaborative
|
||||||
- **Transparent**: Open finances and governance
|
- **Transparent**: Open finances and governance
|
||||||
|
|
||||||
@@ -127,8 +125,10 @@ You can help by donating, contributing code, translating, or by telling others a
|
|||||||
|
|
||||||
- Build instructions: [docs/INSTALL.md](docs/INSTALL.md)
|
- Build instructions: [docs/INSTALL.md](docs/INSTALL.md)
|
||||||
- Contribution guide: [docs/CONTRIBUTING.md](docs/CONTRIBUTING.md)
|
- Contribution guide: [docs/CONTRIBUTING.md](docs/CONTRIBUTING.md)
|
||||||
|
> [!NOTE]
|
||||||
|
> Some docs might be outdated, contain broken links or old references to Organic Maps, etc. Its a work in progress and help is much appreciated!
|
||||||
|
|
||||||
There is a dedicated [Zulip](https://codeberg.org/comaps/Governance/src/branch/main/contribute.md#3-team-messaging) chat for active contributors.
|
There is a dedicated Zulip chat for active contributors: [Zulip](https://comaps.zulipchat.com)
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -142,7 +142,7 @@ There is a dedicated [Zulip](https://codeberg.org/comaps/Governance/src/branch/m
|
|||||||
|
|
||||||
## 💸 Funding
|
## 💸 Funding
|
||||||
|
|
||||||
CoMaps is free. To fund development, we rely on your voluntary support ♥️
|
CoMaps is free. To stay that way, it relies on your support.
|
||||||
Donate via [OpenCollective](https://opencollective.com/comaps/donate) or [Liberapay](https://liberapay.com/CoMaps).
|
Donate via [OpenCollective](https://opencollective.com/comaps/donate) or [Liberapay](https://liberapay.com/CoMaps).
|
||||||
The project's financial information is completely open and transparent at [our Open Collective](https://opencollective.com/comaps).
|
The project's financial information is completely open and transparent at [our Open Collective](https://opencollective.com/comaps).
|
||||||
|
|
||||||
@@ -158,12 +158,6 @@ SHA-256: 4894e8e6963627ef660031d8593fe77297f835acb4e23810003e926135023b4c
|
|||||||
SHA-1: 8b7b5739f917e9f7c681671ced0c9c8562123ade
|
SHA-1: 8b7b5739f917e9f7c681671ced0c9c8562123ade
|
||||||
MD5: 9cce0ffea281dc2f0e0a154d6d2e281e
|
MD5: 9cce0ffea281dc2f0e0a154d6d2e281e
|
||||||
```
|
```
|
||||||
|
|
||||||
To verify CoMaps via [AppVerifier](https://github.com/soupslurpr/AppVerifier), use the following signing certificate fingerprint:
|
|
||||||
```
|
|
||||||
app.comaps
|
|
||||||
48:94:E8:E6:96:36:27:EF:66:00:31:D8:59:3F:E7:72:97:F8:35:AC:B4:E2:38:10:00:3E:92:61:35:02:3B:4C
|
|
||||||
```
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## ⚖️ License
|
## ⚖️ License
|
||||||
|
|||||||
3
android/app/.gitignore
vendored
3
android/app/.gitignore
vendored
@@ -24,6 +24,3 @@
|
|||||||
/src/main/res/drawable-mdpi/uk_northern_ireland.png
|
/src/main/res/drawable-mdpi/uk_northern_ireland.png
|
||||||
/src/main/res/drawable-mdpi/uk_scotland.png
|
/src/main/res/drawable-mdpi/uk_scotland.png
|
||||||
/src/main/res/drawable-mdpi/uk_wales.png
|
/src/main/res/drawable-mdpi/uk_wales.png
|
||||||
|
|
||||||
# Symlinked to F-Droid relnotes by tools/unix/link_gplay_relnotes.sh
|
|
||||||
/src/google/play/release-notes
|
|
||||||
@@ -29,12 +29,12 @@ def getCommitMessage() {
|
|||||||
project.ext.appId = 'app.comaps'
|
project.ext.appId = 'app.comaps'
|
||||||
project.ext.appName = 'CoMaps'
|
project.ext.appName = 'CoMaps'
|
||||||
|
|
||||||
|
// I have Java 21 installed, but this doesn't work on MacOS.
|
||||||
java {
|
//java {
|
||||||
toolchain {
|
// toolchain {
|
||||||
languageVersion.set(JavaLanguageVersion.of(21))
|
// languageVersion.set(JavaLanguageVersion.of(17))
|
||||||
}
|
// }
|
||||||
}
|
//}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
namespace = 'app.organicmaps'
|
namespace = 'app.organicmaps'
|
||||||
@@ -138,6 +138,8 @@ android {
|
|||||||
disable 'MissingTranslation'
|
disable 'MissingTranslation'
|
||||||
// https://github.com/organicmaps/organicmaps/issues/3551
|
// https://github.com/organicmaps/organicmaps/issues/3551
|
||||||
disable 'MissingQuantity', 'UnusedQuantity'
|
disable 'MissingQuantity', 'UnusedQuantity'
|
||||||
|
// https://github.com/organicmaps/organicmaps/issues/3550
|
||||||
|
disable 'ByteOrderMark'
|
||||||
// https://github.com/organicmaps/organicmaps/issues/1077
|
// https://github.com/organicmaps/organicmaps/issues/1077
|
||||||
disable 'CustomSplashScreen'
|
disable 'CustomSplashScreen'
|
||||||
// https://github.com/organicmaps/organicmaps/issues/3610
|
// https://github.com/organicmaps/organicmaps/issues/3610
|
||||||
@@ -311,8 +313,8 @@ android {
|
|||||||
compileOptions {
|
compileOptions {
|
||||||
coreLibraryDesugaringEnabled = true
|
coreLibraryDesugaringEnabled = true
|
||||||
|
|
||||||
sourceCompatibility JavaVersion.VERSION_21
|
sourceCompatibility JavaVersion.VERSION_17
|
||||||
targetCompatibility JavaVersion.VERSION_21
|
targetCompatibility JavaVersion.VERSION_17
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -355,7 +357,8 @@ dependencies {
|
|||||||
// Fix for app/organicmaps/util/FileUploadWorker.java:14: error: cannot access ListenableFuture
|
// Fix for app/organicmaps/util/FileUploadWorker.java:14: error: cannot access ListenableFuture
|
||||||
// https://github.com/organicmaps/organicmaps/issues/6106
|
// https://github.com/organicmaps/organicmaps/issues/6106
|
||||||
implementation libs.google.guava
|
implementation libs.google.guava
|
||||||
implementation libs.appdevnext.androidchart
|
implementation libs.devnullorthrow.mpandroidchart
|
||||||
|
implementation libs.jcip.annotations
|
||||||
|
|
||||||
// Test Dependencies
|
// Test Dependencies
|
||||||
androidTestImplementation libs.androidx.test.junit
|
androidTestImplementation libs.androidx.test.junit
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<background android:drawable="@color/bg_app_icon_test"/>
|
|
||||||
<foreground android:drawable="@drawable/ic_launcher_foreground_test"/>
|
|
||||||
<monochrome android:drawable="@drawable/ic_launcher_foreground_monochrome"/>
|
|
||||||
</adaptive-icon>
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<background android:drawable="@color/bg_app_icon_debug"/>
|
|
||||||
<foreground android:drawable="@drawable/ic_launcher_foreground_debug"/>
|
|
||||||
<monochrome android:drawable="@drawable/ic_launcher_foreground_monochrome"/>
|
|
||||||
</adaptive-icon>
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
../../../../google/java/app/organicmaps/location
|
|
||||||
1
android/app/src/fdroid/java/app/organicmaps/sdk/location
Symbolic link
1
android/app/src/fdroid/java/app/organicmaps/sdk/location
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
../../../../../google/java/app/organicmaps/sdk/location
|
||||||
@@ -1 +0,0 @@
|
|||||||
CoMaps - Mapas ensin conexón con privacidá
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
Лесна навигация - Открийте повече от вашето пътуване - Подкрепен от общността
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
CoMaps - Хайкинг, Велосипед, Пътуване без Интернет
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
মানচিত্র নেভিগেশন - আপনার যাত্রা সম্পর্কে আরও জানুন - সম্প্রদায় কর্তৃক পরিচালিত
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
কোম্যাপস - অফলাইনে হাইকিং, সাইকেলিং ও ড্রাইভিং
|
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
সহজ মানচিত্র নেভিগেশন - আপনার যাত্রা সম্পর্কে আরও জানুন - সম্প্রদায় কর্তৃক পরিচালিত
|
||||||
1
android/app/src/fdroid/play/listings/bn/title.txt
Normal file
1
android/app/src/fdroid/play/listings/bn/title.txt
Normal file
@@ -0,0 +1 @@
|
|||||||
|
কোম্যাপস - অফলাইনে হাইকিং, সাইকেলিং এবং ড্রাইভিং করুন গোপনীয়তা সহ
|
||||||
@@ -1 +0,0 @@
|
|||||||
CoMaps - Camina, pedala o condueix privadament
|
|
||||||
@@ -1,8 +1,9 @@
|
|||||||
• OpenStreetMap-Daten vom 4. November
|
Wir stellen vor: Das neue CoMaps-Logo!
|
||||||
• Aktualisierte Karten-Icons, inkl. Farben für Unterhaltungs-, Sport- & andere Unternehmen
|
• Verbesserte Höhenlinien in vielen Regionen (Stufen von 20/50 m)
|
||||||
• Informationen zu Steckdosen an EV-Ladestationen
|
• Links zu Panoramax-Bildern für ausgewählte POIs
|
||||||
• Symbole für Sportzentren, Veranstaltungsorte, Massagesalons, Gästehäuser und einige stillgelegte Unternehmen
|
• OpenStreetMap-Daten vom 13. Juli
|
||||||
• Verbesserungen bei der Suche
|
• Neue Farben für viele Objekte und Farben werden früher angezeigt
|
||||||
• Behebung eines Absturzes bei der Suche
|
• Öffnungszeiten werden beim Antippen eines POI angezeigt
|
||||||
• Verbesserte Sprachführung während der Navigation
|
• Verschiedene Arten von Feuchtgebieten
|
||||||
Weitere Änderungen finden in unseren Codeberg-Versionshinweisen!
|
• Neue Farben für Vegetation und andere Features; einige neue Icons
|
||||||
|
• Wandern: bessere Darstellung der Höhenlinien
|
||||||
@@ -1,8 +1,10 @@
|
|||||||
• OpenStreetMap data as of November 4
|
Introducing CoMaps logo!
|
||||||
• Recategorized map icons including some new colors for entertainment, sports and other businesses
|
|
||||||
• Display info about available sockets on charging stations
|
• upgrade altitude contour lines for many regions to 20 or 50 meters step
|
||||||
• Added bandstands, backless benches and loungers
|
• add Panoramax Picture links to selected POIs
|
||||||
• New icons for different sport centres, event venues, massage salons, guest houses and some disused businesses
|
• OpenStreetMap data as of July 13
|
||||||
• Multiple search improvements and crash fix
|
• add color fills to many features and display fills earlier for existing features
|
||||||
• Improved voice guidance during navigation
|
• display opening hours state when selecting a POI
|
||||||
Check our Codeberg release notes for more changes!
|
• split all wetlands into several distinct types
|
||||||
|
• update vegetation and other map colors, update some map icons
|
||||||
|
• outdoors: bolder altitude contour lines
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
• Datos OSM del 04/11
|
¡Presentamos el logo de CoMaps!
|
||||||
• Iconos del mapa recategorizados, incluyendo nuevos colores
|
• mejora de isolíneas con más detalle para muchas regiones
|
||||||
• Visualización de información sobre enchufes disponibles en estaciones de recarga
|
• añade enlaces de imágenes de Panoramax a POIs seleccionados
|
||||||
• Adición de iconos para diferentes centros deportivos, lugares de eventos, salones de masajes, posadas y algunos establecimientos comerciales desactivados
|
• datos de OpenStreetMap a 13 de julio
|
||||||
• Varias mejoras y correcciones de errores en la búsqueda
|
• añadidos rellenos de color a muchas características
|
||||||
• Mejora en la orientación por voz durante la navegación
|
• se muestra el estado de horarios de apertura al seleccionar un POI
|
||||||
Más detalles en Codeberg
|
• se dividen los humedales en tipos distintos
|
||||||
|
• se actualiza la vegetación y otros colores del mapa, así como otros iconos
|
||||||
|
• exteriores: líneas de contorno de altitud más gruesas
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
Navegación sencilla - Descubre más en tu camino - Creado por la comunidad
|
Navegación de mapa fácil - Descubre más en tu camino - Creado por la comunidad
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ Sartu komunitatean eta lagundu maparik onena aplikatzen
|
|||||||
• Lineaz kanpoko Wikipedia artikuluak
|
• Lineaz kanpoko Wikipedia artikuluak
|
||||||
• Metroaren garraio geruza eta jarraibideak
|
• Metroaren garraio geruza eta jarraibideak
|
||||||
• Arrastoen grabazioa
|
• Arrastoen grabazioa
|
||||||
• Markagailuak eta arrastoak esportatu eta inportatu KML, KMZ, GPX formatuetan
|
• Laster-markak eta ibilbideak esportatu eta inportatu KML, KMZ, GPX formatuetan
|
||||||
• Gauean erabiltzeko modu iluna
|
• Gauean erabiltzeko modu iluna
|
||||||
• Hobetu mapako datuak guztiontzat oinarrizko editore integratua erabiliz
|
• Hobetu mapako datuak guztiontzat oinarrizko editore integratua erabiliz
|
||||||
|
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
ناوبری آسان نقشه - کشف بیشتر از سفر شما - توسط جامعه
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
CoMaps - کوهنوردی، دوچرخهسواری و رانندگی آفلاین
|
|
||||||
@@ -1,34 +1,32 @@
|
|||||||
Yhteisön johtama vapaa ja avoimeen lähdekoodiin perustuva karttasovellus, jonka karttadata perustuu OpenStreetMap:n avoimeen dataan. Sovelluksessa painottuu vahva sitoutuminen läpinäkyvyyteen, yksityisyyteen ja voittoa tavoittelemattomaan toimintaan. CoMaps on haarautunut Organic Maps:sta, joka taas omalta osaltaan on haarautunut Maps.ME:stä.
|
Yhteisövetoinen, ilmainen ja avoimeen lähdekoodiin perustuva karttasovellus, jonka pohjalla käytetään OpenStreetMapin avointa karttadataa. Sovelluksen kehityksessä on sitouduttu läpinäkyvyyteen, yksityisyyteen ja voittoa tavoittelemattomuuteen. CoMapsin projekti on haarautunut Organic Mapsista, joka taas on haarautunut aiemmin Maps.ME:stä
|
||||||
|
|
||||||
Lue tarkemmin projektin syistä ja sen suunnasta osoitteesta <b><i>codeberg.org/comaps</i></b>.
|
Lue lisää projektin tavotteista ja suunnasta osoitteesta <b><i>codeberg.org/comaps</i></b>.
|
||||||
Liity yhteisöön ja auta kehittämään parasta karttasovellusta
|
Liity yhteisöön ja auta kehittämään paras saatavilla oleva karttasovellus
|
||||||
• Käytä sovellusta ja levitä siitä sanaa
|
• Käytä sovellusta ja kerro siitä myös muille
|
||||||
• Anna palautetta ja raportoi ongelmista
|
• Anna palautetta ja raportoi ongelmia
|
||||||
• Päivitä karttadataa sovelluksessa tai OpenStreetMap:n verkkosivuilla
|
• Päivitä karttoja, joko sovelluksessa tai OpenStreetMapin verkkosivuilla
|
||||||
|
|
||||||
‣ <b>Offline-painotteinen</b>: Suunnittele ja navigoi matkasi ilman verkkoyhteyttä. Etsi reittipisteitä retkilläsi. Kaikki sovelluksen toiminnot on suunniteltu käytettäväksi ilman verkkoyhteyttä.
|
‣ <b>Offline-painotteinen</b>: Suunnittele ja navigoi ulkomailla ilman mobiiliverkkoja. Kaikki sovelluksen toiminnot on suunniteltu käytettäväksi ilman verkkoyhteyttä.
|
||||||
‣ <b>Kunnioittaa yksityisyyttä</b>: Sovellus on suunniteltu yksityisyyttä silmälläpitäen. Sovellu ei tunnista ihmisä, seuraa toimintaasi, eikä kerää henkilökohtaisia tietojasi. Mainosvapaa.
|
‣ <b>Kunnioittaa yksityisyyttä</b>: Sovellus on suunniteltu yksilön yksityisyys silmälläpitäen. Sovellus ei tunnista tai kerää tietoja sinusta. Mainosvapaa.
|
||||||
‣ <b>Yksinkertainen ja viimeistelty</b>: Olennaiset ominaisuudet, joita on helppo käyttää.
|
‣ <b>Yksinkertainen ja viimeistelty</b>: Olennaiset ominaisuudet, joita on helppo käyttää.
|
||||||
‣ <b>Säästää akkua ja tilaa</b>: Ei kuluta akkua, kuten toiset karttasovellukset. Kompaktit kartat säästävät tilaa puhelimessasi.
|
‣ <b>Säästä akkua ja tallennustilaa</b>: Ei kuluta akkua, kuten muut navigointisovellukset. Kompaktit kartat säästävät arvokasta tallennustilaa puhelimessasi.
|
||||||
‣ <b>Ilmainen ja yhteisön rakentama</b>: Ihmiset, kuten sinä ovat auttaneet sovelluksen kehityksessä lisäämällä paikkoja OpenStreetMap:iin, testaamalla sovellusta ja antamalla palautetta. Voit auttaa myös kehittämällä sovellusta ja lahjoittamalla sovelluskehitykseen.
|
‣ <b>Ilmainen ja yhteisön luoma</b>: Vapaaehtoiset, kuten sinä olette auttaneet sovelluksen kehityksessä lisäämällä paikkoja OpenStreetMap:iin, testaamalla sovellusta ja antamalla palautetta. Voit myös auttaa kehittämällä ominaisuuksia ja lahjoittamalla sovelluskehitykseen
|
||||||
‣ <b>Avoin ja läpinäkyvä päätöksenteko ja rahoitus. Voittoa tavoittelematon ja täysin avoimeen lähdekoodiin perustuva.</b>
|
‣ <b>Avoin ja läpinäkyvä päätöksenteko sekä rahoitus. Voittoa tavoittelematon ja täysin avoimeen lähdekoodiin perustuva.</b>
|
||||||
|
|
||||||
<b>Tärkeimmät ominaisuudet</b>:
|
<b>Tärkeimmät ominaisuudet</b>:
|
||||||
<ul>
|
• Ladattavat yksityiskohtaiset kartat paikoista, joita ei löydy edes Google Maps:sta
|
||||||
<li>Ladattavat yksityiskohtaiset kartat paikoista, joita ei löydy edes Google Maps:sta</li>
|
• Ulkoilutila, josta löytyy korostettuna reitit, leirintäpaikat, vesipisteet, huiput ja korkeuserot yms.
|
||||||
<li>Ulkoilutila, josta löytyy korostettuna reitit, leirintäpaikat, vesipisteet, huiput ja korkeuserot yms.</li>
|
• Kävely- ja pyörätiet
|
||||||
<li>Kävely- ja pyörätiet</li>
|
• Kiinnostavat paikat, kuten ravintolat, huoltoasemat, hotellit, kaupat, nähtävyydet ja monta muuta
|
||||||
<li>Kiinnostavat paikat, kuten ravintolat, huoltoasemat, hotellit, kaupat, nähtävyydet ja monta muuta</li>
|
• Etsi nimellä, osoitteella tai kiinnostavan paikan kategorialla
|
||||||
<li>Etsi nimellä, osoitteella tai kiinnostavan paikan kategorialla</li>
|
• Navigointi ääni-ilmoituksilla kävellessä, pyöräillessä tai ajaessa
|
||||||
<li>Navigointi ääni-ilmoituksilla kävellessä, pyöräillessä tai ajaessa</li>
|
• Tallenna suosikkipaikkasi yhdellä napautuksella
|
||||||
<li>Tallenna suosikkipaikkasi yhdellä napautuksella</li>
|
• Offline Wikipedia-artikkelit
|
||||||
<li>Offline Wikipedia-artikkelit</li>
|
• Maanalaisen liikenteen tasot ja ohjeet
|
||||||
<li>Maanalaisen liikenteen tasot ja ohjeet</li>
|
• Reittien tallennus
|
||||||
<li>Reittien tallennus</li>
|
• Tuo ja vie kirjanmerkkejä ja reittejä KML-, KMZ- ja GPX-formaateissa
|
||||||
<li>Tuo ja vie kirjanmerkkejä ja reittejä KML-, KMZ- ja GPX-formaateissa</li>
|
• Tumma tila iltaa ja yötä varten
|
||||||
<li>Tumma tila iltaa ja yötä varten</li>
|
• Paranna karttadataa kaikille sisäänrakennetulla editorilla
|
||||||
<li>Paranna karttadataa kaikille sisäänrakennetulla editorilla</li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
<b>Vapaus on täällä</b>
|
<b>Vapaus on täällä</b>
|
||||||
Löydä matkasi, navigoi maailmassa yksityisyyden ja yhteisön tukemana!
|
Löydä matkasi ja navigoi maailmalla yksityisyyden ja yhteisön tukemana!
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
CoMaps - Navigoi yksityisesti ilman verkkoyhteyttä
|
CoMaps - Navigoi ilman verkkoyhteyttä yksityisesti
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
• Données OpenStreetMap au 4 novembre
|
Présentation du logo CoMaps !
|
||||||
• Recatégorisation des icônes sur la carte avec ajout de nouvelles couleurs pour certains types de lieux
|
• Amélioration des courbes d’altitude à une précision de 20 ou 50 mètres pour de nombreuses régions
|
||||||
• Affichage des prises sur les bornes électriques
|
• Ajout d'un lien vers les images Panoramax des POI
|
||||||
• Ajout d'icônes pour les centres sportifs, salles d'événements, salon de massage et autres lieux
|
• Données OpenStreetMap du 13 juillet
|
||||||
• Multiple améliorations dans la recherche
|
• Affichage de l’état des heures d’ouverture lors de la sélection d’un POI
|
||||||
• Correction d'un plantage dans la recherche
|
• Mise à jour du style(végétation et zones humides), mise à jour de certaines icônes de la carte
|
||||||
• Amélioration de la synthèse vocale durant la navigation
|
• Outdoors: Améliorations de la visibilité des courbes d'altitude
|
||||||
Plus d'informations sur notre Codeberg
|
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
Navigation facile - Vivez de grands voyages - Propulsé par la communauté
|
Navigation cartographique facile - Découvrez davantage de votre voyage - Propulsé par la communauté
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
CoMaps - Pješačite, biciklirajte, vozite Offline
|
CoMaps - Pješačite, biciklirajte, vozite Offline i privatno
|
||||||
|
|||||||
@@ -1,32 +0,0 @@
|
|||||||
Egy közösség által vezetett, ingyenes és nyílt forráskódú térképalkalmazás, amely az OpenStreetMap adatain alapul, és amelynek alapelvei a átláthatóság, az adatvédelem és a nonprofit működés. A CoMaps az Organic Maps alkalmazás egyik változata, amely viszont a Maps.ME alkalmazás egyik változata.
|
|
||||||
|
|
||||||
A projekt előzményeiről és fejlesztési irányáról bővebben a <b><i>codeberg.org/comaps</i></b> oldalon olvashat.
|
|
||||||
Csatlakozzon a közösséghez, és segítsen a legjobb térképalkalmazás létrehozásában
|
|
||||||
• Használja az alkalmazást, és terjessze a hírt róla
|
|
||||||
• Adjon visszajelzést, és jelentsen problémákat
|
|
||||||
• Frissítse a térképadatokat az alkalmazásban vagy az OpenStreetMap weboldalon
|
|
||||||
|
|
||||||
‣ <b>Offline</b>: Tervezze meg és navigálja külföldi utazását mobilszolgáltatás nélkül, keressen útpontokat távoli túrákon stb. Az alkalmazás összes funkciója úgy van kialakítva, hogy offline is működjön.
|
|
||||||
‣ <b>A magánélet tiszteletben tartása</b>: Az alkalmazás a magánélet tiszteletben tartásával lett kialakítva – nem azonosítja az embereket, nem követi nyomon őket és nem gyűjt személyes adatokat. Reklámmentes.
|
|
||||||
‣ <b>Egyszerű és kifinomult</b>: alapvető, könnyen használható funkciók, amelyek egyszerűen működnek.
|
|
||||||
‣ <b>Takarékos az akkumulátorral és a tárhellyel</b>: Nem meríti le az akkumulátort, mint más navigációs alkalmazások. A kompakt térképek értékes helyet takarítanak meg a telefonon.
|
|
||||||
‣ <b>Ingyenes és a közösség által fejlesztett</b>: Az Önhöz hasonló emberek segítettek az alkalmazás fejlesztésében azzal, hogy helyeket adtak hozzá az OpenStreetMaphez, tesztelték és visszajelzéseket adtak a funkciókról, valamint fejlesztői ismereteikkel és pénzzel is hozzájárultak a fejlesztéshez.
|
|
||||||
‣ <b>Nyílt, átlátható döntéshozatal és pénzügyek, nonprofit és teljesen nyílt forráskódú.
|
|
||||||
|
|
||||||
<b>Főbb jellemzők</b>:
|
|
||||||
• Letölthető részletes térképek olyan helyekkel, amelyek nem érhetők el a Google Maps-en
|
|
||||||
• Kültéri mód kiemelt túraútvonalakkal, kempingekkel, vízforrásokkal, csúcsokkal, szintvonalakkal stb.
|
|
||||||
• Gyalogos és kerékpáros útvonalak
|
|
||||||
• Érdekes helyek, például éttermek, benzinkutak, szállodák, üzletek, látnivalók és még sok más
|
|
||||||
• Keresés név, cím vagy érdekes hely kategória alapján
|
|
||||||
• Hangos navigáció gyalogos, kerékpáros vagy autós utazáshoz
|
|
||||||
• Kedvenc helyek könyvjelzővel egyetlen érintéssel
|
|
||||||
• Offline Wikipedia cikkek
|
|
||||||
• Metróhálózat és útvonaltervezés
|
|
||||||
• Útvonalrögzítés
|
|
||||||
• Könyvjelzők, útvonalak exportálása és importálása KML, KMZ, GPX formátumokban
|
|
||||||
• Sötét mód az éjszakai használathoz
|
|
||||||
• A beépített alapszerkesztővel mindenki javíthatja a térképadatokat
|
|
||||||
|
|
||||||
<b>A szabadság itt van</b>
|
|
||||||
Fedezze fel utazását, navigáljon a világban, ahol az adatvédelem és a közösség az első!
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
Egyszerű térképnavigáció – Fedezze fel utazását – A közösség támogatásával
|
|
||||||
@@ -1 +1 @@
|
|||||||
CoMaps – túrázás, kerékpározás, autózás offline
|
CoMaps - Túra, Bicikli, Vezetés offline diszkréten
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
Navigation facile del mappa – Discoperi tu viage – Alimentate per le communitate
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
Aplikasi peta gratis & sumber terbuka yang dipimpin komunitas, berbasis data OpenStreetMap dan diperkuat dengan komitmen terhadap transparansi, privasi, serta non-profit. CoMaps adalah turunan dari Organic Maps, yang merupakan turunan dari Maps.ME.
|
|
||||||
|
|
||||||
Baca lebih lanjut tentang alasan proyek ini dan arahnya di <b><i>codeberg.org/comaps</i></b>.
|
|
||||||
Bergabunglah dengan komunitas dan bantu menjadikan aplikasi peta terbaik
|
|
||||||
• Gunakan aplikasi ini dan sebarkan
|
|
||||||
• Beri masukan dan laporkan masalah
|
|
||||||
• Perbarui data peta di aplikasi atau di situs OpenStreetMap
|
|
||||||
|
|
||||||
‣ <b>Fokus Offline</b>: Rencanakan dan navigasikan perjalananmu di luar negeri tanpa perlu layanan seluler, cari titik saat hiking jauh, dll. Semua fungsi aplikasi dirancang untuk bekerja offline.
|
|
||||||
‣ <b>Menghormati Privasi</b>: Aplikasi ini dirancang dengan privasi sebagai prioritas – tidak mengidentifikasi orang, tidak melacak, dan tidak mengumpulkan informasi pribadi. Bebas iklan.
|
|
||||||
‣ <b>Sederhana dan Rapi</b>: fitur penting yang mudah digunakan dan langsung berfungsi.
|
|
||||||
‣ <b>Hemat Baterai dan Ruang</b>: Tidak menguras baterai seperti aplikasi navigasi lain. Peta ringkas menghemat ruang berharga di ponselmu.
|
|
||||||
‣ <b>Gratis dan Dibangun oleh Komunitas</b>: Orang seperti kamu membantu membangun aplikasi ini dengan menambahkan tempat ke OpenStreetMap, menguji serta memberi masukan fitur, dan menyumbangkan keterampilan pengembangan maupun dana.
|
|
||||||
‣ <b>Terbuka dan Transparan</b>: Pengambilan keputusan dan keuangan transparan, non-profit, dan sepenuhnya sumber terbuka.
|
|
||||||
|
|
||||||
<b>Fitur Utama</b>:
|
|
||||||
• Peta detail yang bisa diunduh, dengan tempat yang tidak ada di Google Maps
|
|
||||||
• Mode outdoor dengan sorotan jalur hiking, area berkemah, sumber air, puncak, garis kontur, dll
|
|
||||||
• Jalur pejalan kaki dan jalur sepeda
|
|
||||||
• Titik menarik seperti restoran, SPBU, hotel, toko, tempat wisata, dan banyak lagi
|
|
||||||
• Pencarian berdasarkan nama, alamat, atau kategori titik menarik
|
|
||||||
• Navigasi dengan suara untuk berjalan, bersepeda, atau berkendara
|
|
||||||
• Tandai tempat favoritmu dengan sekali tap
|
|
||||||
• Artikel Wikipedia offline
|
|
||||||
• Layer dan rute transportasi subway
|
|
||||||
• Rekaman jejak
|
|
||||||
• Ekspor dan impor bookmark serta jejak dalam format KML, KMZ, GPX
|
|
||||||
• Mode gelap untuk digunakan saat malam
|
|
||||||
• Tingkatkan data peta untuk semua orang dengan editor bawaan sederhana
|
|
||||||
|
|
||||||
<b>Kebebasan Ada di Sini</b>
|
|
||||||
Temukan perjalananmu, jelajahi dunia dengan privasi dan komunitas di garis depan!
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
Navigasi peta mudah – Temukan lebih banyak – Didukung oleh komunitas
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
Una app realizzata dalla community gratuita e open-source, basata su OpenStreetMap e sull'impegno alla trasparenza, al rispetto della Privacy e senza scopo di lucro. CoMaps è uno spin-off di Organic Maps, che a sua volta deriva da Maps.ME.
|
Una app sviluppata dalla comunità, gratuita e open-source, basata su OpenStreetMap e sull'impegno alla trasparenza, al rispetto della Privacy senza scopo di lucro. CoMaps è uno spin-off di Organic Maps, che a sua volta deriva da Maps.ME.
|
||||||
|
|
||||||
Leggi delle ragioni del progetto e della sua direzione futura su <b><i>codeberg.org/comaps</i></b>.
|
Leggi delle ragioni del progetto e della sua direzione futura su <b><i>codeberg.org/comaps</i></b>.
|
||||||
Unisciti alla nostra comunità e aiutaci a creare la migliore app di mappe.
|
Unisciti alla nostra comunità e aiutaci a creare la migliore app di mappe.
|
||||||
@@ -15,7 +15,7 @@ Unisciti alla nostra comunità e aiutaci a creare la migliore app di mappe.
|
|||||||
|
|
||||||
<b>Funzionalità principali</b>:
|
<b>Funzionalità principali</b>:
|
||||||
• Scarica mappe dettagliate di luoghi che non sono disponibili su Google Maps
|
• Scarica mappe dettagliate di luoghi che non sono disponibili su Google Maps
|
||||||
• Modalità Outdoor con percorsi escursionistici, campeggi, sorgenti d'acqua, picchi, dislivelli ed altri punti d'interesse evidenziati
|
• Modalità Outdoor con percorsi escursionistici, campeggi, sorgenti d'acqua, picchi, dislivelli ed altro evidenziati
|
||||||
• Strade pedonali e piste ciclabili
|
• Strade pedonali e piste ciclabili
|
||||||
• Punti d'interesse come ristoranti, stazioni di benzina, hotel, negozi, luoghi turistici e molto altro
|
• Punti d'interesse come ristoranti, stazioni di benzina, hotel, negozi, luoghi turistici e molto altro
|
||||||
• Cerca per nome, indirizzo o categoria
|
• Cerca per nome, indirizzo o categoria
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
Navigazione semplice - Immergiti nella tua avventura - Realizzato dalla comunità
|
Navigazione semplice - Immergiti nella tua avventura - Sviluppato dalla comunità
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
Vienkārša kartes navigācija - Atklāj vairāk par savu ceļojumu - Darbina kopiena
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
CoMaps - dodies ceļā bezsaistē ar privātumu
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
App għall-mapep b'xejn u b'sors miftuħ (open source) immexxi mill-komunità bbażata fuq dejta minn OpenStreetMap, b'impenn għal trasparenza, privatezza u mhux għal-profitt. CoMaps hija fork ta' Organic Maps, li min-naħa tagħha hija fork ta' Maps.ME.
|
|
||||||
|
|
||||||
Kompli aqra dwar ir-raġunijiet għall-proġett u d-direzzjoni tiegħu hawn <b><i>codeberg.org/comaps</i></b>.
|
|
||||||
Ingħaqad mal-komunità u għin biex toħloq l-aqwa app tal-mapep
|
|
||||||
• Uża l-app u semmiha ma' min taf
|
|
||||||
• Agħti feedback u rrapporta problemi
|
|
||||||
• Aġġorna d-dejta tal-mapep fl-app jew fuq il-websajt OpenStreetMap
|
|
||||||
|
|
||||||
‣ <b>Iffokata fuq offlajn</b>: Ippjana u innaviga l-vjaġġ tiegħek barra minn pajjiżek mingħajr ħtieġa ta' servizz ċellulari, fittex waypoints waqt ħajk, eċċ. Il-funzjonijiet kollha tal-app huma ddisinjati biex jaħdmu offlajn.
|
|
||||||
‣ <b>Tirrispetta l-Privatezza</b>: L-app hija ddisinjata bil-privatezza f'moħħha - ma tidentifikax nies, ma ssegwikx, u ma tiġborx informazzjoni personali. Bla reklami.
|
|
||||||
‣ <b>Sempliċi u Rfinuta</b>: karatteristiċi essenzjali, faċli biex jintużaw u li sempliċement jaħdmu.
|
|
||||||
‣ <b>Tiffrankalek Batterija u Spazju</b>: Ma taħlix il-batterija bħal apps oħra tal-mapep. Mapep kompatti li jiffrankawlek spazju prezzjuż fuq il-mowbajl.
|
|
||||||
‣ <b>B'xejn u Mibnija mill-Komunità</b>: Nies bħalek għenu fl-iżvilupp tal-app billi żiedu postijiet f'OpenStreetMap, ittestjaw u taw feedback dwar il-karatteristiċi u kkontribwew il-ħiliet u l-flus tagħhom.
|
|
||||||
‣ <b>Trasparenza fil-finanzi u fit-teħid ta' deċiżjonijiet, Mhux għall-profitt u sors kompletament miftuħ.</b>
|
|
||||||
|
|
||||||
<b>Karatteristiċi Prinċipali</b>:
|
|
||||||
• Mapep dettaljati li jistgħu jitniżżlu b'postijiet li mhumiex disponibbli fuq Google Maps
|
|
||||||
• Modalità ta' barra b'mogħdijiet tal-mixi, postijiet għal-ikkampjar, sorsi tal-ilma, quċċati, linji tal-kontorn, eċċ.
|
|
||||||
• Mogħdijiet għall-mixi u rotti għar-roti
|
|
||||||
• Postijiet ta' interess bħal ristoranti, stazzjonijiet tal-petrol, lukandi, ħwienet, postijiet turistiċi u ħafna aktar
|
|
||||||
• Fittex bl-isem jew bl-indirizz jew bil-kategorija interess
|
|
||||||
• Navigazzjoni b'avviżi bil-vuċi għall-mixi, ċikliżmu, u sewqan
|
|
||||||
• Immarka l-postijiet favoriti tiegħek b'tapp waħda
|
|
||||||
• Artikli offlajn ta' Wikipedia
|
|
||||||
• Direzzjonijiet tas-subways
|
|
||||||
• Reġistrazzjoni ta' trekks
|
|
||||||
• Esportazzjoni u importazzjoni ta' bookmarks u trekks f'formati KML, KMZ, GPX
|
|
||||||
• Modalità mudlama biex tintuża bil-lejl
|
|
||||||
• Ittejjeb id-dejta tal-mapep għal kulħadd b'użu ta' editur bażiku u integrat
|
|
||||||
|
|
||||||
<b>Il-Libertà Waslet</b>
|
|
||||||
Skopri l-vjaġġ tiegħek, innaviga d-dinja bil-privatezza u bil-komunità fuq quddiem nett!
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
Navigazzjoni ta' mapep faċli - Skopri iktar mill-vjaġġ - Imsaħħaħ mill-komunita`
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
CoMaps - Imxi, Suq Rota u Karozza bil-Privatezza
|
|
||||||
@@ -1 +1 @@
|
|||||||
CoMaps - Wandel, fiets, rijd offline met privacy
|
CoMaps - Wandel, fiets, rijdt offline met privacy
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
Enkel kartnavigering - Opplev mere på din reise - Drevet av felleskapet
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
CoMaps - Gå, sykle, kjøre offline med personvern
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
Prowadzona przez społeczność, darmowa i otwartoźródłowa aplikacja mapowa oparta na danych OpenStreetMap, wzmacniana zobowiązaniem do transparentności, prywatności i działalnością non-profit. CoMaps jest forkiem/spin-off'em Organic Maps, który z kolei jest forkiem Maps.ME.
|
|
||||||
|
|
||||||
Przeczytaj o powodach powstania projektu i jego kierunku na stronie <b><i>codeberg.org/comaps</i></b>.
|
|
||||||
Dołącz do społeczności i pomóż stworzyć najlepszą aplikację mapową
|
|
||||||
• Używaj aplikacji i rozpowszechnia o niej informacje,
|
|
||||||
• Przekazuj opinie i zgłaszaj problemy,
|
|
||||||
• Aktualizuj dane w aplikacji lub na stronie OpenStreetMap.
|
|
||||||
|
|
||||||
‣ <b>Skoncentrowana na pracy w trybie offline</b>: Zaplanuj trasę i nawiguj podczas swojej podróży za granicą bez potrzeby korzystania z sieci komórkowej, wyszukuj punkty nawigacyjne podczas dalekich wędrówek itp. Wszystkie funkcje aplikacji zostały zaprojektowane do pracy w trybie offline.
|
|
||||||
‣ <b>Poszanowanie prywatności</b>: Aplikacja została zaprojektowana z myślą o prywatności – nie identyfikuje osób, nie śledzi ich i nie gromadzi danych osobowych. Bez reklam.
|
|
||||||
‣ <b>Prosta i dopracowana</b>: niezbędne, łatwe w użyciu funkcje, które po prostu działają.
|
|
||||||
‣ <b>Oszczędza baterię i miejsce</b>: Nie wyczerpuje baterii jak inne aplikacje nawigacyjne. Kompaktowe mapy oszczędzają cenne miejsce w telefonie.
|
|
||||||
‣ <b>Darmowa i stworzona przez społeczność</b>: Osoby takie jak Ty pomogły w tworzeniu aplikacji, dodając miejsca do OpenStreetMap, testując i przekazując opinie na temat funkcji oraz wnosząc swoje umiejętności programistyczne i pieniądze.
|
|
||||||
‣ <b>Otwarte i transparentne podejmowanie decyzji i zarządzanie finansami, nie dla zysku i w pełni otwartoźródłowe.</b>
|
|
||||||
|
|
||||||
<b>Główne funkcje</b>:
|
|
||||||
• Szczegółowe mapy do pobrania z miejscami niedostępnymi na wielu mapach komercyjnych,
|
|
||||||
• Tryb outdoorowy z wyróżnionymi szlakami turystycznymi, kempingami, źródłami wody, szczytami, poziomicami itp.,
|
|
||||||
• Ścieżki spacerowe i rowerowe,
|
|
||||||
• Punkty zainteresowania, takie jak restauracje, stacje benzynowe, hotele, sklepy, atrakcje turystyczne i wiele innych,
|
|
||||||
• Wyszukiwanie według nazwy, adresu lub kategorii punktu zainteresowania,
|
|
||||||
• Nawigacja z komunikatami głosowymi dla pieszych, rowerzystów i kierowców,
|
|
||||||
• Dodawanie zakładek do ulubionych miejsc jednym dotknięciem,
|
|
||||||
• Artykuły z Wikipedii offline,
|
|
||||||
• Warstwa z liniami metra oraz nawigacja z użyciem metra,
|
|
||||||
• Nagrywanie tras,
|
|
||||||
• Eksport i import zakładek i tras w formatach KML, KMZ i GPX,
|
|
||||||
• Ciemny tryb do użytku w nocy,
|
|
||||||
• Ulepszanie danych mapowych dzięki wbudowanemu edytorowi.
|
|
||||||
|
|
||||||
<b>Wolność jest tutaj</b>
|
|
||||||
Odkrywaj swoją podróż, nawiguj po świecie z prywatnością i społecznością na pierwszym planie!
|
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
Wprowadzamy logo CoMaps!
|
||||||
|
• zwiększenie dokładności izolinii w wielu regionach w krokach 20 do 50 metrów
|
||||||
|
• dodanie linków do zdjęć z Panoramax do wybranych POI
|
||||||
|
• aktualizacja danych OpenStreetMap z 13 lipca
|
||||||
|
• dodanie wypełnienia kolorem dla wielu typów obiektów
|
||||||
|
• wyświetlanie stanu godzin otwarcia przy wyborze POI
|
||||||
|
• podział mokradeł na kilka typów
|
||||||
|
• aktualizacja koloru roślinności i innych kolorów, aktualizacja części ikon na mapie
|
||||||
|
• tryb outdoorowy: pogrubione warstwice wysokości
|
||||||
@@ -1 +0,0 @@
|
|||||||
Łatwa nawigacja po mapie - Odkryj więcej z podróży - Wspierane przez społeczność
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
CoMaps - Nawiguj offline z zachowaniem prywatności
|
|
||||||
@@ -1,7 +1,9 @@
|
|||||||
• Dados OSM de 04/11
|
Apresentamos o logo do CoMaps!
|
||||||
• Ícones do mapa recategorizados, incluindo novas cores
|
• Curvas de nível mais detalhadas em muitas regiões
|
||||||
• Exibição de informações sobre tomadas disponíveis em eletropostos
|
• Adicionados links de imagens do Panoramax para pontos de interesse selecionados
|
||||||
• Adição de ícones para diferentes centros esportivos, locais de eventos, salões de massagem, pousadas e alguns estabelecimentos comerciais desativados
|
• Dados OSM de 13/07
|
||||||
• Diversas melhorias e correção de erro na busca
|
• Adicionados preenchimentos de cor a muitos elementos
|
||||||
• Melhoria na orientação por voz durante a navegação
|
• Exibição de horário de funcionamento ao selecionar um ponto de interesse
|
||||||
Confira nossas notas de lançamento no Codeberg para mais detalhes!
|
• Divididas áreas úmidas em vários tipos distintos
|
||||||
|
• Atualizada cores/ícones para vegetação e outros elementos
|
||||||
|
• Ar livre: curvas de nível de altitude mais destacadas
|
||||||
|
|||||||
@@ -1,32 +0,0 @@
|
|||||||
Uma aplicação pela comunidade, grátis e ‘open-source’, de mapas baseada em dados do OpenStreetMap e reforçada com compromisso para transparência, privacidade e sem fins lucrativos. CoMaps é um fork/spin-off de Organic Maps, que, por sua vez, é um fork de Maps.ME
|
|
||||||
|
|
||||||
Leia sobre as razões deste projeto e a sua direção em <b><i>codeberg.org/comaps</i></b>.
|
|
||||||
Junte-se à comunidade e ajude a fazer a melhor aplicação de mapas
|
|
||||||
• Use a aplicação e partilhe-a com outros
|
|
||||||
• Dê ‘feedback’ e reporte problemas
|
|
||||||
• Atualize os dados de mapa na aplicação ou no site do OpenStreetMap
|
|
||||||
|
|
||||||
‣ <b>Simples e Polida</b>: funcionalidades essenciais fáceis que “somente funcionam”.
|
|
||||||
‣ <b>Foco Offline</b>: Planeie e navegue as suas viagens no estrangeiro sem dados móveis, procure locais numa caminhada distante, etc. Todas as funções da aplicação foram criadas com intenção de serem usadas sem internet.
|
|
||||||
‣ <b>Respeita a privacidade</b>: A aplicação foi criada com privacidade em mente — não identifica o utilizador, não rastreia, e não usa a sua informação pessoal. Sem anúncios.
|
|
||||||
‣ <b>Saves Your Battery and Space</b>: Não esgota a sua bateria ao contrário de outras aplicações. Mapas compactos salvam espaço no seu telemóvel.
|
|
||||||
‣ <b>Gratuita e Feita pela Comunidade</b>: Pessoas como si ajudam a criar a aplicação ao adicionar locais ao OpenStreetMap, testando e dando opiniões em funcionalidades e contribuindo com dotes de desenvolvimento e dinheiro.
|
|
||||||
‣ <b>Decisões e Finanças Abertas e Transparentes, Sem fins lucrativos e ‘Open-Source’.</b>
|
|
||||||
|
|
||||||
<b>Funcionalidades principais</b>:
|
|
||||||
• Mapas detalhados descarregáveis com locais que não estão disponíveis com o Google Maps
|
|
||||||
• Modo ao Ar Livre com trilhos de caminhada destacados, acampamentos, fontes de água, cumes, curvas de nível, etc
|
|
||||||
• Caminhos pedestres e ciclovias
|
|
||||||
• Pontos de interesse como restaurantes, estações de serviço, hotéis, lojas, atrações e muitos mais
|
|
||||||
• Pesquise por nome, endereço, ou por categoria de ponto de interesse
|
|
||||||
• Navegação com anúncios de voz ao caminhar, pedalar ou conduzir
|
|
||||||
• Marque os seus locais favoritos com um único clique
|
|
||||||
• Artigos da Wikipédia Offline
|
|
||||||
• Camada de metro e direções
|
|
||||||
• Gravação de Percursos
|
|
||||||
• Exportar e importar marcadores e percursos em formatos KML, KMZ, GPX
|
|
||||||
• Um modo escuro para usar durante a noite
|
|
||||||
• Melhore a informação do mapa para todos com um editor básico embebido
|
|
||||||
|
|
||||||
<b>A liberdade chegou</b>
|
|
||||||
Descubra a sua jornada, navegue o mundo com privacidade e a comunidade à frente!
|
|
||||||
32
android/app/src/fdroid/play/listings/pt/full-description.txt
Normal file
32
android/app/src/fdroid/play/listings/pt/full-description.txt
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
Um aplicativo de mapas gratuito e de código aberto, liderado pela comunidade, baseado em dados do OpenStreetMap e reforçado pelo compromisso com a transparência, privacidade e sem fins lucrativos. O CoMaps é um fork/spin-off do Organic Maps, que por sua vez é um fork do Maps.ME.
|
||||||
|
|
||||||
|
Leia mais sobre os motivos do projeto e sua direção em <b><i>codeberg.org/comaps</i></b>.
|
||||||
|
Junte-se à comunidade e ajude a criar o melhor aplicativo de mapas.
|
||||||
|
• Use o aplicativo e divulgue-o.
|
||||||
|
• Envie feedback e relate problemas.
|
||||||
|
• Atualize os dados do mapa no aplicativo ou no site do OpenStreetMap.
|
||||||
|
|
||||||
|
‣ <b>Foco offline</b>: Planeje e navegue em sua viagem ao exterior sem a necessidade de sinal de celular, pesquise pontos de referência durante uma caminhada distante, etc. Todas as funções do aplicativo foram projetadas para funcionar offline.
|
||||||
|
‣ <b>Respeitando a privacidade</b>: O aplicativo foi projetado com a privacidade em mente - não identifica pessoas, não rastreia e não coleta informações pessoais. Sem anúncios.
|
||||||
|
‣ <b>Simples e sofisticado</b>: recursos essenciais e fáceis de usar que simplesmente funcionam.
|
||||||
|
‣ <b>Economiza bateria e espaço</b>: Não consome muita bateria como outros aplicativos de navegação. Mapas compactos economizam espaço precioso no seu celular.
|
||||||
|
‣ <b>Gratuito e desenvolvido pela comunidade</b>: Pessoas como você ajudaram a desenvolver o aplicativo adicionando lugares ao OpenStreetMap, testando e dando feedback sobre os recursos e contribuindo com suas habilidades de desenvolvimento e dinheiro.
|
||||||
|
‣ <b>Tomada de decisões e finanças abertas e transparentes, sem fins lucrativos e totalmente de código aberto.</b>
|
||||||
|
|
||||||
|
<b>Principais recursos</b>:
|
||||||
|
• Mapas detalhados para download com locais não disponíveis no Google Maps
|
||||||
|
• Modo ao ar livre com trilhas em destaque, acampamentos, fontes de água, picos, curvas de nível, etc.
|
||||||
|
• Trilhas para caminhada e ciclovias
|
||||||
|
• Pontos de interesse como restaurantes, postos de gasolina, hotéis, lojas, pontos turísticos e muito mais
|
||||||
|
• Pesquise por nome, endereço ou por categoria de ponto de interesse
|
||||||
|
• Navegação com anúncios de voz para caminhadas, ciclismo ou direção
|
||||||
|
• Marque seus lugares favoritos com um único toque
|
||||||
|
• Artigos offline da Wikipédia
|
||||||
|
• Camada e direções de transporte público do metrô
|
||||||
|
• Gravação de trilhas
|
||||||
|
• Exporte e importe favoritos e trilhas nos formatos KML, KMZ e GPX
|
||||||
|
• Um modo escuro para usar à noite
|
||||||
|
• Aprimore os dados do mapa para todos usando um editor básico integrado
|
||||||
|
|
||||||
|
<b>A Liberdade Chegou</b>
|
||||||
|
Descubra sua jornada, navegue pelo mundo com privacidade e comunidade em primeiro lugar!
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
O aplicație de hărți gratuită & open source, condusă de comunitate, bazată pe date OpenStreetMap și întărită prin angajament față de transparență, confidențialitate și statut non-profit. CoMaps este un fork/spin-off al Organic Maps, care la rândul său este un fork al Maps.ME.
|
|
||||||
|
|
||||||
Citește mai multe despre motivele proiectului și direcția sa pe <b><i>codeberg.org/comaps</i></b>.
|
|
||||||
Alătură-te comunității de acolo și ajută la crearea celei mai bune aplicații de hărți:
|
|
||||||
• Folosește aplicația și promovează-o
|
|
||||||
• Oferă feedback și raportează probleme
|
|
||||||
• Actualizează datele hărților în aplicație sau pe site-ul OpenStreetMap
|
|
||||||
|
|
||||||
‣ <b>Orientare offline</b>: Planifică-ți și navighează-ți călătoria în străinătate fără nevoia unui semnal cellular, caută puncte de reper în timpul unei drumeții îndepărtate etc. Toate funcțiile aplicației sunt concepute să funcționeze offline.
|
|
||||||
‣ <b>Respectă confidențialitatea</b>: Aplicația este concepută cu confidențialitatea în minte - nu identifică persoanele, nu urmărește și nu colectează informații personale. Fără reclame.
|
|
||||||
‣ <b>Simplă și rafinată</b>: caracteristici esențiale, ușor de utilizat, care funcționează fără probleme.
|
|
||||||
‣ <b>Economisește bateria și spațiul</b>: Nu consumă bateria la fel de mult ca alte aplicații de navigație. Hărțile compacte economisesc spațiu prețios pe telefon.
|
|
||||||
‣ <b>Gratuită și construită de comunitate</b>: Oameni ca tine au contribuit la construirea aplicației prin adăugarea de locații pe OpenStreetMap, testare și oferire de feedback pentru funcții, și prin contribuția cu abilități de dezvoltare și finanțare.
|
|
||||||
‣ <b>Decizii și finanțare deschise și transparente, non-profit și cu sursă complet deschisă (open source)</b>.
|
|
||||||
|
|
||||||
<b>Caracteristici principale</b>:
|
|
||||||
• Hărți detaliate, descărcabile, cu locații care nu sunt disponibile pe Google Maps
|
|
||||||
• Mod pentru activități în aer liber cu trasee de drumeție marcate, locuri de campat, surse de apă, vârfuri, linii de contur etc.
|
|
||||||
• Căi pietonale și piste de ciclism
|
|
||||||
• Puncte de interes precum restaurante, benzinării, hoteluri, magazine, obiective turistice și multe altele
|
|
||||||
• Căutare după nume, adresă sau categorie de punct de interes
|
|
||||||
• Navigație cu anunțuri vocale pentru mers pe jos, cu bicicleta sau cu mașina
|
|
||||||
• Marchează-ți locațiile preferate cu un singur clic
|
|
||||||
• Articole Wikipedia offline
|
|
||||||
• Strat pentru metrou și indicații de traseu
|
|
||||||
• Înregistrare trasee
|
|
||||||
• Exportă și importă marcaje și trasee în formatele KML, KMZ, GPX
|
|
||||||
• Un mod întunecat pentru utilizare nocturnă
|
|
||||||
• Îmbunătățește datele hărții pentru toți, folosind un editor de bază integrat
|
|
||||||
|
|
||||||
<b>Libertatea este aici</b>
|
|
||||||
Descoperă-ți călătoria, navighează prin lume având în frunte confidențialitatea și comunitatea!
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
Navigare ușoară - Descoperă mai mult din călătoria ta - Susținut de comunitate
|
|
||||||
@@ -1 +1 @@
|
|||||||
CoMaps - călătorește offline cu confidențialitate
|
CoMaps - Drumeții, Ciclism, Condus Offline în confidențialitate
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
• Карты OpenStreetMap от 4 ноября
|
Представляем логотип CoMaps!
|
||||||
• Обновлены цвета иконок на карте, добавлены новые цвета для развлечений, спорта, некоторых бизнесов
|
• Линии высот для многих регионов с шагом 20м или 50м
|
||||||
• На зарядных станциях показываются имеющиеся типы разъёмов
|
• Ссылки на изображения Panoramax к выбранным POI
|
||||||
• Добавлены эстрады, скамейки без спинок и лежаки
|
• Карты OpenStreetMap от 13 июля
|
||||||
• Новые иконки для разных спорт центров, массажных салонов, гостевых домов, некоторых закрытых бизнесов
|
• Заливки цветом ко многим объектам и более ранняя заливка для существующих объектов
|
||||||
• Несколько улучшений и исправлений в поиске
|
• Показ часов работы при выборе POI
|
||||||
• Улучшены голосовые подсказки при навигации
|
• Разные водно-болотные угодья отличаются цветом
|
||||||
Подробнее смотрите на codeberg.org/comaps/comaps/releases
|
• Обновлены цвета растительности и другие цвета на карте, изменены некоторые иконки
|
||||||
|
• В стиле "Активный отдых" более четкие линии высот
|
||||||
@@ -1 +0,0 @@
|
|||||||
Jednoduchá navigácia - Objav viac zo svojej cesty - Funguje vďaka komunite
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
CoMaps - kráčaj, bicykluj a jazdi v súkromí
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
Brezplačno in odprtokodno zemljevidno orodje, ki ga vodi skupnost, temelji na podatkih OpenStreetMap in je okrepljena s predanostjo transparentnosti, zasebnosti in nedobičkonosnosti. CoMaps je izpeljanka OrganicMaps, ta pa je izpeljanka Maps.ME.
|
|
||||||
|
|
||||||
Preverite si o razlogih za ta projekt in njegovi usmerjenosti na <b><i>codeberg.org/comaps</i></b>.
|
|
||||||
Pridružite se skupnosti in pomagajte narediti najboljše zemljevidno orodje
|
|
||||||
• Uporabljajte orodje in širite glas o njem
|
|
||||||
• Dajajte povratne informacije in poročajte o napakah
|
|
||||||
• Posodabljajte podatke zemljevida v tem orodju ali na spletni strani OpenStreetMap
|
|
||||||
|
|
||||||
‣ <b>Osredotočeno na uporabo brez povezave</b>: Načrtujte in se usmerjajte na vašem potovanju v tujini vrez potrebe po mobilnih podatkih, iščite vmesne točke potocanja ko ste na daljšem pohodu ipd. Vse zmogljivosti orodja so zasnovane za delo brez povezave.
|
|
||||||
‣ <b>Spoštovanje zasebnosti</b>: orodje je zasnovano z mislijo na zasebnost – ne prepoznava oseb, ne sledi in ne zbira osebnih podatkov. Brez oglasov.
|
|
||||||
‣ <b>Preprosto in dodelano</b>: nujne zmogljivosti, enostavne za uporabo, ki preprosto delujejo.
|
|
||||||
‣ <b>Prihrani vašo baterijo in prostor.</b>: ne izčrpava vaše baterije kakor druga usmerjevalna orodja. Strnjeni zemljevidi prihranijo dragocen prostor na vašem telefonu.
|
|
||||||
‣ <b>Brezplačno in ustvarjeno v skupnosti</b>: ljudje kot ste vi pomagajo ustvarjati to orodje, tako da dodajajo kraje na OpenStreetMap, preizkušajo in dajejo povratne informacije o zmogljivostih in prispevajo svoje razvijalske sposobnosti in sredstva.
|
|
||||||
‣ <b>Odprto in transparentno odločanje in finance, nedobičkonosno in popolnoma odprtokodno.</b>
|
|
||||||
|
|
||||||
<b>Glavne zmogljivosti</b>:
|
|
||||||
• Prenosljivi podrobni zemljevidi s kraji, ki na Googlovoh zemljevidih niso na voljo.
|
|
||||||
• Prikaz za dejavnosti na prostem s poudarjenimi pohodniškimi potmi, tabornimi prostori, vodnimi viri, vrhovi, plastnicami itd.
|
|
||||||
• Pešpoti in kolesarke poti
|
|
||||||
• Kraji zanimanja, npr. restavracije, bencinske črpalke, hoteli, trgovine, znamenitosti in mnogo več
|
|
||||||
• Iščite po imenu, hišnemu naslovu ali po vrsti
|
|
||||||
• Usmerjanje z glasovnimi obvestili za hojo, kolesarjenje ali vožnjo avtomobila.
|
|
||||||
• Zaznamujte svoje najljubše kraje s preprostim dotikom
|
|
||||||
• Wikipedijini članki brez povezave
|
|
||||||
• Prometna plast podzemne železnice z usmerjanjem
|
|
||||||
• Izvozite ali uvozite zaznamke in sledi v oblikah KML, KMZ, GPX
|
|
||||||
• Temni prikaz za uporabo ponoči
|
|
||||||
• Izboljšajtw podatke zemljevida za vse z uporabo vgrajenega urejevalnika
|
|
||||||
|
|
||||||
<b>Svoboda je tu</b>
|
|
||||||
Odkijte več o vašem potovanju, usmerjajte se po svetu s poudarkom na zasebnosti in skupnostnem delovanju!
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
Enostavno usmerjanje – Odkrij več o svojem potovanju – Podprto v skupnosti
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
CoMaps–Hodi, kolesari, vozi brez povezave, zasebno
|
|
||||||
@@ -1,32 +1,32 @@
|
|||||||
Бесплатна апликација отвореног кода коју одржава заједница и која се заснива на ОpenStreetMap подацима. Непрофитна, транспарентна и цени вашу приватност. CoMaps је настала од апликације Organic Maps, која је настала од апликације Maps.ME.
|
Бесплатна апликација отвореног кода коју је обављала заједница и заснива се на ОpenStreetMap-у подацима, усмерени транспарентност, приватност и непрофитни. CoMaps је Апликације за органске карте виљушка, које је пак форк Maps.ME.
|
||||||
|
|
||||||
Прочитајте о разлозима пројекта и његовог правца на <b><i>codeberg.org/comaps</i></b>
|
Прочитајте о разлозима пројекта и његовог правца на <b><i>codeberg.org/comaps</i></b>
|
||||||
Придружите се отвореној заједници и помозите да направимо најбољу апликацију за мапе
|
Придружите се отвореној заједници и помозите да направимо најбољу апликацију за мапе
|
||||||
• Користите апликацију и проширите глас о томе
|
• Користите апликацију и проширите глас о томе
|
||||||
• Дајте повратне информације и пријавите проблеме
|
• Дајте повратне информације и пријавите проблеме
|
||||||
• Ажурирајте податке на мапи у апликацији или на сајту OpenStreetMap
|
• Ажурирајте податке на мапи у апликацији или на веб локацији OpenStreetMap
|
||||||
|
|
||||||
‣ <b>Фокусирано на офлајн рад</b>: Планирајте и управљајте путовањем у иностранству без потребе за мобилним интернетом, тражите успутне тачке док сте на забаченом планинском путу, итд. Све функционалности су дизајниране за рад без интернета.
|
‣ <b> фокусирано на офлајн Вар </b>: Планирајте и управљајте путовањем у иностранству без потребе за мобилним услугама, тражите путне тачке док је на даљинском покрету, итд. Све апликације су дизајниране за рад ван мреже.
|
||||||
‣ <b>Поштовање приватности</b>: Апликација је осмишљена са приватношћу корисника на уму - не идентификује људе, не прати или прикупља личне податке. Нема реклама.
|
‣ <b> Поштовање приватности </b>: Апликација је осмишљена задржавања у уму приватност - не идентификује људе, не прати или прикупља личне податке. Нема реклама.
|
||||||
‣ <b>Једноставно и елегантно</b>: Апликација је лака за употребу и једноставно функционише.
|
‣ <b> Једноставно и елегантно </b>: Апликација је тривијална за употребу и једноставно функционише.
|
||||||
‣ <b>Чува вашу батерију и простор</b>: Не троши батерију као остале апликације за навигацију. Компактне мапе чувају драгоцени простор на вашем телефону.
|
‣ <b> Чува вашу батерију и простор </b>: не конзумира батерију као остале навигационе апликације. Компактне картице сачувајте драгоцени простор на вашем телефону.
|
||||||
‣ <b>Отворено и направљено од стране заједнице</b>: Људи попут вас су допринели развоју апликације додавањем локација на OpenStreetMap, тестирањем, давањем повратних информација о апликацији и помогли су својим програмерским вештинама и донацијама.
|
‣ <b> Отворено и направио је заједницу </b>: Људи попут вас је помогли да додају апликацију додавањем локација на OpenStreetMap-у, тестирању и давање повратних информација о апликацији и доприносе вашим развојним вештинама и новцу.
|
||||||
‣ <b>Отворено и транспарентно доношење одлука и употреба донација, непрофитна и потпуно отвореног кода.</b>
|
‣ <b> Отворено и транспарентно доношење одлука и употреба финансија, непрофитна и потпуно отворена извора. </b>
|
||||||
|
|
||||||
<b> Главне карактеристике </b>:
|
<b> Главне карактеристике </b>:
|
||||||
• Преузмимање детаљне мапе са локацијама које нису доступне са Google мапама
|
• Преузмите детаљне мапе са локацијама које нису доступне са Гоогле мапама
|
||||||
• Режим за излете са истакнутим планинарским стазама, камповима, изворима воде, планинским врховима, изохипсама итд.
|
• Улазнице за излете са истакнутим планинарским стазама, камповима, изворима воде, планинске врхове, контурне линије итд.
|
||||||
• Стазе за планинарење и бицикле
|
• Стазе за планинарење и бицикле
|
||||||
• Тачке интереса као што су ресторани, бензинске пумпе, хотели, продавнице, знаменитости и још много тога
|
• Тачке интереса као што су ресторани, бензинске пумпе, хотели, продавнице, погледа и још много тога
|
||||||
• Претрага по називу, адреси или категоријама
|
• Претражите име или адресу или по категоријама камате
|
||||||
• Навигација са гласовним инструкцијама за ходање, вожњу бицикла или аутомобила
|
• навигација са гласовним најавама за ходање, бициклизам или аутомобил
|
||||||
• Означивање омиљених места једним додиром
|
• Означите своја омиљена места једним додиром
|
||||||
• Офлајн чланци Википедије
|
• Офлајн чланци Википедије
|
||||||
• Транзитни слој подземне железнице са навигацијом
|
• транзитни слој подземне пруге са навигацијом
|
||||||
• Снимање ГПС путања
|
• Снимање ГПС трагова
|
||||||
• Увоз и увоз маркера и путања у KML, KMZ, GPX формате
|
• Ознака и увоз и увоз у KML, KMZ, GPX формате
|
||||||
• Тамни режим за употребу током ноћи
|
• Тамни режим за употребу током ноћи
|
||||||
• Побољшајте карту за све кориснике, користећи основни едитор за мапе
|
• Побољшајте карту за све кориснике, користећи основни уредни уредник мапе
|
||||||
|
|
||||||
<b> Слобода је овде </b>
|
<b> Слобода је овде </b>
|
||||||
Откријте своје путовање, крећете се са светом са приватношћу и заједницом на првом месту!
|
Откријте своје путовање, крећете се са свијетом са приватношћу и заједницом на првом месту!
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user