diff --git a/src/BuildTiles/Clipper/clipper.cxx b/src/BuildTiles/Clipper/clipper.cxx index 8c2d9291..d2399058 100644 --- a/src/BuildTiles/Clipper/clipper.cxx +++ b/src/BuildTiles/Clipper/clipper.cxx @@ -450,6 +450,7 @@ is_water_area (AreaType type) case OceanArea: case BogArea: case MarshArea: + case LittoralArea: case WaterBodyCover: return true; default: @@ -516,9 +517,6 @@ bool TGClipper::clip_all(const point2d& min, const point2d& max) { for ( i = 0; i < TG_MAX_AREA_TYPES; ++i ) { cout << "num polys of type (" << i << ") = " << polys_in.polys[i].size() << endl; - // current = polys_in.polys[i].begin(); - // last = polys_in.polys[i].end(); - // for ( ; current != last; ++current ) { for( j = 0; j < (int)polys_in.polys[i].size(); ++j ) { TGPolygon current = polys_in.polys[i][j]; SG_LOG( SG_CLIPPER, SG_INFO, get_area_name( (AreaType)i ) @@ -577,13 +575,14 @@ bool TGClipper::clip_all(const point2d& min, const point2d& max) { // move_slivers) to the clipped polys list if ( result_diff.contours() > 0 ) { polys_clipped.polys[i].push_back(result_diff); - } - // char filename[256]; - // sprintf(filename, "next-result-%02d", count++); - // FILE *tmpfp= fopen(filename, "w"); - // gpc_write_polygon(tmpfp, 1, result_diff); - // fclose(tmpfp); + // static int count = 0; + // cout << "Writing clipped polygon to next-result" << count + // << endl; + // char filename[256]; + // sprintf(filename, "next-result-%02d-%02d", i, count++); + // result_diff.write(filename); + } } accum = result_union; } diff --git a/src/Lib/Polygon/names.cxx b/src/Lib/Polygon/names.cxx index 9fc30e49..36f3401c 100644 --- a/src/Lib/Polygon/names.cxx +++ b/src/Lib/Polygon/names.cxx @@ -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); diff --git a/src/Lib/Polygon/names.hxx b/src/Lib/Polygon/names.hxx index ec479df2..7c29a1af 100644 --- a/src/Lib/Polygon/names.hxx +++ b/src/Lib/Polygon/names.hxx @@ -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 diff --git a/src/Prep/ShapeFile/process.sh b/src/Prep/ShapeFile/process.sh index 9100a154..6b4706a1 100644 --- a/src/Prep/ShapeFile/process.sh +++ b/src/Prep/ShapeFile/process.sh @@ -13,7 +13,7 @@ ${SHAPEDECODE} ${SHAPEBASE}/landmass_default ${WORKBASE}/Shape-LandMass Default # 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_mixedforestcover ${WORKBASE}/Shape-LandCov # 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_herbtundracover ${WORKBASE}/Shape-LandCove # 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 diff --git a/src/Prep/TGVPF/process.sh b/src/Prep/TGVPF/process.sh index 7a99f45d..8846e94d 100755 --- a/src/Prep/TGVPF/process.sh +++ b/src/Prep/TGVPF/process.sh @@ -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