[#316] locode/boltdb: Replace all references to the City with Location

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>

cmd/neofs-cli/modules/util.go

@@ -164,7 +164,7 @@ var (
 			}
 
 			fmt.Printf("Country: %s\n", record.CountryName())
-			fmt.Printf("City: %s\n", record.CityName())
+			fmt.Printf("Location: %s\n", record.LocationName())
 			fmt.Printf("Continent: %s\n", record.Continent())
 			if subDivCode := record.SubDivCode(); subDivCode != "" {
 				fmt.Printf("Subdivision: [%s] %s\n", subDivCode, record.SubDivName())

pkg/innerring/locode.go

@@ -30,7 +30,7 @@ type locodeBoltEntryWrapper struct {
 }
 
 func (l *locodeBoltEntryWrapper) LocationName() string {
-	return l.Record.CityName()
+	return l.Record.LocationName()
 }
 
 type locodeBoltDBWrapper locodebolt.DB

pkg/util/locode/db/boltdb/calls.go

@@ -49,7 +49,7 @@ func locationBucketKey(lc *locodedb.LocationCode) ([]byte, error) {
 
 type recordJSON struct {
 	CountryName  string
-	CityName    string
+	LocationName string
 	SubDivName   string
 	SubDivCode   string
 	Latitude     float64
@@ -62,7 +62,7 @@ func recordValue(r locodedb.Record) ([]byte, error) {
 
 	rj := &recordJSON{
 		CountryName:  r.CountryName(),
-		CityName:    r.CityName(),
+		LocationName: r.LocationName(),
 		SubDivName:   r.SubDivName(),
 		SubDivCode:   r.SubDivCode(),
 		Latitude:     p.Latitude(),
@@ -82,7 +82,7 @@ func recordFromValue(data []byte) (*locodedb.Record, error) {
 
 	r := new(locodedb.Record)
 	r.SetCountryName(rj.CountryName)
-	r.SetCityName(rj.CityName)
+	r.SetLocationName(rj.LocationName)
 	r.SetSubDivName(rj.SubDivName)
 	r.SetSubDivCode(rj.SubDivCode)
 	r.SetGeoPoint(locodedb.NewPoint(rj.Latitude, rj.Longitude))

pkg/util/locode/db/record.go

@@ -45,7 +45,7 @@ func (k *Key) LocationCode() *LocationCode {
 type Record struct {
 	countryName string
 
-	cityName string
+	locationName string
 
 	subDivName string
 
@@ -71,7 +71,7 @@ func NewRecord(r locode.Record) (*Record, error) {
 	}
 
 	return &Record{
-		cityName:   r.NameWoDiacritics,
+		locationName: r.NameWoDiacritics,
 		subDivCode:   r.SubDiv,
 		p:            point,
 	}, nil
@@ -87,14 +87,14 @@ func (r *Record) SetCountryName(name string) {
 	r.countryName = name
 }
 
-// CityName returns city name.
-func (r *Record) CityName() string {
-	return r.cityName
+// LocationName returns location name.
+func (r *Record) LocationName() string {
+	return r.locationName
 }
 
-// SetCityName sets city name.
-func (r *Record) SetCityName(name string) {
-	r.cityName = name
+// SetLocationName sets location name.
+func (r *Record) SetLocationName(name string) {
+	r.locationName = name
 }
 
 // SubDivCode returns subdivision code.