-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(includes): iterate airports by rule, then by airport (#168)
* fix(includes): iterate airports by rule, then by airport Currently, we iterate each of the airport directories and within that, iterate through the rules. This has the effect of making the ordering of the rules essentially useless, as all the rules get applied to the current airport before moving on. This change modifies the processing order so it applies each rule in turn to each folder, which produces the desired effect. fix #167 * Remove test variable
Showing
6 changed files
with
266 additions
and
74 deletions.
There are no files selected for viewing
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 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
Large diffs are not rendered by default.
Oops, something went wrong.
4 changes: 4 additions & 0 deletions
4
tests/CompilerTest/_TestData/ConfigIncludeLoader/AirportOrder/Airports/EGKK/.gitignore
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
# Ignore everything in this directory | ||
* | ||
# Except this file | ||
!.gitignore |
4 changes: 4 additions & 0 deletions
4
tests/CompilerTest/_TestData/ConfigIncludeLoader/AirportOrder/Airports/EGLL/.gitignore
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
# Ignore everything in this directory | ||
* | ||
# Except this file | ||
!.gitignore |
29 changes: 29 additions & 0 deletions
29
tests/CompilerTest/_TestData/ConfigIncludeLoader/AirportOrder/config.json
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
{ | ||
"includes": { | ||
"airports": { | ||
"Airports": { | ||
"basic": [ | ||
{ | ||
"type": "files", | ||
"files": [ | ||
"Basic.txt", | ||
"Basic2.txt" | ||
], | ||
"exclude_directory": [ | ||
"EGKK" | ||
] | ||
}, | ||
{ | ||
"type": "files", | ||
"files": [ | ||
"Basic.txt", | ||
"Basic2.txt" | ||
] | ||
} | ||
] | ||
} | ||
}, | ||
"enroute": {}, | ||
"misc": {} | ||
} | ||
} |