Skip to content

Commit

Permalink
Replace f.e. with e.g.
Browse files Browse the repository at this point in the history
  • Loading branch information
FloEdelmann committed Feb 2, 2022
1 parent 88d71c4 commit 6aca0dc
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 16 deletions.
8 changes: 4 additions & 4 deletions app/src/main/assets/map_theme/jawg/global.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ global:
function() {
var userLang = global.language;
if (userLang) {
// Preference #1: Take name in own language (f.e. name:en used in Egypt a lot)
// Preference #1: Take name in own language (e.g. name:en used in Egypt a lot)
var nameInUserLang = feature['name_'+userLang];
if (nameInUserLang) return nameInUserLang;
Expand All @@ -82,7 +82,7 @@ global:
// Preference #2 and #3 are not available in JawgMaps
// Preference #2: Take international name (f.e. used in Greece a lot)
// Preference #2: Take international name (e.g. used in Greece a lot)
//var internationalName = feature["int_name"];
//if (internationalName) return internationalName;
Expand All @@ -103,10 +103,10 @@ global:
if (nameInLatinScript) return nameInLatinScript;
}
// Preference #6: Take name of any other language whose script is the same as the user's script (f.e. French signs in Laos)
// Preference #6: Take name of any other language whose script is the same as the user's script (e.g. French signs in Laos)
// ... not implementable without a mapping of language code to script
// Preference #7: Take name of any other language whose script is in Latin (cause it's kind of "international") script (f.e. French signs in Laos)
// Preference #7: Take name of any other language whose script is in Latin (cause it's kind of "international") script (e.g. French signs in Laos)

This comment has been minimized.

Copy link
@westnordost

westnordost Feb 3, 2022

Member

Well that's going to be overwritten next time the map style is imported from https://github.com/streetcomplete/streetcomplete-mapstyle

This comment has been minimized.

Copy link
@FloEdelmann

FloEdelmann Feb 3, 2022

Author Member

I've opened a PR there now: streetcomplete/streetcomplete-mapstyle#120

This comment has been minimized.

Copy link
@Helium314

Helium314 May 13, 2022

Collaborator

How often is this map style import happening? I see there are several rather old changes in the mapstyle repo that are not yet in SC

// ... not implementable without a mapping of language code to script
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ interface ElementEditsSource {
fun onAddedEdit(edit: ElementEdit)
fun onSyncedEdit(edit: ElementEdit)
// may be several because deleting one element edit leads to the deletion of all edits that
// are based on that edit. F.e. splitting a way, then editing the newly created way segments
// are based on that edit. E.g. splitting a way, then editing the newly created way segments
fun onDeletedEdits(edits: List<ElementEdit>)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class ElementEditsUploader @Inject constructor(
val edit = elementEditsController.getOldestUnsynced() ?: break
val idProvider = elementEditsController.getIdProvider(edit.id)
/* the sync of local change -> API and its response should not be cancellable because
* otherwise an inconsistency in the data would occur. F.e. no "star" for an uploaded
* otherwise an inconsistency in the data would occur. E.g. no "star" for an uploaded
* change, a change could be uploaded twice etc */
withContext(scope.coroutineContext) { uploadEdit(edit, idProvider) }
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class NoteEditsUploader @Inject constructor(
while (true) {
val edit = noteEditsController.getOldestUnsynced() ?: break
/* the sync of local change -> API and its response should not be cancellable because
* otherwise an inconsistency in the data would occur. F.e. a note could be uploaded
* otherwise an inconsistency in the data would occur. E.g. a note could be uploaded
* twice */
withContext(scope.coroutineContext) { uploadEdit(edit) }
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ fun createCyclewaySides(tags: Map<String, String>, isLeftHandTraffic: Boolean):
var right: Cycleway?

/* For oneways, the naked "cycleway"-keys should be interpreted differently:
* F.e. a cycleway=lane in a oneway=yes probably means that only in the flow direction, there
* is a lane. F.e. cycleway=opposite_lane means that there is a lane in opposite traffic flow
* E.g. a cycleway=lane in a oneway=yes probably means that only in the flow direction, there
* is a lane. E.g. cycleway=opposite_lane means that there is a lane in opposite traffic flow
* direction.
* Whether there is anything each in the other direction, is not defined, so we have to treat
* it that way. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,19 +149,19 @@ import javax.inject.Singleton
/* The quest types are primarily sorted by how easy they can be solved:
1. quests that are solvable from a distance or while passing by (fast)
2. quests that require to be right in front of it (f.e. because it is small, you need to
2. quests that require to be right in front of it (e.g. because it is small, you need to
look for it or read text)
3. quests that require some exploration or walking around to check (f.e. walking down the
3. quests that require some exploration or walking around to check (e.g. walking down the
whole road to find the cycleway is the same along the whole way)
4. quests that require to go inside, i.e. deviate from your walking route by a lot just
to solve the quest
5. quests that come in heaps (are spammy) come last: F.e. building type etc.
5. quests that come in heaps (are spammy) come last: E.g. building type etc.
The ordering within this primary sort order shall be whatever is faster so solve first:
a. Yes/No quests, easy selections first,
b. number and text inputs later,
c. complex inputs (opening hours, ...) last. Quests that f.e. often require the way to be
c. complex inputs (opening hours, ...) last. Quests that e.g. often require the way to be
split up first are in effect also slow to answer
The order can be watered down somewhat if it means that quests that usually apply to the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class AddCrossing : OsmElementQuestType<KerbHeight> {
/* require all roads at a shared node to either have no sidewalk tagging or all of them to
* have sidewalk tagging: If the sidewalk tagging changes at that point, it may be an
* indicator that this is the transition point between separate sidewalk mapping and
* sidewalk mapping on road-way. F.e.:
* sidewalk mapping on road-way. E.g.:
* https://www.openstreetmap.org/node/1839120490 */
val anySidewalk = setOf("both", "left", "right")

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/raw/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ v33.2: |
<li>Allow answering that a place does not exist when asking whether it offers Kosher food (#3073), by @peternewman</li>
<li>For pubs that definitely serve food, also ask whether they have vegetarian and vegan food (#3097, #3099), by @peternewman</li>
<li>Don't ask whether a place offers vegetarian food if it only offers vegan food (#3072, #3081), by @starsep</li>
<li>Don't ask for the existence of things that are seasonal, f.e. loungers that can only be found in the park during summer (#3089), by @matkoniecz</li>
<li>Don't ask for the existence of things that are seasonal, e.g. loungers that can only be found in the park during summer (#3089), by @matkoniecz</li>
<li>Periodically ask if a drinking fountain still exists (#3102)</li>
<li>Clean tags from previous vacant shop when answering that there is a new shop now (#3045), by @TurnrDev</li>
<li>Improve illustration in building levels quest (#3092)</li>
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/Utils.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import java.util.Locale

// Java (and thus also Android) uses some old iso (language) codes. F.e. id -> in etc.
// Java (and thus also Android) uses some old iso (language) codes. E.g. id -> in etc.
// so the localized files also need to use the old iso codes
fun bcp47LanguageTagToJavaLanguageTag(bcp47: String): String {
val locale = Locale.forLanguageTag(bcp47)
Expand Down

0 comments on commit 6aca0dc

Please sign in to comment.