[lmi-commits] [lmi] master da82ec3 3/3: Rename 'StatePostalAbbrev' to 'StateOfJurisdiction'

[Greg Chicares]

branch: master
commit da82ec3dc5f50ac752b1bf8e64c8184f8865e953
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Rename 'StatePostalAbbrev' to 'StateOfJurisdiction'
---
 finra_notes2.mst              |  3 +--
 group_quote_pdf_gen_wx.cpp    |  2 +-
 ill_reg_narr_summary2.mst     |  2 +-
 ledger_invariant.cpp          |  4 ++--
 ledger_invariant.hpp          |  2 +-
 ledger_invariant_init.cpp     |  2 +-
 ledger_text_formats.cpp       |  4 ++--
 pdf_command_wx.cpp            | 22 +++++++++++-----------
 reg_d_group_narr_summary2.mst |  2 +-
 reg_d_indiv_header.mst        |  2 +-
 10 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/finra_notes2.mst b/finra_notes2.mst
index 4716224..1aae2c3 100644
--- a/finra_notes2.mst
+++ b/finra_notes2.mst
@@ -151,8 +151,7 @@ age {{EndtAge}}.
 {{/SmokerBlended}}
 
 <p>
-The state of issue is
-{{StatePostalAbbrev}}.
+The state of issue is {{StateOfJurisdiction}}.
 </p>
 
 {{#IsInforce}}
diff --git a/group_quote_pdf_gen_wx.cpp b/group_quote_pdf_gen_wx.cpp
index 138033a..7f977b5 100644
--- a/group_quote_pdf_gen_wx.cpp
+++ b/group_quote_pdf_gen_wx.cpp
@@ -412,7 +412,7 @@ void 
group_quote_pdf_generator_wx::global_report_data::fill_global_report_data
     product_          = invar.PolicyMktgName;
     short_product_    = invar.GroupQuoteShortProductName;
     premium_mode_     = invar.InitErMode;
-    contract_state_   = invar.StatePostalAbbrev;
+    contract_state_   = invar.StateOfJurisdiction;
     jdn_t eff_date    = jdn_t(static_cast<int>(invar.EffDateJdn));
     effective_date_   = ConvertDateToWx(eff_date).FormatDate().ToStdString();
     // Deliberately begin the footer with <br> tags, to separate it
diff --git a/ill_reg_narr_summary2.mst b/ill_reg_narr_summary2.mst
index 546a808..770232b 100644
--- a/ill_reg_narr_summary2.mst
+++ b/ill_reg_narr_summary2.mst
@@ -75,7 +75,7 @@ The loan interest rate is fixed at {{MaxAnnCurrLoanDueRate}} 
per year.
 </p>
 
 <p>
-The state of issue is {{StatePostalAbbrev}}.
+The state of issue is {{StateOfJurisdiction}}.
 </p>
 
 <p>
diff --git a/ledger_invariant.cpp b/ledger_invariant.cpp
index de38403..088d985 100644
--- a/ledger_invariant.cpp
+++ b/ledger_invariant.cpp
@@ -321,7 +321,7 @@ void LedgerInvariant::Alloc(int len)
     Strings["DefnMaterialChange"            ] = &DefnMaterialChange            
;
     Strings["AvoidMec"                      ] = &AvoidMec                      
;
     Strings["PartMortTableName"             ] = &PartMortTableName             
;
-    Strings["StatePostalAbbrev"             ] = &StatePostalAbbrev             
;
+    Strings["StateOfJurisdiction"           ] = &StateOfJurisdiction           
;
     Strings["PremiumTaxState"               ] = &PremiumTaxState               
;
     Strings["CountryIso3166Abbrev"          ] = &CountryIso3166Abbrev          
;
     Strings["Comments"                      ] = &Comments                      
;
@@ -655,7 +655,7 @@ LedgerInvariant& LedgerInvariant::PlusEq(LedgerInvariant 
const& a_Addend)
 
     Comments                      = a_Addend.Comments;
 
-    StatePostalAbbrev             = a_Addend.StatePostalAbbrev;
+    StateOfJurisdiction           = a_Addend.StateOfJurisdiction;
     PremiumTaxState               = a_Addend.PremiumTaxState;
     GroupIndivSelection           = GroupIndivSelection   || 
a_Addend.GroupIndivSelection;
     UseExperienceRating           = a_Addend.UseExperienceRating;
diff --git a/ledger_invariant.hpp b/ledger_invariant.hpp
index abe6eab..406e3d3 100644
--- a/ledger_invariant.hpp
+++ b/ledger_invariant.hpp
@@ -360,7 +360,7 @@ class LMI_SO LedgerInvariant
     std::string     AvoidMec;
     std::string     PartMortTableName;
 
-    std::string     StatePostalAbbrev; // SOMEDAY !! Rename to 
'StateOfJurisdiction'.
+    std::string     StateOfJurisdiction;
     std::string     PremiumTaxState;
     std::string     CountryIso3166Abbrev;
     std::string     Comments;
diff --git a/ledger_invariant_init.cpp b/ledger_invariant_init.cpp
index 7aecb62..67feeb6 100644
--- a/ledger_invariant_init.cpp
+++ b/ledger_invariant_init.cpp
@@ -499,7 +499,7 @@ void LedgerInvariant::Init(BasicValues const* b)
     DefnMaterialChange      = 
mc_str(b->yare_input_.DefinitionOfMaterialChange);
     AvoidMec                = mc_str(b->yare_input_.AvoidMecMethod);
     PartMortTableName       = "1983 GAM"; // TODO ?? Hardcoded.
-    StatePostalAbbrev       = mc_str(b->GetStateOfJurisdiction());
+    StateOfJurisdiction     = mc_str(b->GetStateOfJurisdiction());
     PremiumTaxState         = mc_str(b->GetPremiumTaxState());
 
     IsInforce = b->yare_input_.EffectiveDate != b->yare_input_.InforceAsOfDate;
diff --git a/ledger_text_formats.cpp b/ledger_text_formats.cpp
index 25bfcfe..501ac32 100644
--- a/ledger_text_formats.cpp
+++ b/ledger_text_formats.cpp
@@ -209,7 +209,7 @@ std::string calculation_summary_formatter::top_note
             << invar_.Gender << ", " << invar_.Smoker
             << std::setprecision(0)
             << ", age " << invar_.Age
-            << ", " << invar_.StatePostalAbbrev << " jurisdiction"
+            << ", " << invar_.StateOfJurisdiction << " jurisdiction"
             << line_break
             ;
         if(invar_.IsMec)
@@ -779,7 +779,7 @@ void PrintRosterTabDelimited
         << "'" << Invar.LastCoiReentryDate            << "'\t"
         << "'" << Invar.InforceAsOfDate               << "'\t"
         << Invar.value_str("PremiumTaxState"        ) << '\t'
-        << Invar.value_str("StatePostalAbbrev"      ) << '\t'
+        << Invar.value_str("StateOfJurisdiction"    ) << '\t'
         << Curr_.value_str("AnnGAIntRate"         ,d) << '\t'
         << Curr_.value_str("InitMlyPolFee"          ) << '\t'
         << Invar.value_str("InitDacTaxRate"         ) << '\t'
diff --git a/pdf_command_wx.cpp b/pdf_command_wx.cpp
index dbf600d..45b21c8 100644
--- a/pdf_command_wx.cpp
+++ b/pdf_command_wx.cpp
@@ -983,15 +983,15 @@ class pdf_illustration : protected html_interpolator, 
protected pdf_writer_wx
               || policy_name == "Group Flexible Premium Variable Adjustable 
Life Insurance Certificate"
             );
 
-        auto const& state_abbrev = invar.StatePostalAbbrev;
+        auto const& state_of_jurisdiction = invar.StateOfJurisdiction;
         add_variable
             ("StateIsNorthOrSouthCarolina"
-            ,state_abbrev == "NC" || state_abbrev == "SC"
+            ,state_of_jurisdiction == "NC" || state_of_jurisdiction == "SC"
             );
 
         add_variable
             ("StateIsMaryland"
-            ,state_abbrev == "MD"
+            ,state_of_jurisdiction == "MD"
             );
     }
 
@@ -2177,7 +2177,7 @@ class pdf_illustration_naic : public pdf_illustration
     {
         auto const& invar = ledger.GetLedgerInvariant();
         auto const& policy_name = invar.PolicyLegalName;
-        auto const& state_abbrev = invar.StatePostalAbbrev;
+        auto const& state_of_jurisdiction = invar.StateOfJurisdiction;
 
         // Define variables specific to this illustration which doesn't use the
         // standard 60/30 lengths for whatever reason.
@@ -2186,7 +2186,7 @@ class pdf_illustration_naic : public pdf_illustration
 
         add_variable
             ("ModifiedSinglePremium"
-            ,starts_with(policy_name, "Single") && state_abbrev == "MA"
+            ,starts_with(policy_name, "Single") && state_of_jurisdiction == 
"MA"
             );
 
         add_variable
@@ -2235,17 +2235,17 @@ class pdf_illustration_naic : public pdf_illustration
 
         add_variable
             ("StateIsIllinois"
-            ,state_abbrev == "IL"
+            ,state_of_jurisdiction == "IL"
             );
 
         add_variable
             ("StateIsTexas"
-            ,state_abbrev == "TX"
+            ,state_of_jurisdiction == "TX"
             );
 
         add_variable
             ("StateIsIllinoisOrTexas"
-            ,state_abbrev == "IL" || state_abbrev == "TX"
+            ,state_of_jurisdiction == "IL" || state_of_jurisdiction == "TX"
             );
 
         int const inforce_year = bourn_cast<int>(invar.InforceYear);
@@ -2828,13 +2828,13 @@ class pdf_illustration_finra : public pdf_illustration
             }
 
         auto const& policy_name = invar.PolicyLegalName;
-        auto const& state_abbrev = invar.StatePostalAbbrev;
+        auto const& state_of_jurisdiction = invar.StateOfJurisdiction;
 
         add_variable
             ("UWTypeIsGuaranteedIssueInTexasWithFootnote"
             ,    invar.UWType == "Guaranteed issue"
               && policy_name == "Flexible Premium Variable Adjustable Life 
Insurance Policy"
-              && state_abbrev == "TX"
+              && state_of_jurisdiction == "TX"
             );
 
         add_variable
@@ -2844,7 +2844,7 @@ class pdf_illustration_finra : public pdf_illustration
 
         add_variable
             ("StateIsNewYork"
-            ,state_abbrev == "NY"
+            ,state_of_jurisdiction == "NY"
             );
 
         // Add all the pages.
diff --git a/reg_d_group_narr_summary2.mst b/reg_d_group_narr_summary2.mst
index 5264f1a..1cbeba3 100644
--- a/reg_d_group_narr_summary2.mst
+++ b/reg_d_group_narr_summary2.mst
@@ -110,7 +110,7 @@ or sending money.
 {{/GenderBlended}}
 
 <p>
-The state of issue is {{StatePostalAbbrev}}.
+The state of issue is {{StateOfJurisdiction}}.
 </p>
 
 {{#HasComplianceTrackingNumber}}
diff --git a/reg_d_indiv_header.mst b/reg_d_indiv_header.mst
index 4cf9b1e..06dd31c 100644
--- a/reg_d_indiv_header.mst
+++ b/reg_d_indiv_header.mst
@@ -55,7 +55,7 @@ and may not be used to project or predict investment results.
             {{^Composite}}
                 Prepared for: {{Insured1Abbrev30}}<br>
                 Age: {{Age}}<br>
-                Issue State: {{StatePostalAbbrev}}<br>
+                Issue State: {{StateOfJurisdiction}}<br>
             {{/Composite}}
             Selected Face Amount: ${{InitTotalSA}}<br>
             Initial Death Benefit Option: {{InitDBOpt}}<br>