mirror of
https://codeberg.org/comaps/comaps
synced 2026-01-09 22:04:43 +00:00
Compare commits
2 Commits
yannikblos
...
patepelo-i
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0036bfb4f2 | ||
|
|
3f9dfd6605 |
@@ -660,9 +660,9 @@ node|z17-[building]::int_name,
|
||||
Housenumbers and main captions are displaced independently (e.g. a housenumber will stay if a building name is displaced),
|
||||
but are bound to icons (e.g. a housenumber will disappear if a parent icon is displaced).
|
||||
*/
|
||||
node|z17-[addr:housenumber][addr:street],
|
||||
node|z16-[addr:housenumber][addr:street],
|
||||
{text: name; text-color: @housenumber; text-position: center;}
|
||||
node|z17-[addr:housenumber][addr:street]::int_name,
|
||||
node|z16-[addr:housenumber][addr:street]::int_name,
|
||||
{text: int_name; text-color: @housenumber; text-position: center;}
|
||||
|
||||
node|z18-[entrance=main],
|
||||
|
||||
@@ -2414,7 +2414,7 @@ amenity-vending_machine-excrement_bags # icon z18- (also has captio
|
||||
amenity-vending_machine-food # icon z18- (also has caption(optional) z18-)
|
||||
amenity-vending_machine-newspapers # icon z18- (also has caption(optional) z18-)
|
||||
amenity-vending_machine-sweets # icon z18- (also has caption(optional) z18-)
|
||||
building-address # caption z17-
|
||||
building-address # caption z16-
|
||||
man_made-telescope-optical # icon z17- (also has caption(optional) z17-)
|
||||
=== -9970
|
||||
|
||||
|
||||
@@ -2420,7 +2420,7 @@ amenity-vending_machine-excrement_bags # icon z18- (also has captio
|
||||
amenity-vending_machine-food # icon z18- (also has caption(optional) z18-)
|
||||
amenity-vending_machine-newspapers # icon z18- (also has caption(optional) z18-)
|
||||
amenity-vending_machine-sweets # icon z18- (also has caption(optional) z18-)
|
||||
building-address # caption z17-
|
||||
building-address # caption z16-
|
||||
man_made-telescope-optical # icon z17- (also has caption(optional) z17-)
|
||||
=== -9970
|
||||
|
||||
|
||||
@@ -21,7 +21,9 @@ Clone the repository including all submodules (see [Special cases options](#spec
|
||||
|
||||
Follow the instructions for your OS, and afterwards the repository is prepared to build a CoMaps app!
|
||||
|
||||
### Linux
|
||||
## Setting up to your OS of development
|
||||
<details open>
|
||||
<summary><span style="font-size: 1.5em; font-weight: bold;">Linux</span></summary>
|
||||
Clone the repository
|
||||
```bash
|
||||
git clone --recurse-submodules --shallow-submodules https://codeberg.org/comaps/comaps.git
|
||||
@@ -41,7 +43,10 @@ cd comaps
|
||||
|
||||
If you plan to publish the app privately in stores check [special options](#special-cases-options).
|
||||
|
||||
### Windows
|
||||
</details>
|
||||
|
||||
<details open>
|
||||
<summary><span style="font-size: 1.5em; font-weight: bold;">Windows</span></summary>
|
||||
You need to have [Git for Windows](https://git-scm.com/download/win) installed and Git bash available in the PATH.
|
||||
|
||||
It's necessary to enable symlink support:
|
||||
@@ -69,7 +74,11 @@ For _Windows 10_: You should be able to build the project by following either o
|
||||
**Setup 2: Using Visual Studio Developer Command Prompt**
|
||||
Install the [Visual Studio Developer Command Prompt](https://docs.microsoft.com/en-us/visualstudio/ide/reference/command-prompt-powershell?view=vs-2022) (make sure to choose the latest MSVC x64/x86 build tool and Windows 10/11 SDK as individual components while installing Visual Studio).
|
||||
|
||||
### macOS
|
||||
</details>
|
||||
|
||||
<details open>
|
||||
<summary><span style="font-size: 1.5em; font-weight: bold;">macOS</span></summary>
|
||||
|
||||
Install required build dependencies and Xcode
|
||||
1. Install Xcode Command Line Tools
|
||||
2. Install [Xcode](https://apps.apple.com/app/xcode/id497799835?mt=12) from the App Store
|
||||
@@ -93,8 +102,10 @@ git clone --recurse-submodules --shallow-submodules https://codeberg.org/comaps/
|
||||
cd comaps
|
||||
./configure.sh
|
||||
```
|
||||
</details>
|
||||
|
||||
### Special cases options
|
||||
<details open>
|
||||
<summary><span style="font-size: 1.5em; font-weight: bold;">Special cases options</span></summary>
|
||||
|
||||
If you're only doing a one-off build or your internet bandwidth or disk space is limited, add following options to the `git clone` command:
|
||||
|
||||
@@ -114,7 +125,11 @@ It'll seamlessly replace the squashed first "Organic Maps sources as of 02.04.20
|
||||
The `om-historic.git` repo is ~1Gb only as various historic blobs, bundled 3rd-party deps, etc. were removed from it.
|
||||
If you really need them (e.g. to build a very old app version) then refer to full organicmaps.git repo please.
|
||||
|
||||
## Android app
|
||||
</details>
|
||||
|
||||
## Develop for:
|
||||
<details open>
|
||||
<summary><span style="font-size: 1.5em; font-weight: bold;">Android app</span></summary>
|
||||
|
||||
### Preparing
|
||||
|
||||
@@ -199,9 +214,10 @@ To enable logging in case of crashes, after installing a debug version, run:
|
||||
```bash
|
||||
adb shell pm grant app.organicmaps.debug android.permission.READ_LOGS
|
||||
```
|
||||
</details>
|
||||
|
||||
|
||||
### Android Auto Development
|
||||
<details open>
|
||||
<summary><span style="font-size: 1.5em; font-weight: bold;">Android Auto</span></summary>
|
||||
|
||||
Android Auto can be developed and tested without having a physical device by using [Desktop Head Unit (DHU)](https://developer.android.com/training/cars/testing/dhu). Go to Android Studio > Tools -> SDK Manager -> SDK Tools and enable "Android Auto Desktop Head Unit".
|
||||
|
||||
@@ -349,8 +365,10 @@ Example of command line for running system tracing:
|
||||
```
|
||||
./record_android_trace -a app.organicmaps.debug -o trace_file.perfetto-trace -t 30s -b 64mb sched freq idle am wm gfx view binder_driver hal dalvik camera input res memory
|
||||
```
|
||||
</details>
|
||||
|
||||
## iOS app
|
||||
<details open>
|
||||
<summary><span style="font-size: 1.5em; font-weight: bold;">iOS app</span></summary>
|
||||
|
||||
### Preparing
|
||||
|
||||
@@ -401,7 +419,11 @@ Select "CoMaps" product scheme.
|
||||
|
||||
Compile and run the project ("Product" → "Run").
|
||||
|
||||
### CarPlay
|
||||
</details>
|
||||
|
||||
<details open>
|
||||
<summary><span style="font-size: 1.5em; font-weight: bold;">CarPlay</span></summary>
|
||||
|
||||
To test CarPlay, simply select "I/O" → "External Displays" → "CarPlay" in the Simulator
|
||||
|
||||
### Spoofing GPS
|
||||
@@ -411,6 +433,8 @@ To select an Apple predetermined track or specific custom location, choose "Feat
|
||||
|
||||
To simulate a custom GPX track use `python3 tools/python/ios_simulator_load_gpx.py <path to your gpx>` which is a wrapper for `xcrun simctl location`. Default values are 60 km/h and 0.1s update intervals, but can be customized
|
||||
|
||||
</details>
|
||||
|
||||
## Desktop app
|
||||
|
||||
See [install_desktop](INSTALL_DESKTOP.md) to install and build Desktop app for Linux and Mac OS
|
||||
|
||||
@@ -77,6 +77,8 @@ TagMapping const kVehicleTagMapping = {
|
||||
{OsmElement::Tag("vehicle", "private"), RoadAccess::Type::Private},
|
||||
{OsmElement::Tag("vehicle", "destination"), RoadAccess::Type::Destination},
|
||||
{OsmElement::Tag("vehicle", "permit"), RoadAccess::Type::Permit},
|
||||
{OsmElement::Tag("service", "parking_aisle"), RoadAccess::Type::Private},
|
||||
{OsmElement::Tag("amenity", "parking_entrance"), RoadAccess::Type::Private},
|
||||
};
|
||||
|
||||
TagMapping const kCarBarriersTagMapping = {
|
||||
|
||||
@@ -87,7 +87,7 @@ void CaptionDescription::Init(FeatureType & f, int8_t deviceLang, int zoomLevel,
|
||||
|
||||
// TODO(pastk) : its better to determine housenumbers minZoom once upon drules load and cache it,
|
||||
// but it'd mean a lot of housenumbers-specific logic in otherwise generic RulesHolder..
|
||||
uint8_t constexpr kHousenumbersMinZoom = 17;
|
||||
uint8_t constexpr kHousenumbersMinZoom = 16;
|
||||
if (geomType != feature::GeomType::Line && zoomLevel >= kHousenumbersMinZoom &&
|
||||
(auxCaptionExists || m_mainText.empty()))
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user