Simplify map data #7233
Merged
Simplify map data #7233
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
This block does not do anything.. We later check if all map
territories are in the keyset that comes from a save game. If
we have extra territories in the save game, removing them is
not going to have an effect when we check that all territories
in the map are in the save game.
IE:
The following contains check will be no different if we decrease the size
of the 'keys' set:
```
if (!keys.contains(terr.getName())) {
```
It appears an error used to be logged here instead of the 'skip'. It seems
that instead of skipping the iter.remove and surrounding loop could have
been removed in 0eaf35b
DanVanAtta
force-pushed
the
simplify-map-data
branch
from
299c68f to
f2a94f2
Compare
Codecov Report
@@ Coverage Diff @@
## master #7233 +/- ##
=========================================
Coverage 23.82% 23.83%
+ Complexity 6970 6969 -1
=========================================
Files 1160 1160
Lines 78793 78785 -8
Branches 11370 11368 -2
=========================================
- Hits 18776 18775 -1
+ Misses 57836 57828 -8
- Partials 2181 2182 +1
Continue to review full report at Codecov.
|
|
Code Climate has analyzed commit f2a94f2 and detected 0 issues on this pull request. The test coverage on the diff in this pull request is 100.0% (50% is the threshold). This pull request will bring the total coverage in the repository to 26.6% (0.0% change). View more on Code Climate. |
RoiEXLab
approved these changes
Jul 24, 2020
DanVanAtta
added a commit
that referenced
this pull request
Aug 22, 2020
Allows for new territory naming to be ignored in favor of "old" territory. This allows territory naming to line up with polygons.txt and centers.txt, without the matching is strict and territory names can appear as 'none' which disallows movements into those territories. Partial revert of: #7233 Fixes: #7386
DanVanAtta
added a commit
that referenced
this pull request
Aug 22, 2020
Allows for new territory naming to be ignored in favor of "old" territory. This allows territory naming to line up with polygons.txt and centers.txt, without the matching is strict and territory names can appear as 'none' which disallows movements into those territories. Partial revert of: #7233 Fixes: #7386
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.
2 Commits to simplify, please verify that the logic & changes are sound:
commit c645e41
commit 299c68f
Functional Changes
[] New map or map update
[] New Feature
[] Feature update or enhancement
[] Feature Removal
[x] Code Cleanup or refactor
[] Configuration Change
[] Problem fix
[] Other:
Testing
Screens Shots
Additional Notes to Reviewer
It looks like the
iterremove may have been a wrong fix to a previous problem: 0eaf35b , notably the wholeiter.removecould have been removed.Release Note