From bba41d685ebb9e236a3035043bd698266256b833 Mon Sep 17 00:00:00 2001 From: MrShtein Date: Sat, 11 May 2024 17:48:05 +0300 Subject: [PATCH] refactor: Changed object naming --- api/geolocate/geolocate.go | 6 +++--- api/geolocate/model.go | 10 +++++----- api/model/model.go | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/api/geolocate/geolocate.go b/api/geolocate/geolocate.go index 26bef24..ac15e91 100644 --- a/api/geolocate/geolocate.go +++ b/api/geolocate/geolocate.go @@ -17,10 +17,10 @@ type ( } ) -// AddressByGeolocate try to return suggest addresses by params +// AddressByCoordinates try to return suggest addresses by params // see documentation on:https://dadata.ru/api/geolocate/ -func (a *Api) AddressByGeolocate(ctx context.Context, params *RequestParams) (ret []*AddressGeolocateSuggestion, err error) { - var result = &AddressGeolocateResponse{} +func (a *Api) AddressByCoordinates(ctx context.Context, params *RequestParams) (ret []*AddressSuggestion, err error) { + var result = &AddressResponse{} err = a.Client.Post(ctx, "geolocate/address", params, result) if err != nil { return diff --git a/api/geolocate/model.go b/api/geolocate/model.go index 09092f1..4d06404 100644 --- a/api/geolocate/model.go +++ b/api/geolocate/model.go @@ -13,15 +13,15 @@ type ( Language string `json:"language,omitempty"` // in which language to return the result (ru / en) } - // AddressGeolocateSuggestion api response for address - AddressGeolocateSuggestion struct { + // AddressSuggestion api response for address + AddressSuggestion struct { Value string `json:"value"` UnrestrictedValue string `json:"unrestricted_value"` Data *model.Address `json:"data"` } - // AddressGeolocateResponse result slice for address suggestions - AddressGeolocateResponse struct { - Suggestions []*AddressGeolocateSuggestion `json:"suggestions"` + // AddressResponse result slice for address suggestions + AddressResponse struct { + Suggestions []*AddressSuggestion `json:"suggestions"` } ) diff --git a/api/model/model.go b/api/model/model.go index d8ae48b..a5c3563 100644 --- a/api/model/model.go +++ b/api/model/model.go @@ -92,7 +92,7 @@ type ( // full documentation https://confluence.hflabs.ru/pages/viewpage.action?pageId=222888017 BoundValue string - // Address base struct for datdata.AddressByGeolocate + // Address base struct for datdata.AddressByCoordinates Address struct { Source string `json:"source"` // Исходный адрес одной строкой Result string `json:"result"` // Стандартизованный адрес одной строкой