Avoid roads export import #8534
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
max-klaus
reviewed
Feb 24, 2020
OsmAnd/res/values/strings.xml
Outdated
| @@ -72,7 +72,7 @@ | |||
| <string name="sunset_at">Sunset at %1$s</string> | |||
| <string name="sunrise_at">Sunrise at %1$s</string> | |||
| <string name="shared_string_routing">Routing</string> | |||
| <string name="shared_string_custom_rendering_style">Custom rendering style</string> | |||
| <string name="shared_string_custom_rendering_style">Rendering styles</string> | |||
max-klaus
reviewed
Feb 24, 2020
| @@ -801,7 +805,7 @@ SettingsItemReader getReader() { | |||
| @Override | |||
| public void readFromStream(@NonNull InputStream inputStream) throws IOException, IllegalArgumentException { | |||
| OutputStream output; | |||
| if (shouldReplace || !file.exists()) { | |||
| if (!file.exists() || file.exists() && shouldReplace) { | |||
max-klaus
reviewed
Feb 24, 2020
|
|
||
| @NonNull | ||
| @Override | ||
| public List<AvoidRoadInfo> excludeDuplicateItems() { |
max-klaus
reviewed
Feb 24, 2020
| @Override | ||
| public boolean isDuplicate(@NonNull AvoidRoadInfo item) { | ||
| for (AvoidRoadInfo existingItem : existingItems) { | ||
| if (item.latitude == existingItem.latitude |
There was a problem hiding this comment.
Implement equals in AvoidRoadInfo
max-klaus
reviewed
Feb 24, 2020
| @@ -1622,7 +1830,12 @@ void importItems(@NonNull File file, @NonNull List<SettingsItem> items) throws I | |||
| if (item != null && collecting && item.shouldReadOnCollecting() | |||
| || item != null && !collecting && !item.shouldReadOnCollecting()) { | |||
| try { | |||
| item.getReader().readFromStream(ois); | |||
| for (SettingsItem settingsItem : items) { | |||
There was a problem hiding this comment.
Replace with if (items.contains(item))
vshcherb
force-pushed
the
avoid_roads_export_import
branch
2 times, most recently
from
10f7b77
to
4fc18f0
Compare
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.
No description provided.