diff --git a/classes.cpp b/classes.cpp index d950e843..51b81995 100644 --- a/classes.cpp +++ b/classes.cpp @@ -600,7 +600,7 @@ vector ginf = { #define X3(x) x, x, x /** list of available models (i.e., projections) */ -const modelinfo mdinf[int(mdPolynomial)+1] = { +vector mdinf = { {"disk/Gans", "general perspective", "general perspective", mf::azimuthal | mf::conformal}, {"half-plane", "inversion", "half-plane", mf::conformal}, {"band", "band", "Mercator", mf::band | mf::conformal}, @@ -629,7 +629,7 @@ const modelinfo mdinf[int(mdPolynomial)+1] = { {X3("Mollweide"), mf::euc_boring | mf::pseudoband | mf::equiarea }, {X3("central cylindrical"), mf::euc_boring | mf::band }, {X3("Collignon"), mf::pseudoband | mf::equiarea }, - {X3(""), 0}, + {X3("guard"), 0}, {X3("polynomial"), mf::conformal} }; diff --git a/classes.h b/classes.h index b343d608..f6bd9155 100644 --- a/classes.h +++ b/classes.h @@ -350,6 +350,6 @@ struct modelinfo { const char* name; }; -extern const modelinfo mdinf[int(mdPolynomial)+1]; +extern std::vector mdinf; } diff --git a/models.cpp b/models.cpp index b0ed5029..c90f1028 100644 --- a/models.cpp +++ b/models.cpp @@ -658,7 +658,7 @@ EX namespace models { #if CAP_COMMANDLINE eModel read_model(const string& ss) { - for(int i=0; i