Fix station and instrument click option to parse geometry to float

- Fix country_id click option to be clear and precise

Author: kngai

woudc_data_registry/epicentre/contributor.py

@@ -101,7 +101,7 @@ def show(ctx, identifier, verbosity):
 @cli_options.OPTION_VERBOSITY
 @click.option('-n', '--name', 'name', required=True, help='name')
 @click.option('-a', '--acronym', 'acronym', required=True, help='acronym')
-@click.option('-c', '--country', 'country_id', required=True,
+@click.option('-c', '--country-id', 'country_id', required=True,
               help='country ID, ex: "CAN"')
 @click.option('-p', '--project', 'project', required=True, help='project')
 @click.option('-w', '--wmo-region', 'wmo_region', required=True,
@@ -146,7 +146,7 @@ def add(ctx, name, acronym, country_id, project, wmo_region,
               help='acronym')
 @click.option('-n', '--name', 'name', help='name')
 @click.option('-a', '--acronym', 'acronym', help='acronym')
-@click.option('-c', '--country', 'country', help='country')
+@click.option('-c', '--country-id', 'country_id', help='country ID, ex: "CAN"')
 @click.option('-p', '--project', 'project', help='project')
 @click.option('-w', '--wmo-region', 'wmo_region', help='WMO region')
 @click.option('-u', '--url', 'url', help='URL')
@@ -155,7 +155,7 @@ def add(ctx, name, acronym, country_id, project, wmo_region,
 @click.option('-sd', '--start-date', 'start_date', help='YYYY-MM-DD')
 @click.option('-ed', '--end-date', 'end_date', help='YYYY-MM-DD')
 @click.option('-g', '--geometry', 'geometry', help='latitude,longitude')
-def update(ctx, identifier, name, acronym, country, project,
+def update(ctx, identifier, name, acronym, country_id, project,
            wmo_region, url, email, ftp_username, start_date, end_date,
            geometry, verbosity):
     """Update contributor information"""
@@ -168,8 +168,8 @@ def update(ctx, identifier, name, acronym, country, project,
         contributor_['name'] = name
     if acronym:
         contributor_['acronym'] = acronym
-    if country:
-        contributor_['country_id'] = country
+    if country_id:
+        contributor_['country_id'] = country_id
     if project:
         contributor_['project_id'] = project
     if wmo_region:

woudc_data_registry/epicentre/instrument.py

@@ -227,9 +227,9 @@ def update(ctx, identifier, station, dataset,
         if len(geom_tokens) == 2:
             geom_tokens.append(None)
 
-        instrument_['x'] = geom_tokens[1]
-        instrument_['y'] = geom_tokens[0]
-        instrument_['z'] = geom_tokens[2]
+        instrument_['x'] = float(geom_tokens[1])
+        instrument_['y'] = float(geom_tokens[0])
+        instrument_['z'] = float(geom_tokens[2])
 
     if len(instrument_.keys()) == 0:
         click.echo('No updates specified')

woudc_data_registry/epicentre/station.py

@@ -125,7 +125,8 @@ def show(ctx, identifier, verbosity):
               help='station type')
 @click.option('-n', '--name', 'name', required=True, help='name')
 @click.option('-gi', '--gaw-id', 'gaw_id', required=True, help='GAW ID')
-@click.option('-c', '--country', 'country', required=True, help='country')
+@click.option('-c', '--country-id', 'country_id', required=True,
+              help='country ID, ex: "CAN"')
 @click.option('-w', '--wmo-region', 'wmo_region', required=True,
               help='WMO region')
 @click.option('-sd', '--start-date', 'start_date', required=True,
@@ -134,7 +135,7 @@ def show(ctx, identifier, verbosity):
               help='end date')
 @click.option('-g', '--geometry', 'geometry', required=True,
               help='latitude,longitude,elevation')
-def add(ctx, identifier, name, type_, gaw_id, country,
+def add(ctx, identifier, name, type_, gaw_id, country_id,
         wmo_region, start_date, end_date, geometry, verbosity):
     """Add a station"""
 
@@ -145,13 +146,13 @@ def add(ctx, identifier, name, type_, gaw_id, country,
         'station_name': name,
         'station_type': type_,
         'gaw_id': gaw_id,
-        'country_id': country,
+        'country_id': country_id,
         'wmo_region_id': wmo_region,
         'start_date': start_date,
         'end_date': end_date,
-        'x': geom_tokens[1],
-        'y': geom_tokens[0],
-        'z': geom_tokens[2]
+        'x': float(geom_tokens[1].strip()),
+        'y': float(geom_tokens[0].strip()),
+        'z': float(geom_tokens[2].strip())
     }
 
     add_metadata(Station, station_, save_to_registry, save_to_index)
@@ -166,13 +167,13 @@ def add(ctx, identifier, name, type_, gaw_id, country,
 @click.option('-t', '--type', 'type_', help='station type')
 @click.option('-n', '--name', 'name', help='name')
 @click.option('-gi', '--gaw-id', 'gaw_id', help='GAW ID')
-@click.option('-c', '--country', 'country', help='country')
+@click.option('-c', '--country-id', 'country_id', help='country ID, ex: "CAN"')
 @click.option('-w', '--wmo-region', 'wmo_region', help='WMO region')
 @click.option('-sd', '--start-date', 'start_date', help='start date')
 @click.option('-ed', '--end-date', 'end_date', help='end date')
 @click.option('-g', '--geometry', 'geometry',
               help='latitude,longitude,elevation')
-def update(ctx, identifier, name, type_, gaw_id, country,
+def update(ctx, identifier, name, type_, gaw_id, country_id,
            wmo_region, start_date, end_date, geometry, verbosity):
     """Update station information"""
 
@@ -187,8 +188,8 @@ def update(ctx, identifier, name, type_, gaw_id, country,
         station_['station_type'] = type_
     if gaw_id:
         station_['gaw_id'] = gaw_id
-    if country:
-        station_['country_id'] = country
+    if country_id:
+        station_['country_id'] = country_id
     if wmo_region:
         station_['wmo_region_id'] = wmo_region
     if start_date: