Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds dedicated voice message for speed camera with distance and max speed as prerequisite for osmandapp#3721 and osmandapp#8108 #724

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions voice/ar/ar_tts.js
Original file line number Diff line number Diff line change
Expand Up @@ -816,6 +816,10 @@ function speed_alarm(maxSpeed, speed) {
return dictionary["exceed_limit"] + " " + num_str(maxSpeed, "m", "nom");
}

function speed_camera_alarm(dist, maxSpeed) {
return attention("SPEED_CAMERA");
}

function attention(type) {
return dictionary["attention"] + " " + getAttentionString(type);
}
Expand Down
4 changes: 4 additions & 0 deletions voice/be/be_tts.js
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,10 @@ function speed_alarm(maxSpeed, speed) {
return dictionary["exceed_limit"] + " " + maxSpeed.toString();
}

function speed_camera_alarm(dist, maxSpeed) {
return attention("SPEED_CAMERA");
}

function attention(type) {
return dictionary["attention"] + (tts ? "! " : " ") + getAttentionString(type);
}
Expand Down
4 changes: 4 additions & 0 deletions voice/bg/bg_tts.js
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,10 @@ function speed_alarm(maxSpeed, speed) {
return dictionary["exceed_limit"] + " " + maxSpeed.toString();
}

function speed_camera_alarm(dist, maxSpeed) {
return attention("SPEED_CAMERA");
}

function attention(type) {
return dictionary["attention"] + " " + getAttentionString(type);
}
Expand Down
4 changes: 4 additions & 0 deletions voice/bs/bs_tts.js
Original file line number Diff line number Diff line change
Expand Up @@ -607,6 +607,10 @@ function speed_alarm(maxSpeed, speed) {
return dictionary["exceed_limit"] + " " + maxSpeed.toString();
}

function speed_camera_alarm(dist, maxSpeed) {
return attention("SPEED_CAMERA");
}

function attention(type) {
return dictionary["attention"] + " " + getAttentionString(type);
}
Expand Down
4 changes: 4 additions & 0 deletions voice/ca/ca_tts.js
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,10 @@ function speed_alarm(maxSpeed, speed) {
return dictionary["exceed_limit"] + " " + maxSpeed.toString();
}

function speed_camera_alarm(dist, maxSpeed) {
return attention("SPEED_CAMERA");
}

function attention(type) {
return dictionary["attention"] + (tts ? ", " : " ") + getAttentionString(type);
}
Expand Down
4 changes: 4 additions & 0 deletions voice/cs/cs_tts.js
Original file line number Diff line number Diff line change
Expand Up @@ -576,6 +576,10 @@ function speed_alarm(maxSpeed, speed) {
return dictionary["exceed_limit"] + " " + maxSpeed.toString();
}

function speed_camera_alarm(dist, maxSpeed) {
return attention("SPEED_CAMERA");
}

function attention(type) {
return dictionary["attention"] + (tts ? ", " : " ") + getAttentionString(type);
}
Expand Down
7 changes: 7 additions & 0 deletions voice/da/da_tts.js
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,13 @@ function speed_alarm(maxSpeed, speed) {
return dictionary["exceed_limit"] + " " + maxSpeed.toString();
}

function speed_camera_alarm(dist, maxSpeed) {
return dictionary["attention"] +
(tts ? ", " : " ") + dictionary["speed_camera"] +
(tts ? ", " : " ") + dictionary["distance"] + " " + distance(dist) +
(tts ? ", " + dictionary["exceed_limit"] + " " + maxSpeed.toString() : "");
}

function attention(type) {
return dictionary["attention"] + (tts ? ", " : " ") + getAttentionString(type);
}
Expand Down
4 changes: 4 additions & 0 deletions voice/de-casual/de-casual_tts.js
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,10 @@ function speed_alarm(maxSpeed, speed) {
return dictionary["exceed_limit"] + " " + maxSpeed.toString();
}

function speed_camera_alarm(dist, maxSpeed) {
return attention("SPEED_CAMERA");
}

function attention(type) {
return dictionary["attention"] + (tts ? ", " : " ") + getAttentionString(type);
}
Expand Down
4 changes: 4 additions & 0 deletions voice/de/de_tts.js
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,10 @@ function speed_alarm(maxSpeed, speed) {
return dictionary["exceed_limit"] + " " + maxSpeed.toString();
}

