diff --git a/.github/workflows/android.yaml b/.github/workflows/android.yaml
index 47e1dceabc..c3c9148abd 100644
--- a/.github/workflows/android.yaml
+++ b/.github/workflows/android.yaml
@@ -10,18 +10,10 @@ jobs:
with:
submodules: true
- - uses: actions/checkout@v2
- with:
- repository: omapsapp/omapsapp-private
- path: private
- ref: master
- ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
-
- name: Configure
shell: bash
run: |
- echo | ./configure.sh
- cp -pRv ./private/* .
+ ./configure.sh
- name: Set up SDK
shell: bash
@@ -30,16 +22,10 @@ jobs:
- name: Compile
shell: bash
- run: (cd android; ./gradlew bundleWebBeta packageWebBetaUniversalApk)
-
- - uses: actions/upload-artifact@v2
- with:
- name: android-universal-bundle
- path: android/build/outputs/bundle/webBeta/android-web-beta.aab
- if-no-files-found: error
+ run: (cd android; ./gradlew bundleWebDebug packageWebDebugUniversalApk)
- uses: actions/upload-artifact@v2
with:
name: android-universal-apk
- path: android/build/outputs/universal_apk/webBeta/android-web-beta-universal.apk
+ path: android/build/outputs/universal_apk/webDebug/android-web-debug-universal.apk
if-no-files-found: error
diff --git a/.github/workflows/desktop.yaml b/.github/workflows/desktop.yaml
index 3b10da8b18..758713cf3b 100644
--- a/.github/workflows/desktop.yaml
+++ b/.github/workflows/desktop.yaml
@@ -10,18 +10,10 @@ jobs:
with:
submodules: true
- - uses: actions/checkout@v2
- with:
- repository: omapsapp/omapsapp-private
- path: private
- ref: master
- ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
-
- name: Configure
shell: bash
run: |
- echo | ./configure.sh
- cp -pRv ./private/* .
+ ./configure.sh
- name: Compile
shell: bash
diff --git a/.gitignore b/.gitignore
index 8231296b60..7ed61146d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -162,7 +162,6 @@ tizen/*/crash-info/*
.private_repository_url
.private_repository_branch
private.h
-routing_common/car_model_coefs.hpp
tools/android/mapswithme.keystore
tools/android/yota.keystore
android/debug.keystore
diff --git a/android/.gitignore b/android/.gitignore
index 2ef3eade3b..15c3212de9 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -38,5 +38,3 @@ res/drawable-mdpi/uk_england.png
res/drawable-mdpi/uk_northern_ireland.png
res/drawable-mdpi/uk_scotland.png
res/drawable-mdpi/uk_wales.png
-
-res/xml/network_security_config.xml
diff --git a/android/google-services.json b/android/google-services.json
new file mode 100644
index 0000000000..25e32e6ccb
--- /dev/null
+++ b/android/google-services.json
@@ -0,0 +1,39 @@
+{
+ "project_info": {
+ "project_number": "939321867014",
+ "project_id": "omapsapp",
+ "storage_bucket": "omapsapp.appspot.com"
+ },
+ "client": [
+ {
+ "client_info": {
+ "mobilesdk_app_id": "1:939321867014:android:5798993f09df2165587c87",
+ "android_client_info": {
+ "package_name": "app.omaps.debug"
+ }
+ },
+ "oauth_client": [
+ {
+ "client_id": "939321867014-dl645lvm685ahogrq6u6vh7ubcdtbeqq.apps.googleusercontent.com",
+ "client_type": 3
+ }
+ ],
+ "api_key": [
+ {
+ "current_key": "AIzaSyDc0g6jxAz-YRVU1kCMwj08JZyCeAaIcF0"
+ }
+ ],
+ "services": {
+ "appinvite_service": {
+ "other_platform_oauth_client": [
+ {
+ "client_id": "939321867014-dl645lvm685ahogrq6u6vh7ubcdtbeqq.apps.googleusercontent.com",
+ "client_type": 3
+ }
+ ]
+ }
+ }
+ }
+ ],
+ "configuration_version": "1"
+}
diff --git a/android/pushwoosh.properties b/android/pushwoosh.properties
new file mode 100644
index 0000000000..254a5f49a3
--- /dev/null
+++ b/android/pushwoosh.properties
@@ -0,0 +1,3 @@
+pwAppId=XXXXX
+pwProjectId=A123456789012
+
diff --git a/android/res/xml/network_security_config.xml b/android/res/xml/network_security_config.xml
new file mode 100644
index 0000000000..328f20e1c2
--- /dev/null
+++ b/android/res/xml/network_security_config.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/android/secure.properties b/android/secure.properties
new file mode 100644
index 0000000000..ddc84cc159
--- /dev/null
+++ b/android/secure.properties
@@ -0,0 +1,6 @@
+ext {
+ spropStoreFile = "debug.keystore"
+ spropStorePassword = "12345678"
+ spropKeyAlias = "debug"
+ spropKeyPassword = "12345678"
+}
diff --git a/configure.sh b/configure.sh
index 4be9c80170..68068e0a7f 100755
--- a/configure.sh
+++ b/configure.sh
@@ -12,106 +12,12 @@ set -e -u
BASE_PATH=$(cd "$(dirname "$0")"; pwd)
-PRIVATE_HEADER="$BASE_PATH/private.h"
-DEFAULT_PRIVATE_HEADER="$BASE_PATH/private_default.h"
-PRIVATE_CAR_MODEL_COEFS="$BASE_PATH/routing_common/car_model_coefs.hpp"
-DEFAULT_PRIVATE_CAR_MODEL_COEFS="$BASE_PATH/routing_common/car_model_coefs_default.hpp"
-
-PRIVATE_PROPERTIES="$BASE_PATH/android/secure.properties"
-PRIVATE_PUSHWOOSH_PROPERTIES="$BASE_PATH/android/pushwoosh.properties"
-PRIVATE_NETWORK_CONFIG="$BASE_PATH/android/res/xml/network_security_config.xml"
-PRIVATE_GOOGLE_SERVICES="$BASE_PATH/android/google-services.json"
-SAVED_PRIVATE_REPO_FILE="$BASE_PATH/.private_repository_url"
-SAVED_PRIVATE_BRANCH_FILE="$BASE_PATH/.private_repository_branch"
-TMP_REPO_DIR="$BASE_PATH/.tmp.private.repo"
-
usage() {
- echo "This tool configures omim with private repository or as an opensource build"
- echo "Usage:"
- echo " $0 private_repo_url [private_repo_branch] - to configure with private repository"
- echo " echo '[private_repo_url] [private_repo_branch]' | $0 - alternate invocation for private repository configuration"
- echo " $0 - to use with saved repository url and branch or to set up an open source build if nothing is saved"
+ echo "This tool configures omaps repository"
echo ""
}
-setup_opensource() {
- echo "Initializing repository with default values in Open-Source mode."
- cat "$DEFAULT_PRIVATE_HEADER" > "$PRIVATE_HEADER"
- cat "$DEFAULT_PRIVATE_CAR_MODEL_COEFS" > "$PRIVATE_CAR_MODEL_COEFS"
- echo 'ext {
- spropStoreFile = "../tools/android/debug.keystore"
- spropStorePassword = "12345678"
- spropKeyAlias = "debug"
- spropKeyPassword = "12345678"
-}
-' > "$PRIVATE_PROPERTIES"
- echo 'pwAppId=XXXXX
-pwProjectId=A123456789012
-' > "$PRIVATE_PUSHWOOSH_PROPERTIES"
- echo '
-
-' > "$PRIVATE_NETWORK_CONFIG"
- echo '{}' > "$PRIVATE_GOOGLE_SERVICES"
-}
-
-setup_private() {
- echo "Setting up private configuration: repo '$PRIVATE_REPO', branch '$PRIVATE_BRANCH'"
- if git clone --depth 1 --no-single-branch "$PRIVATE_REPO" "$TMP_REPO_DIR"; then
- echo "$PRIVATE_REPO" > "$SAVED_PRIVATE_REPO_FILE"
- echo "$PRIVATE_BRANCH" > "$SAVED_PRIVATE_BRANCH_FILE"
- echo "Saved private repository url '$PRIVATE_REPO' to '$SAVED_PRIVATE_REPO_FILE'"
- echo "Saved private branch '$PRIVATE_BRANCH' to '$SAVED_PRIVATE_BRANCH_FILE'"
- (cd $TMP_REPO_DIR && git checkout $PRIVATE_BRANCH)
- rm -rf "$TMP_REPO_DIR/.git" "$TMP_REPO_DIR/README.md"
- cp -Rv "$TMP_REPO_DIR"/* "$BASE_PATH"
- rm -rf "$TMP_REPO_DIR"
- echo "Private files have been updated."
- fi
-}
-
-if [ "${1-}" = "-h" -o "${1-}" = "--help" ]; then
- usage
- exit 1
-fi
-
-ARGS_PRIVATE_REPO=${1-}
-ARGS_PRIVATE_BRANCH=${2-}
-
-if [ -n "$ARGS_PRIVATE_REPO" ]; then
- PRIVATE_REPO=$ARGS_PRIVATE_REPO
- if [ -n "$ARGS_PRIVATE_BRANCH" ]; then
- PRIVATE_BRANCH=$ARGS_PRIVATE_BRANCH
- else
- PRIVATE_BRANCH=master
- fi
-else
- read -t 1 READ_PRIVATE_REPO READ_PRIVATE_BRANCH || true
- if [ -n "${READ_PRIVATE_REPO-}" ]; then
- PRIVATE_REPO=$READ_PRIVATE_REPO
- if [ -n "${READ_PRIVATE_BRANCH-}" ]; then
- PRIVATE_BRANCH=$READ_PRIVATE_BRANCH
- else
- PRIVATE_BRANCH=master
- fi
- elif [ -f "$SAVED_PRIVATE_REPO_FILE" ]; then
- PRIVATE_REPO=`cat "$SAVED_PRIVATE_REPO_FILE"`
- echo "Using stored private repository URL: $PRIVATE_REPO"
- if [ -f "$SAVED_PRIVATE_BRANCH_FILE" ]; then
- PRIVATE_BRANCH=`cat "$SAVED_PRIVATE_BRANCH_FILE"`
- echo "Using stored private branch: $PRIVATE_BRANCH"
- else
- PRIVATE_BRANCH=master
- fi
- else
- PRIVATE_REPO=""
- fi
-fi
-
-if [ -n "$PRIVATE_REPO" ]; then
- setup_private
-else
- setup_opensource
-fi
+echo "Initializing repository with default values in Open-Source mode."
# TODO: Remove these lines when XCode project is finally generated by CMake.
if [ ! -d "$BASE_PATH/3party/boost/" ]; then
diff --git a/docs/INSTALL.md b/docs/INSTALL.md
index 6eec1f68a1..7a41d9afc4 100644
--- a/docs/INSTALL.md
+++ b/docs/INSTALL.md
@@ -57,8 +57,8 @@ Install Qt 5, CMake, Clang and SQLite:
Do a git clone:
git clone --depth=1 --recursive https://github.com/omapsapp/omapsapp.git
- cd omim
- echo | ./configure.sh
+ cd omaps
+ ./configure.sh
Then:
diff --git a/private_default.h b/private.h
similarity index 98%
rename from private_default.h
rename to private.h
index 40032de939..e84dc901ad 100644
--- a/private_default.h
+++ b/private.h
@@ -15,7 +15,7 @@
#define RESOURCES_METASERVER_URL ""
#define METASERVER_URL ""
#define DIFF_LIST_URL ""
-#define DEFAULT_URLS_JSON ""
+#define DEFAULT_URLS_JSON "[ \"https://cdn.omaps.app/\" ]"
#define AD_PERMISION_SERVER_URL ""
#define AD_PERMISION_CHECK_DURATION 2 * 60 * 60
#define HOCKEY_APP_KEY ""
diff --git a/routing_common/car_model_coefs.hpp b/routing_common/car_model_coefs.hpp
new file mode 100644
index 0000000000..f68bea1e37
--- /dev/null
+++ b/routing_common/car_model_coefs.hpp
@@ -0,0 +1,60 @@
+#pragma once
+
+#include "routing_common/maxspeed_conversion.hpp"
+#include "routing_common/vehicle_model.hpp"
+
+// These are default car model coefficients for open source developers.
+
+namespace routing
+{
+HighwayBasedFactors const kHighwayBasedFactors = {
+ // {highway class : InOutCityFactor(in city, out city)}
+ {HighwayType::HighwayLivingStreet, InOutCityFactor(0.75)},
+ {HighwayType::HighwayMotorway, InOutCityFactor(0.90, 0.94)},
+ {HighwayType::HighwayMotorwayLink, InOutCityFactor(0.90, 0.94)},
+ {HighwayType::HighwayPrimary, InOutCityFactor(0.86, 0.89)},
+ {HighwayType::HighwayPrimaryLink, InOutCityFactor(0.86, 0.89)},
+ {HighwayType::HighwayResidential, InOutCityFactor(0.75)},
+ {HighwayType::HighwayRoad, InOutCityFactor(0.30)},
+ {HighwayType::HighwaySecondary, InOutCityFactor(0.84, 0.82)},
+ {HighwayType::HighwaySecondaryLink, InOutCityFactor(0.84, 0.82)},
+ {HighwayType::HighwayService, InOutCityFactor(0.80)},
+ {HighwayType::HighwayTertiary, InOutCityFactor(0.82, 0.76)},
+ {HighwayType::HighwayTertiaryLink, InOutCityFactor(0.82, 0.76)},
+ {HighwayType::HighwayTrack, InOutCityFactor(0.30)},
+ {HighwayType::HighwayTrack, InOutCityFactor(0.30)},
+ {HighwayType::HighwayTrunk, InOutCityFactor(0.90, 0.91)},
+ {HighwayType::HighwayTrunkLink, InOutCityFactor(0.77, 0.81)},
+ {HighwayType::HighwayUnclassified, InOutCityFactor(0.80)},
+ {HighwayType::ManMadePier, InOutCityFactor(0.90)},
+ {HighwayType::RailwayRailMotorVehicle, InOutCityFactor(0.90)},
+ {HighwayType::RouteFerryMotorcar, InOutCityFactor(0.90)},
+ {HighwayType::RouteFerryMotorVehicle, InOutCityFactor(0.90)},
+ {HighwayType::RouteShuttleTrain, InOutCityFactor(0.90)},
+};
+
+HighwayBasedSpeeds const kHighwayBasedSpeeds = {
+ // {highway class : InOutCitySpeedKMpH(in city, out city)}
+ {HighwayType::HighwayLivingStreet, InOutCitySpeedKMpH({10.00, 10.00} /* in city */, {10.00, 10.00} /* out city */)},
+ {HighwayType::HighwayMotorway, InOutCitySpeedKMpH(118.0 /* in city */, 124.0 /* out city */)},
+ {HighwayType::HighwayMotorwayLink, InOutCitySpeedKMpH(109.00 /* in city */, 115.00 /* out city */)},
+ {HighwayType::HighwayPrimary, InOutCitySpeedKMpH(65.00 /* in city */, 82.00 /* out city */)},
+ {HighwayType::HighwayPrimaryLink, InOutCitySpeedKMpH(58.00 /* in city */, 72.00 /* out city */)},
+ {HighwayType::HighwayResidential, InOutCitySpeedKMpH({20.00, 26.00} /* in city */, {26.00, 26.00} /* out city */)},
+ {HighwayType::HighwayRoad, InOutCitySpeedKMpH({10.00, 10.00} /* in city */, {10.00, 10.00} /* out city */)},
+ {HighwayType::HighwaySecondary, InOutCitySpeedKMpH(60.00 /* in city */, 70.00 /* out city */)},
+ {HighwayType::HighwaySecondaryLink, InOutCitySpeedKMpH(48.00 /* in city */, 56.00 /* out city */)},
+ {HighwayType::HighwayService, InOutCitySpeedKMpH({15.00, 15.00} /* in city */, {15.00, 15.00} /* out city */)},
+ {HighwayType::HighwayTertiary, InOutCitySpeedKMpH(60.00 /* in city */, 50.00 /* out city */)},
+ {HighwayType::HighwayTertiaryLink, InOutCitySpeedKMpH({40.95, 34.97} /* in city */, {45.45, 39.73} /* out city */)},
+ {HighwayType::HighwayTrack, InOutCitySpeedKMpH({5.00, 5.00} /* in city */, {5.00, 5.00} /* out city */)},
+ {HighwayType::HighwayTrunk, InOutCitySpeedKMpH(90.00 /* in city */, 103.00 /* out city */)},
+ {HighwayType::HighwayTrunkLink, InOutCitySpeedKMpH(77.00 /* in city */, 91.00 /* out city */)},
+ {HighwayType::HighwayUnclassified, InOutCitySpeedKMpH({30.00, 30.00} /* in city */, {40.00, 40.00} /* out city */)},
+ {HighwayType::ManMadePier, InOutCitySpeedKMpH({17.00, 10.00} /* in city */, {17.00, 10.00} /* out city */)},
+ {HighwayType::RailwayRailMotorVehicle, InOutCitySpeedKMpH({10.00, 10.00} /* in city */, {10.00, 10.00} /* out city */)},
+ {HighwayType::RouteFerryMotorcar, InOutCitySpeedKMpH({10.00, 10.00} /* in city */, {10.00, 10.00} /* out city */)},
+ {HighwayType::RouteFerryMotorVehicle, InOutCitySpeedKMpH({10.00, 10.00} /* in city */, {10.00, 10.00} /* out city */)},
+ {HighwayType::RouteShuttleTrain, InOutCitySpeedKMpH({25.00, 25.00} /* in city */, {25.00, 25.00} /* out city */)},
+};
+} // namespace routing