clean up priorities.
Add Ortho as the top-most priority.
This commit is contained in:
scttgs0
parent
acf7841d3d
commit
4d777cc802
2 changed files with 105 additions and 105 deletions
|
|
@ -1,106 +1,106 @@
|
|||
Default # The name of the default area, which can be overridden by
|
||||
# raster landcover data (e.g. USGS)
|
||||
Ocean # The type of sliver areas: collect slivers as ocean
|
||||
Ortho # Raster landcover data (e.g. USGS)
|
||||
Ocean # The type of sliver areas: collect slivers as ocean
|
||||
|
||||
# Area types in order of descending priority
|
||||
Hole hole # Leave area completely empty
|
||||
Freeway road
|
||||
Road road
|
||||
Road-Motorway road
|
||||
Road-Trunk road
|
||||
Road-Residential road
|
||||
Road-Primary road
|
||||
Road-Secondary road
|
||||
Road-Tertiary road
|
||||
Road-Service road
|
||||
Road-Pedestrian road
|
||||
Road-Steps road
|
||||
Road-Unclassified road
|
||||
|
||||
Railroad road
|
||||
Asphalt road
|
||||
Airport other
|
||||
Pond lake
|
||||
Lake lake
|
||||
DryLake lake
|
||||
Reservoir lake
|
||||
IntermittentLake lake
|
||||
Stream stream
|
||||
River stream
|
||||
IntermittentStream stream
|
||||
Watercourse stream
|
||||
Canal stream
|
||||
Cliffs cliff # A cliff face
|
||||
Glacier other # Solid ice/snow
|
||||
PackIce other # Water with ice packs
|
||||
PolarIce other
|
||||
Ocean ocean
|
||||
Estuary ocean
|
||||
Urban other # Densely-populated city or large town
|
||||
SubUrban other # Densely-populated city or large town
|
||||
Town other # Small town or village
|
||||
Fishing other
|
||||
Construction other
|
||||
Industrial other
|
||||
Port other
|
||||
Dump other # Dump Site
|
||||
FloodLand other # Land subject to flooding
|
||||
Lagoon other # Lagoon
|
||||
Bog other # Bog
|
||||
Marsh other # Marshland or swamp
|
||||
SaltMarsh other
|
||||
Sand other # Sand-covered area
|
||||
Saline other # Saline
|
||||
Littoral other # Tidal, Sand-covered area
|
||||
Dirt other
|
||||
Rock other # Rock
|
||||
Lava other # Lava-covered area
|
||||
OpenMining other # OpenMining
|
||||
Hole hole # Leave area completely empty
|
||||
Freeway road
|
||||
Road road
|
||||
Road-Motorway road
|
||||
Road-Trunk road
|
||||
Road-Residential road
|
||||
Road-Primary road
|
||||
Road-Secondary road
|
||||
Road-Tertiary road
|
||||
Road-Service road
|
||||
Road-Pedestrian road
|
||||
Road-Steps road
|
||||
Road-Unclassified road
|
||||
|
||||
Railroad road
|
||||
Asphalt road
|
||||
Airport other
|
||||
Pond lake
|
||||
Lake lake
|
||||
DryLake lake
|
||||
Reservoir lake
|
||||
IntermittentLake lake
|
||||
Stream stream
|
||||
River stream
|
||||
IntermittentStream stream
|
||||
Watercourse stream
|
||||
Canal stream
|
||||
Cliffs cliff # A cliff face
|
||||
Glacier other # Solid ice/snow
|
||||
PackIce other # Water with ice packs
|
||||
PolarIce other
|
||||
Ocean ocean
|
||||
Estuary ocean
|
||||
Urban other # Densely-populated city or large town
|
||||
SubUrban other # Densely-populated city or large town
|
||||
Town other # Small town or village
|
||||
Fishing other
|
||||
Construction other
|
||||
Industrial other
|
||||
Port other
|
||||
Dump other # Dump Site
|
||||
FloodLand other # Land subject to flooding
|
||||
Lagoon other # Lagoon
|
||||
Bog other # Bog
|
||||
Marsh other # Marshland or swamp
|
||||
SaltMarsh other
|
||||
Sand other # Sand-covered area
|
||||
Saline other # Saline
|
||||
Littoral other # Tidal, Sand-covered area
|
||||
Dirt other
|
||||
Rock other # Rock
|
||||
Lava other # Lava-covered area
|
||||
OpenMining other # OpenMining
|
||||
|
||||
# USGS Land Covers
|
||||
# These are low-priority, since known polygons should always win.
|
||||
|
||||
BuiltUpCover other # Urban and Built-Up Land
|
||||
Transport other # Transport
|
||||
Cemetery other # Cemetery
|
||||
DryCrop other # Dryland Cropland and Pasture
|
||||
IrrCrop other # Irrigated Cropland and Pasture
|
||||
Rice other
|
||||
MixedCrop other # Mixed Dryland/Irrigated Cropland and Pasture
|
||||
Vineyard other
|
||||
Bamboo other
|
||||
Mangrove other
|
||||
ComplexCrop other # Complex Cropland
|
||||
NaturalCrop other
|
||||
CropGrass other # Cropland/Grassland Mosaic
|
||||
CropWood other # Cropland/Woodland Mosaic
|
||||
AgroForest other
|
||||
Olives other
|
||||
GolfCourse other # GolfCourse
|
||||
Greenspace other
|
||||
GrassCover other # Grassland
|
||||
Grassland other
|
||||
ScrubCover other # Scrub
|
||||
Scrub other
|
||||
ShrubGrassCover other # Mixed Shrubland/Grassland
|
||||
SavannaCover other # Savanna
|
||||
Orchard other # Orchard
|
||||
DeciduousForest other # Deciduous Forest
|
||||
DeciduousBroadCover other # Deciduous Forest
|
||||
EvergreenForest other # Evergreen Forest
|
||||
EvergreenBroadCover other # Evergreen Forest
|
||||
MixedForest other # Mixed Forest
|
||||
RainForest other # Rain Forest
|
||||
BarrenCover other # Barren or Sparsely Vegetated
|
||||
HerbTundra other # Herbaceous Tundra
|
||||
Sclerophyllous other
|
||||
Heath other
|
||||
Burnt other
|
||||
SnowCover other # Snow or Ice
|
||||
BuiltUpCover other # Urban and Built-Up Land
|
||||
Transport other # Transport
|
||||
Cemetery other # Cemetery
|
||||
DryCrop other # Dryland Cropland and Pasture
|
||||
IrrCrop other # Irrigated Cropland and Pasture
|
||||
Rice other
|
||||
MixedCrop other # Mixed Dryland/Irrigated Cropland and Pasture
|
||||
Vineyard other
|
||||
Bamboo other
|
||||
Mangrove other
|
||||
ComplexCrop other # Complex Cropland
|
||||
NaturalCrop other
|
||||
CropGrass other # Cropland/Grassland Mosaic
|
||||
CropWood other # Cropland/Woodland Mosaic
|
||||
AgroForest other
|
||||
Olives other
|
||||
GolfCourse other # GolfCourse
|
||||
Greenspace other
|
||||
GrassCover other # Grassland
|
||||
Grassland other
|
||||
ScrubCover other # Scrub
|
||||
Scrub other
|
||||
ShrubGrassCover other # Mixed Shrubland/Grassland
|
||||
SavannaCover other # Savanna
|
||||
Orchard other # Orchard
|
||||
DeciduousForest other # Deciduous Forest
|
||||
DeciduousBroadCover other # Deciduous Forest
|
||||
EvergreenForest other # Evergreen Forest
|
||||
EvergreenBroadCover other # Evergreen Forest
|
||||
MixedForest other # Mixed Forest
|
||||
RainForest other # Rain Forest
|
||||
BarrenCover other # Barren or Sparsely Vegetated
|
||||
HerbTundra other # Herbaceous Tundra
|
||||
Sclerophyllous other
|
||||
Heath other
|
||||
Burnt other
|
||||
SnowCover other # Snow or Ice
|
||||
|
||||
Island island # any island area not covered otherwise
|
||||
Default landmass # any land area not covered otherwise
|
||||
Island island # any island area not covered otherwise
|
||||
Default landmass # any land area not covered otherwise
|
||||
|
||||
Void other
|
||||
Null other
|
||||
Unknown other
|
||||
Void other
|
||||
Null other
|
||||
Unknown other
|
||||
|
|
|
|||
|
|
@ -23,20 +23,20 @@
|
|||
#include <simgear/io/iostreams/sgstream.hxx>
|
||||
|
||||
#include <fstream>
|
||||
#include <vector>
|
||||
#include <map>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "priorities.hxx"
|
||||
|
||||
int TGAreaDefinitions::init( const std::string& filename )
|
||||
int TGAreaDefinitions::init(const std::string& filename)
|
||||
{
|
||||
std::ifstream in ( filename.c_str() );
|
||||
std::ifstream in(filename.c_str());
|
||||
unsigned int cur_priority = 0;
|
||||
|
||||
if ( ! in ) {
|
||||
if (!in) {
|
||||
SG_LOG(SG_GENERAL, SG_ALERT, "Unable to open priorities file " << filename);
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -52,17 +52,17 @@ int TGAreaDefinitions::init( const std::string& filename )
|
|||
|
||||
std::string name, category;
|
||||
|
||||
while ( !in.eof() ) {
|
||||
while (!in.eof()) {
|
||||
in >> name;
|
||||
in >> category;
|
||||
in >> skipcomment;
|
||||
|
||||
if ( name == sa_name ) {
|
||||
sliver_area_name = sa_name;
|
||||
if (name == sa_name) {
|
||||
sliver_area_name = sa_name;
|
||||
sliver_area_priority = cur_priority;
|
||||
}
|
||||
|
||||
area_defs.push_back( TGAreaDefinition( name, category, cur_priority++ ) );
|
||||
area_defs.push_back(TGAreaDefinition(name, category, cur_priority++));
|
||||
}
|
||||
in.close();
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue