From 19681693f74aa56adcb106ae6b4e4729fb1425d9 Mon Sep 17 00:00:00 2001
From: Leonard Lyubich <leonard@nspcc.ru>
Date: Wed, 10 Feb 2021 13:28:14 +0300
Subject: [PATCH] [#316] ir/netmap: Rename City node attributes

Rename `City`/`CityCode` attribute keys to `Location`/`LocationCode`
respectively.

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
---
 .../processors/netmap/nodevalidation/locode/calls.go          | 4 ++--
 .../processors/netmap/nodevalidation/locode/validator.go      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/innerring/processors/netmap/nodevalidation/locode/calls.go b/pkg/innerring/processors/netmap/nodevalidation/locode/calls.go
index 7b725ef51..b060435c5 100644
--- a/pkg/innerring/processors/netmap/nodevalidation/locode/calls.go
+++ b/pkg/innerring/processors/netmap/nodevalidation/locode/calls.go
@@ -20,8 +20,8 @@ var errMissingRequiredAttr = errors.New("missing required attribute in DB record
 // If DB entry R was found w/o errors, then new attributes are:
 //  * CountryCode: R.CountryCode().String();
 //  * Country: R.CountryName();
-//  * CityCode: R.LocationCode().String();
-//  * City: Record.LocationName();
+//  * LocationCode: R.LocationCode().String();
+//  * Location: Record.LocationName();
 //  * SubDivCode: R.SubDivCode();
 //  * SubDiv: R.SubDivName();
 //  * Continent: R.Continent().String().
diff --git a/pkg/innerring/processors/netmap/nodevalidation/locode/validator.go b/pkg/innerring/processors/netmap/nodevalidation/locode/validator.go
index fcd80ff53..78e352f0d 100644
--- a/pkg/innerring/processors/netmap/nodevalidation/locode/validator.go
+++ b/pkg/innerring/processors/netmap/nodevalidation/locode/validator.go
@@ -33,8 +33,8 @@ const (
 	attrKeyCountryCode = "CountryCode"
 	attrKeyCountry     = "Country"
 
-	attrKeyLocationCode = "CityCode"
-	attrKeyLocation     = "City"
+	attrKeyLocationCode = "LocationCode"
+	attrKeyLocation     = "Location"
 
 	attrKeySubDivCode = "SubDivCode"
 	attrKeySubDiv     = "SubDiv"