Curt,
this patch enables us to use unique names for the Landcover materials
that represent our current Scenery, it sits on top of the patch to
'materials.xml' that I applied already.
This is one of multiple requirements for future efforts on improving
the Landcover data, so please apply.
-------------------------- snip ---------------------------------
Index: src/BuildTiles/Clipper/clipper.cxx
===================================================================
RCS file: /var/cvs/TerraGear-0.0/TerraGear/src/BuildTiles/Clipper/clipper.cxx,v
retrieving revision 1.32
diff -u -3 -p -r1.32 clipper.cxx
--- src/BuildTiles/Clipper/clipper.cxx 28 Sep 2005 16:39:58 -0000 1.32
+++ src/BuildTiles/Clipper/clipper.cxx 14 Oct 2006 22:48:59 -0000
@@ -450,6 +450,7 @@ is_water_area (AreaType type)
case OceanArea:
case BogArea:
case MarshArea:
+ case LittoralArea:
case WaterBodyCover:
return true;
default:
Index: src/Lib/Polygon/names.cxx
===================================================================
RCS file: /var/cvs/TerraGear-0.0/TerraGear/src/Lib/Polygon/names.cxx,v
retrieving revision 1.13
diff -u -3 -p -r1.13 names.cxx
--- src/Lib/Polygon/names.cxx 19 Nov 2004 22:25:50 -0000 1.13
+++ src/Lib/Polygon/names.cxx 14 Oct 2006 22:49:00 -0000
@@ -60,6 +60,7 @@ inline static void init ()
set_area("Pond", PondArea);
set_area("Swamp or Marsh", MarshArea);
set_area("Marsh", MarshArea);
+ set_area("Littoral", LittoralArea);
set_area("Bog", BogArea);
set_area("Sand", SandArea);
set_area("Lava", LavaArea);
@@ -80,6 +81,7 @@ inline static void init ()
set_area("Canal", CanalArea);
set_area("Glacier", GlacierArea);
set_area("PackIce", PackIceArea);
+ set_area("PolarIce", PolarIceArea);
set_area("Urban", UrbanArea);
set_area("Town", TownArea);
set_area("BuiltUpCover", BuiltUpCover);
Index: src/Lib/Polygon/names.hxx
===================================================================
RCS file: /var/cvs/TerraGear-0.0/TerraGear/src/Lib/Polygon/names.hxx,v
retrieving revision 1.14
diff -u -3 -p -r1.14 names.hxx
--- src/Lib/Polygon/names.hxx 28 Sep 2005 16:43:18 -0000 1.14
+++ src/Lib/Polygon/names.hxx 14 Oct 2006 22:49:00 -0000
@@ -51,8 +51,9 @@ enum AreaType {
StreamArea,
IntStreamArea,
CanalArea,
- GlacierArea, // Any solid ice/snow
+ GlacierArea, // Solid ice/snow
PackIceArea, // Water with ice packs
+ PolarIceArea,
OceanArea,
UrbanArea, // Densely-populated city or large town
TownArea, // Small town or village
@@ -60,6 +61,7 @@ enum AreaType {
BogArea, // Bog
MarshArea, // Marshland or swamp
SandArea, // Sand-covered area
+ LittoralArea, // Tidal, Sand-covered area
LavaArea, // Lava-covered area
// USGS Land Covers
Index: src/Prep/ShapeFile/process.sh
===================================================================
RCS file: /var/cvs/TerraGear-0.0/TerraGear/src/Prep/ShapeFile/process.sh,v
retrieving revision 1.2
diff -u -3 -p -r1.2 process.sh
--- src/Prep/ShapeFile/process.sh 24 Jan 2006 19:40:26 -0000 1.2
+++ src/Prep/ShapeFile/process.sh 14 Oct 2006 22:49:04 -0000
@@ -13,7 +13,7 @@ ${SHAPEDECODE} ${SHAPEBASE}/landmass_def
# Inland moving water: rivers/streams, intermittent streams, and canals
${SHAPEDECODE} --line-width 40 ${SHAPEBASE}/rivers_stream
${WORKBASE}/Shape-Rivers Stream
${SHAPEDECODE} --line-width 30 ${SHAPEBASE}/rivers_intermittentstream
${WORKBASE}/Shape-Rivers IntermittentStream
-${SHAPEDECODE} --line-width 50 ${SHAPEBASE}/canals_stream
${WORKBASE}/Shape-Canals Stream
+${SHAPEDECODE} --line-width 50 ${SHAPEBASE}/canals_stream
${WORKBASE}/Shape-Canals Canal
# Inland still water: lakes, intermittent lakes, and flood land
${SHAPEDECODE} ${SHAPEBASE}/lakes_lake ${WORKBASE}/Shape-Lakes Lake
@@ -31,7 +31,7 @@ ${SHAPEDECODE} ${SHAPEBASE}/landcover_mi
# Ground cover: sand, tidal, lava, barren, grass, shrub, herb-tundra
${SHAPEDECODE} ${SHAPEBASE}/landcover_sand ${WORKBASE}/Shape-LandCover Sand
-${SHAPEDECODE} ${SHAPEBASE}/landcover_marsh ${WORKBASE}/Shape-LandCover Marsh
+${SHAPEDECODE} ${SHAPEBASE}/landcover_marsh ${WORKBASE}/Shape-LandCover
Littoral
${SHAPEDECODE} ${SHAPEBASE}/landcover_lava ${WORKBASE}/Shape-LandCover Lava
${SHAPEDECODE} ${SHAPEBASE}/landcover_barrencover ${WORKBASE}/Shape-LandCover
BarrenCover
${SHAPEDECODE} ${SHAPEBASE}/landcover_grasscover ${WORKBASE}/Shape-LandCover
GrassCover
@@ -41,8 +41,7 @@ ${SHAPEDECODE} ${SHAPEBASE}/landcover_he
# Ice cover: glaciers, pack ice, and sea ice
${SHAPEDECODE} ${SHAPEBASE}/landcover_glacier ${WORKBASE}/Shape-LandCover
Glacier
${SHAPEDECODE} ${SHAPEBASE}/landcover_packice ${WORKBASE}/Shape-LandCover
PackIce
-# FiXME: Two glacier themes; have same name in database
-# ${SHAPEDECODE} ${SHAPEBASE}/landcover_glacier ${WORKBASE}/Shape-LandCover
Glacier
+${SHAPEDECODE} ${SHAPEBASE}/landcover_glacier ${WORKBASE}/Shape-LandCover
PolarIce
# Marshes: marsh and bog
${SHAPEDECODE} ${SHAPEBASE}/landcover_marsh ${WORKBASE}/Shape-LandCover Marsh
Index: src/Prep/TGVPF/process.sh
===================================================================
RCS file: /var/cvs/TerraGear-0.0/TerraGear/src/Prep/TGVPF/process.sh,v
retrieving revision 1.1
diff -u -3 -p -r1.1 process.sh
--- src/Prep/TGVPF/process.sh 17 May 2004 20:12:19 -0000 1.1
+++ src/Prep/TGVPF/process.sh 14 Oct 2006 22:49:04 -0000
@@ -39,7 +39,7 @@ for REGION in $REGIONS; do
# Inland moving water: rivers/streams, intermittent streams, and canals
${TGVPF} --work-dir=${WORKBASE}/VPF-Rivers --material=Stream --width=40
--att=hyc:8 --max-segment=400 $V0PATH $REGION hydro watrcrsl
${TGVPF} --work-dir=${WORKBASE}/VPF-Rivers --material=IntermittentStream
--width=30 --att=hyc:6 --max-segment=400 $V0PATH $REGION hydro watrcrsl
- ${TGVPF} --work-dir=${WORKBASE}/VPF-Canals --material=Stream --width=50
--att=exs:1 --att=loc:8 --max-segment=400 $V0PATH $REGION hydro aquecanl
+ ${TGVPF} --work-dir=${WORKBASE}/VPF-Canals --material=Canal --width=50
--att=exs:1 --att=loc:8 --max-segment=400 $V0PATH $REGION hydro aquecanl
# Inland still water: lakes, intermittent lakes, and flood land
${TGVPF} --work-dir=${WORKBASE}/VPF-Lakes --material=Lake
--att=f_code:BH000 --att=hyc:8 --max-segment=400 $V0PATH $REGION hydro inwatera
@@ -57,7 +57,7 @@ for REGION in $REGIONS; do
# Ground cover: sand, tidal, lava, barren, grass, shrub, herb-tundra
${TGVPF} --work-dir=${WORKBASE}/VPF-LandCover --material=Sand --att=smc:88
--att=swc:0 --max-segment=400 $V0PATH $REGION phys grounda
- ${TGVPF} --work-dir=${WORKBASE}/VPF-LandCover --material=Marsh
--att=smc:88 --att=swc:3 --max-segment=400 $V0PATH $REGION phys grounda
+ ${TGVPF} --work-dir=${WORKBASE}/VPF-LandCover --material=Littoral
--att=smc:88 --att=swc:3 --max-segment=400 $V0PATH $REGION phys grounda
${TGVPF} --work-dir=${WORKBASE}/VPF-LandCover --material=Lava --att=smc:52
--max-segment=400 $V0PATH $REGION phys grounda
${TGVPF} --work-dir=${WORKBASE}/VPF-LandCover --material=BarrenCover
--att=smc:119 --max-segment=400 $V0PATH $REGION phys grounda
${TGVPF} --work-dir=${WORKBASE}/VPF-LandCover --material=GrassCover
--att=f_code:EB010 --max-segment=400 $V0PATH $REGION veg grassa
@@ -67,7 +67,7 @@ for REGION in $REGIONS; do
# Ice cover: glaciers, pack ice, and sea ice
${TGVPF} --work-dir=${WORKBASE}/VPF-LandCover --material=Glacier
--max-segment=400 $V0PATH $REGION phys landicea
${TGVPF} --work-dir=${WORKBASE}/VPF-LandCover --material=PackIce
--att=f_code:BJ070 --max-segment=400 $V0PATH $REGION phys seaicea
- ${TGVPF} --work-dir=${WORKBASE}/VPF-LandCover --material=Glacier
--att=f_code:BJ080 --max-segment=400 $V0PATH $REGION phys seaicea
+ ${TGVPF} --work-dir=${WORKBASE}/VPF-LandCover --material=PolarIce
--att=f_code:BJ080 --max-segment=400 $V0PATH $REGION phys seaicea
# Marshes: marsh and bog
${TGVPF} --work-dir=${WORKBASE}/VPF-LandCover --material=Marsh
--att=f_code:BH095 --max-segment=400 $V0PATH $REGION veg swampa
-------------------------- snip ---------------------------------
Martin.
--
Unix _IS_ user friendly - it's just selective about who its friends are !
--------------------------------------------------------------------------
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
