diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-10-02 23:06:22 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-10-04 08:05:09 -0700 |
| commit | b96633d3e919d4818070a3681ebabad8236a0692 (patch) | |
| tree | faf6bdc3858754526ed5cf2ff30c5564fff6ae59 | |
| parent | 21d78121ade941adf9eaad399e6b8146298b421f (diff) | |
| download | subsurface-b96633d3e919d4818070a3681ebabad8236a0692.tar.gz | |
fixup taxonomy type
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | core/divesitehelpers.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/divesitehelpers.cpp b/core/divesitehelpers.cpp index 57a58b233..822defdcb 100644 --- a/core/divesitehelpers.cpp +++ b/core/divesitehelpers.cpp @@ -105,7 +105,7 @@ void ReverseGeoLookupThread::run() { for (int j = TC_COUNTRY; j < TC_NR_CATEGORIES; j++) { if (firstData[taxonomy_api_names[j]].isValid()) { ds->taxonomy.category[ri].category = j; - ds->taxonomy.category[ri].origin = taxonomy::GEOCODED; + ds->taxonomy.category[ri].origin = taxonomy_origin::GEOCODED; free((void*)ds->taxonomy.category[ri].value); ds->taxonomy.category[ri].value = copy_string(qPrintable(firstData[taxonomy_api_names[j]].toString())); ri++; @@ -119,7 +119,7 @@ void ReverseGeoLookupThread::run() { // we didn't get an adminName_3 - which in some regions is the actual city that town belongs to, // then we copy the town into the city ds->taxonomy.category[ri].value = copy_string(ds->taxonomy.category[lt].value); - ds->taxonomy.category[ri].origin = taxonomy::COPIED; + ds->taxonomy.category[ri].origin = taxonomy_origin::GEOCOPIED; ds->taxonomy.category[ri].category = TC_ADMIN_L3; ds->taxonomy.nr++; } @@ -167,7 +167,7 @@ void ReverseGeoLookupThread::run() { idx = ds->taxonomy.nr; if (idx < TC_NR_CATEGORIES) { ds->taxonomy.category[idx].category = TC_OCEAN; - ds->taxonomy.category[idx].origin = taxonomy::GEOCODED; + ds->taxonomy.category[idx].origin = taxonomy_origin::GEOCODED; ds->taxonomy.category[idx].value = copy_string(qPrintable(oceanName["name"].toString())); if (idx == ds->taxonomy.nr) ds->taxonomy.nr++; |