From: Florent R. <f.r...@fr...> - 2016-05-23 11:28:39
|
Hi Alan, I have pushed a new branch: https://sourceforge.net/u/frougon/flightgear-flightgear/ci/multi-apt-dat-input-v1/tree/ (same name as the previous one except that 'v0' has been replaced by 'v1') I had to do this in a new branch in order to have a clean history despite the semantic change for --apt-dat (now: earlier overrides later, as you suggested and contrary to what I first intended to do---for the record: this is to ensure consistency with FG_SCENERY). So, the main change compared to branch 'multi-apt-dat-input-v0' as you tried it is that 'multi-apt-dat-input-v1' supports apt.dat[.gz] files that potentially declare the same airports (and, as said: for any given airport, only the definition found via the first --apt-dat=/path/to/apt.dat[.gz] option that points to this airport is used). There are also a bunch of smaller fixes and improvements (code structure for reuse from other modules, readability...). Using a command such as: fgfs --log-class=general,navaid --log-level=info \ --apt-dat=/path/to/maldives-custom-scenery/data/airports/vrmt.dat \ --apt-dat=/path/to/maldives-custom-scenery/data/airports/vrmg.dat \ --apt-dat=/path/to/maldives-custom-scenery/data/airports/vrmh.dat \ --apt-dat=/path/to/maldives-custom-scenery/data/airports/vrmk.dat \ --apt-dat=/path/to/maldives-custom-scenery/data/airports/vrmm.dat \ --apt-dat=/path/to/maldives-custom-scenery/data/airports/vrmo.dat \ --apt-dat=/path/to/your/normal/fgdata/Airports/apt.dat.gz \ ... you should see messages such as: /path/to/your/normal/fgdata/Airports/apt.dat.gz: skipping airport VRMG (already defined earlier) /path/to/your/normal/fgdata/Airports/apt.dat.gz: skipping airport VRMH (already defined earlier) /path/to/your/normal/fgdata/Airports/apt.dat.gz: skipping airport VRMT (already defined earlier) /path/to/your/normal/fgdata/Airports/apt.dat.gz: skipping airport VRMK (already defined earlier) /path/to/your/normal/fgdata/Airports/apt.dat.gz: skipping airport VRMM (already defined earlier) which shows that FG indeed ignores all these airport definitions found in the standard apt.dat.gz, because they are present in the *.dat files mentioned in earlier --apt-dat options. There is no such message for VRMO, because it is a new airport that is not present in the standard apt.dat.gz. Apart from a couple of commit messages I will expand if I get confirmation that this is going to be merged, the only remaining issue I am aware of is the one I already mentioned for branch 'multi-apt-dat-input-v0': the built-in Qt launcher can't see the --apt-dat option because it initializes the navdb before options are processed with the standard FG mechanism. But before spending time on a solution to this problem, I'd rather wait for James' informed opinion on the matter... Regards -- Florent |