function speed_camera_alarm(dist, maxSpeed) {
return attention("SPEED_CAMERA");
}

function attention(type) {
return dictionary["attention"] + (tts ? ", " : " ") + getAttentionString(type);
}
Expand Down
7 changes: 7 additions & 0 deletions voice/el/el_tts.js
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,13 @@ function speed_alarm(maxSpeed, speed) {
return dictionary["exceed_limit"] + " " + maxSpeed.toString();
}

function speed_camera_alarm(dist, maxSpeed) {
return dictionary["attention"] +
(tts ? ", " : " ") + dictionary["speed_camera"] +
(tts ? ", " : " ") + dictionary["distance"] + " " + distance(dist) +
(tts ? ", " + dictionary["exceed_limit"] + " " + maxSpeed.toString() : "");
}

function attention(type) {
return dictionary["attention"] + (tts ? ", " : " ") + getAttentionString(type);
}
Expand Down
7 changes: 7 additions & 0 deletions voice/en-gb/en-gb_tts.js
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,13 @@ function speed_alarm(maxSpeed, speed) {
return dictionary["exceed_limit"] + " " + maxSpeed.toString();
}

function speed_camera_alarm(dist, maxSpeed) {
return dictionary["attention"] +
(tts ? ", " : " ") + dictionary["speed_camera"] +
(tts ? ", " : " ") + dictionary["distance"] + " " + distance(dist) +
(tts ? ", " + dictionary["exceed_limit"] + " " + maxSpeed.toString() : "");
}

function attention(type) {
return dictionary["attention"] + (tts ? ", " : " ") + getAttentionString(type);
}
Expand Down
7 changes: 7 additions & 0 deletions voice/en/en_tts.js
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,13 @@ function speed_alarm(maxSpeed, speed) {
return dictionary["exceed_limit"] + " " + maxSpeed.toString();
}

function speed_camera_alarm(dist, maxSpeed) {
return dictionary["attention"] +
(tts ? ", " : " ") + dictionary["speed_camera"] +
(tts ? ", " : " ") + dictionary["distance"] + " " + distance(dist) +
(tts ? ", " + dictionary["exceed_limit"] + " " + maxSpeed.toString() : "");
}

function attention(type) {
return dictionary["attention"] + (tts ? ", " : " ") + getAttentionString(type);
}
Expand Down
7 changes: 7 additions & 0 deletions voice/es-ar/es-ar_tts.js
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,13 @@ function speed_alarm(maxSpeed, speed) {
return dictionary["exceed_limit"] + " " + maxSpeed.toString();
}

function speed_camera_alarm(dist, maxSpeed) {
return dictionary["attention"] +
(tts ? ", " : " ") + dictionary["speed_camera"] +
(tts ? ", " : " ") + dictionary["distance"] + " " + distance(dist) +
(tts ? ", " + dictionary["exceed_limit"] + " " + maxSpeed.toString() : "");
}

function attention(type) {
return dictionary["attention"] + (tts ? ", " : " ") + getAttentionString(type);
}
Expand Down
4 changes: 4 additions & 0 deletions voice/es/es_tts.js
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,10 @@ function speed_alarm(maxSpeed, speed) {
return dictionary["exceed_limit"] + " " + maxSpeed.toString();
}

function speed_camera_alarm(dist, maxSpeed) {
return attention("SPEED_CAMERA");
}

function attention(type) {
return dictionary["attention"] + (tts ? ", " : " ") + getAttentionString(type);
}
Expand Down
4 changes: 4 additions & 0 deletions voice/et/et_tts.js
Original file line number Diff line number Diff line change
Expand Up @@ -650,6 +650,10 @@ function speed_alarm(maxSpeed, speed) {
return dictionary["exceed_limit"] + " " + maxSpeed.toString();
}

function speed_camera_alarm(dist, maxSpeed) {
return attention("SPEED_CAMERA");
}

function attention(type) {
return dictionary["attention"] + (tts ? "! " : " ") + getAttentionString(type);
}
Expand Down
7 changes: 7 additions & 0 deletions voice/fa/fa_tts.js
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,13 @@ function speed_alarm(maxSpeed, speed) {
return dictionary["exceed_limit"] + " " + maxSpeed.toString();
}

function speed_camera_alarm(dist, maxSpeed) {
return dictionary["attention"] +
(tts ? ", " : " ") + dictionary["speed_camera"] +
(tts ? ", " : " ") + dictionary["distance"] + " " + distance(dist) +
(tts ? ", " + dictionary["exceed_limit"] + " " + maxSpeed.toString() : "");
}

