Skip to content

nmpfilter renamed to nmpbyregion#105

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.

Sign up for GitHub

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

Merged
jteresco merged 5 commits into from
Sep 21, 2018
Merged

nmpfilter renamed to nmpbyregion #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1d7e8d7
Merge pull request #5 from TravelMapping/master
yakra Sep 8, 2018
15371f8
Merge pull request #6 from TravelMapping/master
yakra Sep 21, 2018
b930772
Rename nmpfilter.cpp to nmpbyregion.cpp
yakra Sep 21, 2018
6515864
nmpfilter -> nmpbyregion
yakra Sep 21, 2018
4b4da29
localupdate.sh: nmpfilter -> nmpbyregion
yakra Sep 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions nmpfilter/README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
# nmpfilter
# nmpbyregion

**Purpose:**<br>
Splits *tm-master.nmp* into smaller .nmp files filtered by region.

**usage:**<br>
`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.
2 changes: 1 addition & 1 deletion nmpfilter/nmpfilter.cpp → nmpfilter/nmpbyregion.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ void filter(vector<string> &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<string> RgList;
Expand Down
10 changes: 5 additions & 5 deletions siteupdate/python-teresco/localupdate.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down