diff --git a/nmpfilter/README.md b/nmpfilter/README.md index 32e01966..05fd3d99 100644 --- a/nmpfilter/README.md +++ b/nmpfilter/README.md @@ -1,10 +1,10 @@ -# nmpfilter +# nmpbyregion **Purpose:**
Splits *tm-master.nmp* into smaller .nmp files filtered by region. **usage:**
-`nmpfilter HwyDataDir MasterNMP OutputDir`, where +`nmpbyregion HwyDataDir MasterNMP OutputDir`, where * `HwyDataDir` is the path of the *hwy_data* directory in the HighwayData repository, or equivalent * `MasterNMP` is the path of *tm-master.nmp* * `OutputDir` is the directory in which to write the resulting .nmp files. Trailing slash required. diff --git a/nmpfilter/nmpfilter.cpp b/nmpfilter/nmpbyregion.cpp similarity index 96% rename from nmpfilter/nmpfilter.cpp rename to nmpfilter/nmpbyregion.cpp index 89d26ccc..64481b55 100644 --- a/nmpfilter/nmpfilter.cpp +++ b/nmpfilter/nmpbyregion.cpp @@ -60,7 +60,7 @@ void filter(vector &RgList, char *MasterNMP, char *OutputDir) int main(int argc, char *argv[]) { if (argc != 4) - { cout << "usage: nmpfilter HwyDataDir MasterNMP OutputDir\n"; + { cout << "usage: nmpbyregion HwyDataDir MasterNMP OutputDir\n"; return 0; } vector RgList; diff --git a/siteupdate/python-teresco/localupdate.sh b/siteupdate/python-teresco/localupdate.sh index a0e77ca4..8dcd9c88 100644 --- a/siteupdate/python-teresco/localupdate.sh +++ b/siteupdate/python-teresco/localupdate.sh @@ -47,15 +47,15 @@ echo "$0: launching siteupdate.py" PYTHONIOENCODING='utf-8' ./siteupdate.py -d TravelMapping-$datestr $graphflag -l $datestr/$logdir -c $datestr/$statdir -g $datestr/$graphdir -n $datestr/$nmpmdir | tee $datestr/$logdir/siteupdate.log 2>&1 || exit 1 date -if [ -x ../../nmpfilter/nmpfilter ]; then - echo "$0: running nmpfilter" - ../../nmpfilter/nmpfilter $tmbase/HighwayData/hwy_data $datestr/$logdir/tm-master.nmp $datestr/$logdir/nmpbyregion/ - echo "$0: creating zip archive of all nmp files created by nmpfilter" +if [ -x ../../nmpfilter/nmpbyregion ]; then + echo "$0: running nmpbyregion" + ../../nmpfilter/nmpbyregion $tmbase/HighwayData/hwy_data $datestr/$logdir/tm-master.nmp $datestr/$logdir/nmpbyregion/ + echo "$0: creating zip archive of all nmp files created by nmpbyregion" cd $datestr/$logdir/nmpbyregion zip -q nmpbyregion.zip *.nmp cd - else - echo "$0: SKIPPING nmpfilter (../../nmpfilter/nmpfilter not executable)" + echo "$0: SKIPPING nmpbyregion (../../nmpfilter/nmpbyregion not executable)" fi if [ "$install" == "0" ]; then