function attention(type) {
return dictionary["attention"] + (tts ? ", " : " ") + getAttentionString(type);
}
Expand Down
4 changes: 4 additions & 0 deletions voice/fi/fi_tts.js
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,10 @@ function speed_alarm(maxSpeed, speed) {
return dictionary["exceed_limit"] + " " + maxSpeed.toString();
}

function speed_camera_alarm(dist, maxSpeed) {
return attention("SPEED_CAMERA");
}

function attention(type) {
return dictionary["attention"] + (tts ? ", " : " ") + getAttentionString(type);
}
Expand Down
4 changes: 4 additions & 0 deletions voice/fr/fr_tts.js
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,10 @@ function speed_alarm(maxSpeed, speed) {
return dictionary["exceed_limit"] + " " + maxSpeed.toString();
}

function speed_camera_alarm(dist, maxSpeed) {
return attention("SPEED_CAMERA");
}

function attention(type) {
return dictionary["attention"] + (tts ? ", " : " ") + getAttentionString(type);
}
Expand Down
4 changes: 4 additions & 0 deletions voice/gn-py/gn-py_tts.js
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,10 @@ function speed_alarm(maxSpeed, speed) {
return dictionary["exceed_limit"] + " " + maxSpeed.toString();
}

function speed_camera_alarm(dist, maxSpeed) {
return attention("SPEED_CAMERA");
}

function attention(type) {
return dictionary["attention"] + (tts ? ", " : " ") + getAttentionString(type);
}
Expand Down
4 changes: 4 additions & 0 deletions voice/hi/hi_tts.js
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,10 @@ function speed_alarm(maxSpeed, speed) {
return dictionary["exceed_limit"] + " " + maxSpeed.toString();
}

function speed_camera_alarm(dist, maxSpeed) {
return attention("SPEED_CAMERA");
}

function attention(type) {
return dictionary["attention"] + " " + getAttentionString(type);
}
Expand Down
4 changes: 4 additions & 0 deletions voice/hr/hr_tts.js
Original file line number Diff line number Diff line change
Expand Up @@ -604,6 +604,10 @@ function speed_alarm(maxSpeed, speed) {
return dictionary["exceed_limit"] + " " + maxSpeed.toString();
}

function speed_camera_alarm(dist, maxSpeed) {
return attention("SPEED_CAMERA");
}

function attention(type) {
return dictionary["attention"] + (tts ? ", " : " ") + getAttentionString(type);
}
Expand Down
4 changes: 4 additions & 0 deletions voice/hu-formal/hu-formal_tts.js
Original file line number Diff line number Diff line change
Expand Up @@ -521,6 +521,10 @@ function speed_alarm(maxSpeed, speed) {
return dictionary["exceed_limit"] + " " + maxSpeed.toString();
}

function speed_camera_alarm(dist, maxSpeed) {
return attention("SPEED_CAMERA");
}

function attention(type) {
return dictionary["attention"] + (tts ? ", " : " ") + getAttentionString(type);
}
Expand Down
4 changes: 4 additions & 0 deletions voice/hu/hu_tts.js
Original file line number Diff line number Diff line change
Expand Up @@ -521,6 +521,10 @@ function speed_alarm(maxSpeed, speed) {
return dictionary["exceed_limit"] + " " + maxSpeed.toString();
}

function speed_camera_alarm(dist, maxSpeed) {
return attention("SPEED_CAMERA");
}

function attention(type) {
return dictionary["attention"] + (tts ? ", " : " ") + getAttentionString(type);
}
Expand Down
4 changes: 4 additions & 0 deletions voice/id/id_tts.js
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,10 @@ function speed_alarm(maxSpeed, speed) {
return dictionary["exceed_limit"] + " " + maxSpeed.toString();
}

function speed_camera_alarm(dist, maxSpeed) {
return attention("SPEED_CAMERA");
}

function attention(type) {
return dictionary["attention"] + (tts ? ", " : " ") + getAttentionString(type);
}
Expand Down
4 changes: 4 additions & 0 deletions voice/it/it_tts.js
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,10 @@ function speed_alarm(maxSpeed, speed) {
return dictionary["exceed_limit"] + " " + maxSpeed.toString();
}

