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

Fix: Restore leniency for mismatching territory names #7419

Merged
merged 1 commit into from
Aug 22, 2020

Conversation

DanVanAtta
Copy link
Member

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

Testing

Double check WaW 1940 map movement into renamed territories.

Screens Shots

Additional Notes to Reviewer

Release Note

FIX|Movement incorrectly disallowed into certain territories on WaW

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
@codecov
Copy link

codecov bot commented Aug 22, 2020

Codecov Report

Merging #7419 into master will increase coverage by 0.00%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #7419   +/-   ##
=========================================
  Coverage     23.93%   23.93%           
- Complexity     6948     6949    +1     
=========================================
  Files          1165     1165           
  Lines         78714    78705    -9     
  Branches      11354    11356    +2     
=========================================
+ Hits          18838    18839    +1     
+ Misses        57692    57683    -9     
+ Partials       2184     2183    -1     
Impacted Files Coverage Δ Complexity Δ
...ava/games/strategy/triplea/ui/mapdata/MapData.java 2.72% <0.00%> (-0.07%) 3.00 <0.00> (ø)
.../main/java/org/triplea/http/ServerApplication.java 0.00% <0.00%> (ø) 0.00 <0.00> (ø)
.../java/games/strategy/triplea/delegate/Matches.java 43.02% <0.00%> (+0.10%) 358.00% <0.00%> (+1.00%)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ab27543...d4efbce. Read the comment docs.

@codeclimate
Copy link

codeclimate bot commented Aug 22, 2020

Code Climate has analyzed commit d4efbce 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.7% (0.0% change).

View more on Code Climate.

@DanVanAtta DanVanAtta merged commit cc4dfec into master Aug 22, 2020
@DanVanAtta DanVanAtta deleted the continue-ignoring-unmatched-territory-names branch August 22, 2020 18:23
@DanVanAtta DanVanAtta changed the title Restore leniency for mismatching territory names Fix: Restore leniency for mismatching territory names Aug 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

WAW 1940 issue
1 participant