tommy/libpostal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[geonames] Adding country_geonames_id to both geoname and postal code structs

Browse Source
This commit is contained in:
Al
2015-07-08 18:44:14 -04:00
parent 9af0b0ab65
commit 8c02073b54
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/geonames.c
View File

@@ -220,6 +220,10 @@ bool geoname_deserialize_ctx(geoname_t *self, cmp_ctx_t *ctx) {
return false; return false;
} }
if (!cmp_read_uint(ctx, &self->country_geonames_id, &len)) {
return false;
}
if (!cmp_read_str_size_or_nil(ctx, &self->admin1_code, &len)) { if (!cmp_read_str_size_or_nil(ctx, &self->admin1_code, &len)) {
return false; return false;
} }
@@ -280,6 +284,7 @@ bool geoname_serialize_ctx(geoname_t *self, cmp_ctx_t *ctx) {
!cmp_write_double(ctx, self->longitude) || !cmp_write_double(ctx, self->longitude) ||
!cmp_write_str_or_nil(ctx, self->feature_code) || !cmp_write_str_or_nil(ctx, self->feature_code) ||
!cmp_write_str_or_nil(ctx, self->country_code) || !cmp_write_str_or_nil(ctx, self->country_code) ||
!cmp_write_uint(ctx, self->country_geonames_id) ||
!cmp_write_str_or_nil(ctx, self->admin1_code) || !cmp_write_str_or_nil(ctx, self->admin1_code) ||
!cmp_write_uint(ctx, self->admin1_geonames_id) || !cmp_write_uint(ctx, self->admin1_geonames_id) ||
!cmp_write_str_or_nil(ctx, self->admin2_code) || !cmp_write_str_or_nil(ctx, self->admin2_code) ||
@@ -317,6 +322,7 @@ void geoname_print(geoname_t *self) {
printf("longitude: %f\n", self->longitude); printf("longitude: %f\n", self->longitude);
printf("feature_code: %s\n", char_array_get_string(self->feature_code)); printf("feature_code: %s\n", char_array_get_string(self->feature_code));
printf("country_code: %s\n", char_array_get_string(self->country_code)); printf("country_code: %s\n", char_array_get_string(self->country_code));
printf("country_geonames_id: %d\n", self->country_geonames_id);
printf("admin1_code: %s\n", char_array_get_string(self->admin1_code)); printf("admin1_code: %s\n", char_array_get_string(self->admin1_code));
printf("admin1_geonames_id: %d\n", self->admin1_geonames_id); printf("admin1_geonames_id: %d\n", self->admin1_geonames_id);
printf("admin2_code: %s\n", char_array_get_string(self->admin2_code)); printf("admin2_code: %s\n", char_array_get_string(self->admin2_code));
@@ -391,6 +397,10 @@ bool gn_postal_code_deserialize_ctx(gn_postal_code_t *self, cmp_ctx_t *ctx) {
return false; return false;
} }
if (!cmp_read_uint(ctx, &self->country_geonames_id, &len)) {
return false;
}
if (!cmp_read_bool(ctx, &self->have_containing_geoname)) { if (!cmp_read_bool(ctx, &self->have_containing_geoname)) {
return false; return false;
} }
@@ -462,6 +472,7 @@ static bool gn_postal_code_serialize_ctx(gn_postal_code_t *self, cmp_ctx_t *ctx)
if (!cmp_write_str_or_nil(ctx, self->postal_code) || if (!cmp_write_str_or_nil(ctx, self->postal_code) ||
!cmp_write_str_or_nil(ctx, self->country_code) || !cmp_write_str_or_nil(ctx, self->country_code) ||
!cmp_write_uint(ctx, self->country_geonames_id) ||
!cmp_write_bool(ctx, self->have_containing_geoname) || !cmp_write_bool(ctx, self->have_containing_geoname) ||
(self->have_containing_geoname && (self->have_containing_geoname &&
(!cmp_write_str_or_nil(ctx, self->containing_geoname) || (!cmp_write_str_or_nil(ctx, self->containing_geoname) ||

2
src/geonames.h
View File

@@ -48,6 +48,7 @@ typedef struct geoname {
double longitude; double longitude;
char_array *feature_code; char_array *feature_code;
char_array *country_code; char_array *country_code;
uint32_t country_geonames_id;
char_array *admin1_code; char_array *admin1_code;
uint32_t admin1_geonames_id; uint32_t admin1_geonames_id;
char_array *admin2_code; char_array *admin2_code;
@@ -73,6 +74,7 @@ void geoname_destroy(geoname_t *self);
typedef struct gn_postal_code { typedef struct gn_postal_code {
char_array *postal_code; char_array *postal_code;
char_array *country_code; char_array *country_code;
uint32_t country_geonames_id;
bool have_lat_lon; bool have_lat_lon;
double latitude; double latitude;
double longitude; double longitude;