function speed_camera_alarm(dist, maxSpeed) {
return attention("SPEED_CAMERA");
}

function attention(type) {
return dictionary["attention"] + (tts ? ", " : " ") + getAttentionString(type);
}
Expand Down
4 changes: 4 additions & 0 deletions voice/ja/ja_tts.js
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,10 @@ function speed_alarm(maxSpeed, speed) {
return dictionary["exceed_limit"] + " " + maxSpeed.toString();
}

function speed_camera_alarm(dist, maxSpeed) {
return attention("SPEED_CAMERA");
}

function attention(type) {
return dictionary["attention"] + " " + getAttentionString(type);
}
Expand Down
7 changes: 7 additions & 0 deletions voice/ko/ko_tts.js
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,13 @@ function speed_alarm(maxSpeed, speed) {
return dictionary["exceed_limit"] + " " + maxSpeed.toString();
}

function speed_camera_alarm(dist, maxSpeed) {
return dictionary["attention"] +
(tts ? ", " : " ") + dictionary["speed_camera"] +
(tts ? ", " : " ") + dictionary["distance"] + " " + distance(dist) +
(tts ? ", " + dictionary["exceed_limit"] + " " + maxSpeed.toString() : "");
}

function attention(type) {
return dictionary["attention"] + (tts ? ", " : " ") + getAttentionString(type);
}
Expand Down
4 changes: 4 additions & 0 deletions voice/lv/lv_tts.js
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,10 @@ function speed_alarm(maxSpeed, speed) {
return dictionary["exceed_limit"] + " " + maxSpeed.toString();
}

function speed_camera_alarm(dist, maxSpeed) {
return attention("SPEED_CAMERA");
}

function attention(type) {
return dictionary["attention"] + (tts ? ", " : " ") + getAttentionString(type);
}
Expand Down
7 changes: 7 additions & 0 deletions voice/nb/nb_tts.js
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,13 @@ function speed_alarm(maxSpeed, speed) {
return dictionary["exceed_limit"] + " " + maxSpeed.toString();
}

function speed_camera_alarm(dist, maxSpeed) {
return dictionary["attention"] +
(tts ? ", " : " ") + dictionary["speed_camera"] +
(tts ? ", " : " ") + dictionary["distance"] + " " + distance(dist) +
(tts ? ", " + dictionary["exceed_limit"] + " " + maxSpeed.toString() : "");
}

function attention(type) {
return dictionary["attention"] + (tts ? ", " : " ") + getAttentionString(type);
}
Expand Down
4 changes: 4 additions & 0 deletions voice/nl/nl_tts.js
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,10 @@ function speed_alarm(maxSpeed, speed) {
return dictionary["exceed_limit"] + " " + maxSpeed.toString();
}

function speed_camera_alarm(dist, maxSpeed) {
return attention("SPEED_CAMERA");
}

function attention(type) {
return dictionary["attention"] + (tts ? ", " : " ") + getAttentionString(type);
}
Expand Down
4 changes: 4 additions & 0 deletions voice/pl/pl_tts.js
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,10 @@ function speed_alarm(maxSpeed, speed) {
return dictionary["exceed_limit"] + " " + maxSpeed.toString();
}

function speed_camera_alarm(dist, maxSpeed) {
return attention("SPEED_CAMERA");
}

function attention(type) {
return dictionary["attention"] + (tts ? ", " : " ") + getAttentionString(type);
}
Expand Down
4 changes: 4 additions & 0 deletions voice/pt-br/pt-br_tts.js
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,10 @@ function speed_alarm(maxSpeed, speed) {
return dictionary["exceed_limit"] + " " + maxSpeed.toString();
}

function speed_camera_alarm(dist, maxSpeed) {
return attention("SPEED_CAMERA");
}

function attention(type) {
return dictionary["attention"] + (tts ? "! " : " ") + getAttentionString(type);
}
Expand Down
4 changes: 4 additions & 0 deletions voice/pt/pt_tts.js
Original file line number Diff line number Diff line change
Expand Up @@ -548,6 +548,10 @@ function speed_alarm(maxSpeed, speed) {
return dictionary["exceed_limit"] + " " + maxSpeed.toString();
}

function speed_camera_alarm(dist, maxSpeed) {
return attention("SPEED_CAMERA");
}

function attention(type) {
return dictionary["attention"] + (tts ? "! " : " ") + getAttentionString(type);
}
Expand Down
Loading