From 8f2c0f6cb96ccf805157b0d265bbef93f38c8b45 Mon Sep 17 00:00:00 2001 From: Christian Schmitt Date: Tue, 28 Aug 2012 16:03:27 +0200 Subject: [PATCH] rename fgfs-construct to tg-construct --- src/BuildTiles/Main/.gitignore | 2 +- src/BuildTiles/Main/CMakeLists.txt | 14 ++++++-------- src/BuildTiles/Main/README | 12 ++++++------ src/BuildTiles/Parallel/client.cxx | 2 +- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/BuildTiles/Main/.gitignore b/src/BuildTiles/Main/.gitignore index 0d2a67e4..8100c72f 100644 --- a/src/BuildTiles/Main/.gitignore +++ b/src/BuildTiles/Main/.gitignore @@ -1,2 +1,2 @@ -fgfs-construct +tg-construct fgfs-master diff --git a/src/BuildTiles/Main/CMakeLists.txt b/src/BuildTiles/Main/CMakeLists.txt index fe84a27c..147612ff 100644 --- a/src/BuildTiles/Main/CMakeLists.txt +++ b/src/BuildTiles/Main/CMakeLists.txt @@ -1,18 +1,16 @@ - - -add_executable(fgfs-construct +add_executable(tg-construct construct.cxx construct.hxx - priorities.cxx + priorities.cxx priorities.hxx usgs.cxx main.cxx) -set_target_properties(fgfs-construct PROPERTIES +set_target_properties(tg-construct PROPERTIES COMPILE_DEFINITIONS "DEFAULT_USGS_MAPFILE=\"${PKGDATADIR}/usgsmap.txt\";DEFAULT_PRIORITIES_FILE=\"${PKGDATADIR}/default_priorities.txt\"" ) - -target_link_libraries(fgfs-construct + +target_link_libraries(tg-construct Osgb36 Match Polygon Geometry @@ -23,7 +21,7 @@ target_link_libraries(fgfs-construct ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES} ${GPC_LIBRARY}) -install(TARGETS fgfs-construct RUNTIME DESTINATION bin) +install(TARGETS tg-construct RUNTIME DESTINATION bin) INSTALL(FILES usgsmap.txt DESTINATION ${PKGDATADIR} ) INSTALL(FILES default_priorities.txt DESTINATION ${PKGDATADIR} ) diff --git a/src/BuildTiles/Main/README b/src/BuildTiles/Main/README index fa49adea..9d4e4a06 100644 --- a/src/BuildTiles/Main/README +++ b/src/BuildTiles/Main/README @@ -1,21 +1,21 @@ Sample command line to build a specific tile-id: -./fgfs-construct --work-dir=/stage/fgfs05/curt/Work --output-dir=/stage/fgfs05/curt/Scenery-1.0 --tile-id=942691 /stage/fgfs05/curt/Work/AirportArea /stage/fgfs05/curt/Work/AirportObj /stage/fgfs05/curt/Work/Shape-Canals /stage/fgfs05/curt/Work/Shape-Cities /stage/fgfs05/curt/Work/Shape-FloodLand /stage/fgfs05/curt/Work/Shape-Lakes /stage/fgfs05/curt/Work/Shape-LandCover /stage/fgfs05/curt/Work/Shape-LandMass /stage/fgfs05/curt/Work/Shape-Railroads /stage/fgfs05/curt/Work/Shape-Rivers /stage/fgfs05/curt/Work/Shape-Roads /stage/fgfs05/curt/Work/Shape-Towns /stage/fgfs05/curt/Work/TowerObj /stage/fgfs05/curt/Work/SRTM2-United_States-1 /stage/fgfs05/curt/Work/SRTM2-Africa-3 /stage/fgfs05/curt/Work/SRTM2-Australia-3 /stage/fgfs05/curt/Work/SRTM2-Eurasia-3 /stage/fgfs05/curt/Work/SRTM2-Islands-3 /stage/fgfs05/curt/Work/SRTM2-North_America-3 /stage/fgfs05/curt/Work/SRTM2-South_America-3 /stage/fgfs05/curt/Work/DEM-USGS-3 /stage/fgfs05/curt/Work/SRTM-30 2>&1 | less +./tg-construct --work-dir=/stage/fgfs05/curt/Work --output-dir=/stage/fgfs05/curt/Scenery-1.0 --tile-id=942691 /stage/fgfs05/curt/Work/AirportArea /stage/fgfs05/curt/Work/AirportObj /stage/fgfs05/curt/Work/Shape-Canals /stage/fgfs05/curt/Work/Shape-Cities /stage/fgfs05/curt/Work/Shape-FloodLand /stage/fgfs05/curt/Work/Shape-Lakes /stage/fgfs05/curt/Work/Shape-LandCover /stage/fgfs05/curt/Work/Shape-LandMass /stage/fgfs05/curt/Work/Shape-Railroads /stage/fgfs05/curt/Work/Shape-Rivers /stage/fgfs05/curt/Work/Shape-Roads /stage/fgfs05/curt/Work/Shape-Towns /stage/fgfs05/curt/Work/TowerObj /stage/fgfs05/curt/Work/SRTM2-United_States-1 /stage/fgfs05/curt/Work/SRTM2-Africa-3 /stage/fgfs05/curt/Work/SRTM2-Australia-3 /stage/fgfs05/curt/Work/SRTM2-Eurasia-3 /stage/fgfs05/curt/Work/SRTM2-Islands-3 /stage/fgfs05/curt/Work/SRTM2-North_America-3 /stage/fgfs05/curt/Work/SRTM2-South_America-3 /stage/fgfs05/curt/Work/DEM-USGS-3 /stage/fgfs05/curt/Work/SRTM-30 2>&1 | less -./fgfs-construct --work-dir=/stage/fgfs05/curt/Work --output-dir=/stage/fgfs05/curt/Scenery-1.0 --tile-id=942691 /stage/fgfs05/curt/Work/AirportArea /stage/fgfs05/curt/Work/AirportObj /stage/fgfs05/curt/Work/VPF-Canals /stage/fgfs05/curt/Work/VPF-Cities /stage/fgfs05/curt/Work/VPF-FloodLand /stage/fgfs05/curt/Work/VPF-Lakes /stage/fgfs05/curt/Work/VPF-LandCover /stage/fgfs05/curt/Work/VPF-LandMass /stage/fgfs05/curt/Work/VPF-Railroads /stage/fgfs05/curt/Work/VPF-Rivers /stage/fgfs05/curt/Work/VPF-Roads /stage/fgfs05/curt/Work/VPF-Towns /stage/fgfs05/curt/Work/TowerObj /stage/fgfs05/curt/Work/SRTM-United_States-1 /stage/fgfs05/curt/Work/SRTM-North_America-3 /stage/fgfs05/curt/Work/SRTM-South_America-3 /stage/fgfs05/curt/Work/SRTM-Eurasia-3 /stage/fgfs05/curt/Work/SRTM-Africa-3 /stage/fgfs05/curt/Work/DEM-USGS-3 /stage/fgfs05/curt/Work/SRTM-30 2>&1 | less +./tg-construct --work-dir=/stage/fgfs05/curt/Work --output-dir=/stage/fgfs05/curt/Scenery-1.0 --tile-id=942691 /stage/fgfs05/curt/Work/AirportArea /stage/fgfs05/curt/Work/AirportObj /stage/fgfs05/curt/Work/VPF-Canals /stage/fgfs05/curt/Work/VPF-Cities /stage/fgfs05/curt/Work/VPF-FloodLand /stage/fgfs05/curt/Work/VPF-Lakes /stage/fgfs05/curt/Work/VPF-LandCover /stage/fgfs05/curt/Work/VPF-LandMass /stage/fgfs05/curt/Work/VPF-Railroads /stage/fgfs05/curt/Work/VPF-Rivers /stage/fgfs05/curt/Work/VPF-Roads /stage/fgfs05/curt/Work/VPF-Towns /stage/fgfs05/curt/Work/TowerObj /stage/fgfs05/curt/Work/SRTM-United_States-1 /stage/fgfs05/curt/Work/SRTM-North_America-3 /stage/fgfs05/curt/Work/SRTM-South_America-3 /stage/fgfs05/curt/Work/SRTM-Eurasia-3 /stage/fgfs05/curt/Work/SRTM-Africa-3 /stage/fgfs05/curt/Work/DEM-USGS-3 /stage/fgfs05/curt/Work/SRTM-30 2>&1 | less -./fgfs-construct --work-dir=/stage/fgfs04/curt/Work --output-dir=/stage/fgfs04/curt/FlightGear --tile-id=942050 --cover=/stage/fgfs04/curt/Work/LC-Global/gusgs2_0ll.img.old /stage/fgfs04/curt/Work/AirportArea /stage/fgfs04/curt/Work/AirportObj /stage/fgfs04/curt/Work/GSHHS-Ponds /stage/fgfs04/curt/Work/GSHHS-Islands /stage/fgfs04/curt/Work/GSHHS-Lakes /stage/fgfs04/curt/Work/GSHHS-LandMass /stage/fgfs04/curt/Work/USA-Hydro /stage/fgfs04/curt/Work/USA-Urban /stage/fgfs04/curt/Work/SRTM-1 2>&1 | less +./tg-construct --work-dir=/stage/fgfs04/curt/Work --output-dir=/stage/fgfs04/curt/FlightGear --tile-id=942050 --cover=/stage/fgfs04/curt/Work/LC-Global/gusgs2_0ll.img.old /stage/fgfs04/curt/Work/AirportArea /stage/fgfs04/curt/Work/AirportObj /stage/fgfs04/curt/Work/GSHHS-Ponds /stage/fgfs04/curt/Work/GSHHS-Islands /stage/fgfs04/curt/Work/GSHHS-Lakes /stage/fgfs04/curt/Work/GSHHS-LandMass /stage/fgfs04/curt/Work/USA-Hydro /stage/fgfs04/curt/Work/USA-Urban /stage/fgfs04/curt/Work/SRTM-1 2>&1 | less Sample command line to build tiles intersecting an area specified by a point and a lat/lon distance (in degrees.) -./fgfs-construct --work-dir=/stage/fgfs04/curt/Work --output-dir=/stage/fgfs04/curt/FlightGear --lon=-122.374843 --lat=37.619002 --xdist=0.5 --ydist=0.5 --cover=/stage/fgfs04/curt/Work/LC-Global/gusgs2_0ll.img.old /stage/fgfs04/curt/Work/AirportArea /stage/fgfs04/curt/Work/AirportObj /stage/fgfs04/curt/Work/GSHHS-Ponds /stage/fgfs04/curt/Work/GSHHS-Islands /stage/fgfs04/curt/Work/GSHHS-Lakes /stage/fgfs04/curt/Work/GSHHS-LandMass /stage/fgfs04/curt/Work/USA-Hydro /stage/fgfs04/curt/Work/USA-Urban /stage/fgfs04/curt/Work/SRTM-1 +./tg-construct --work-dir=/stage/fgfs04/curt/Work --output-dir=/stage/fgfs04/curt/FlightGear --lon=-122.374843 --lat=37.619002 --xdist=0.5 --ydist=0.5 --cover=/stage/fgfs04/curt/Work/LC-Global/gusgs2_0ll.img.old /stage/fgfs04/curt/Work/AirportArea /stage/fgfs04/curt/Work/AirportObj /stage/fgfs04/curt/Work/GSHHS-Ponds /stage/fgfs04/curt/Work/GSHHS-Islands /stage/fgfs04/curt/Work/GSHHS-Lakes /stage/fgfs04/curt/Work/GSHHS-LandMass /stage/fgfs04/curt/Work/USA-Hydro /stage/fgfs04/curt/Work/USA-Urban /stage/fgfs04/curt/Work/SRTM-1 Sample command line with standard airports: -./fgfs-construct --output-dir=. --work-dir=/stage/fgfs01/curt/Work --cover=/stage/fgfs01/curt/Work/LC-Global/gusgs2_0ll.img --tile-id=958424 /stage/fgfs01/curt/Work/AirportArea /stage/fgfs01/curt/Work/AirportObj /stage/fgfs01/curt/Work/GSHHS-Ponds /stage/fgfs01/curt/Work/GSHHS-Islands /stage/fgfs01/curt/Work/GSHHS-Lakes /stage/fgfs01/curt/Work/GSHHS-LandMass /stage/fgfs01/curt/Work/USA-Hydro /stage/fgfs01/curt/Work/USA-Urban /stage/fgfs01/curt/Work/DEM-3 /stage/fgfs01/curt/Work/DEM-30 +./tg-construct --output-dir=. --work-dir=/stage/fgfs01/curt/Work --cover=/stage/fgfs01/curt/Work/LC-Global/gusgs2_0ll.img --tile-id=958424 /stage/fgfs01/curt/Work/AirportArea /stage/fgfs01/curt/Work/AirportObj /stage/fgfs01/curt/Work/GSHHS-Ponds /stage/fgfs01/curt/Work/GSHHS-Islands /stage/fgfs01/curt/Work/GSHHS-Lakes /stage/fgfs01/curt/Work/GSHHS-LandMass /stage/fgfs01/curt/Work/USA-Hydro /stage/fgfs01/curt/Work/USA-Urban /stage/fgfs01/curt/Work/DEM-3 /stage/fgfs01/curt/Work/DEM-30 Similar command line but using Photo airports: -./fgfs-construct --output-dir=. --work-dir=/stage/fgfs01/curt/Work --cover=/stage/fgfs01/curt/Work/LC-Global/gusgs2_0ll.img --tile-id=958424 /stage/fgfs01/curt/Work/PhotoArea /stage/fgfs01/curt/Work/PhotoObj /stage/fgfs01/curt/Work/GSHHS-Ponds /stage/fgfs01/curt/Work/GSHHS-Islands /stage/fgfs01/curt/Work/GSHHS-Lakes /stage/fgfs01/curt/Work/GSHHS-LandMass /stage/fgfs01/curt/Work/USA-Hydro /stage/fgfs01/curt/Work/USA-Urban /stage/fgfs01/curt/Work/DEM-3 /stage/fgfs01/curt/Work/DEM-30 +./tg-construct --output-dir=. --work-dir=/stage/fgfs01/curt/Work --cover=/stage/fgfs01/curt/Work/LC-Global/gusgs2_0ll.img --tile-id=958424 /stage/fgfs01/curt/Work/PhotoArea /stage/fgfs01/curt/Work/PhotoObj /stage/fgfs01/curt/Work/GSHHS-Ponds /stage/fgfs01/curt/Work/GSHHS-Islands /stage/fgfs01/curt/Work/GSHHS-Lakes /stage/fgfs01/curt/Work/GSHHS-LandMass /stage/fgfs01/curt/Work/USA-Hydro /stage/fgfs01/curt/Work/USA-Urban /stage/fgfs01/curt/Work/DEM-3 /stage/fgfs01/curt/Work/DEM-30 diff --git a/src/BuildTiles/Parallel/client.cxx b/src/BuildTiles/Parallel/client.cxx index 76c01f70..f691bcce 100644 --- a/src/BuildTiles/Parallel/client.cxx +++ b/src/BuildTiles/Parallel/client.cxx @@ -264,7 +264,7 @@ bool construct_tile( const SGBucket& b, const string& result_file, const string &cover ) { - string command = "fgfs-construct "; + string command = "tg-construct "; command = command + " --work-dir=" + work_base; command = command + " --output-dir=" + output_base; command = command + " --tile-id=" + b.gen_index_str();