Add quest for internet access #784
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
westnordost
requested changes
Jan 22, 2018
app/src/main/res/values/strings.xml
Outdated
| @@ -456,4 +456,9 @@ Otherwise, you can download another keyboard in the app store. Popular keyboards | |||
| <string name="quest_generic_looks_like_this">Usually looks like this:</string> | |||
| <string name="quest_surface_value_metal">Metal</string> | |||
| <string name="quest_surface_generic_surface_confirmation">Are you sure that you can not determine the surface more specifically?</string> | |||
| <string name="quest_internet_access_name_title">What kind of connection does "%s" offer?</string> | |||
app/src/main/res/values/strings.xml
Outdated
| @@ -456,4 +456,9 @@ Otherwise, you can download another keyboard in the app store. Popular keyboards | |||
| <string name="quest_generic_looks_like_this">Usually looks like this:</string> | |||
| <string name="quest_surface_value_metal">Metal</string> | |||
| <string name="quest_surface_generic_surface_confirmation">Are you sure that you can not determine the surface more specifically?</string> | |||
| <string name="quest_internet_access_name_title">What kind of connection does "%s" offer?</string> | |||
| <string name="quest_internet_access_wlan">WLAN</string> | |||
| protected String getTagFilters() { | ||
| return "nodes, ways, relations with" + | ||
| " (amenity=library or" + | ||
| " (tourism ~ hotel|guest_house|hostel|motel))" + |
There was a problem hiding this comment.
unnecessary parenthesis around tourism ~ ...
westnordost
approved these changes
Jan 22, 2018
|
(There are conflicts here, otherwise ready to merge) |
|
What kind of conflict? I can't see any... |
|
It says "This branch cannot be rebased due to conflicts". Oh, but I can merge it. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is a follow-up of #730 because I messed it up while merging the master branch into my branch for this feature... Sorry for that...
The quest looks currently like this:
This PR would fix #99