Skip to content

Fixed bug regarding indexing #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
antaresc merged 1 commit into from
Oct 1, 2019
Merged

Fixed bug regarding indexing #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion datacommons/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ def get_property_values(dcids,

# Format the results as a Series if a Pandas Series is provided.
if isinstance(dcids, pd.Series):
return pd.Series([results[dcid] for dcid in dcids])
return pd.Series([results[dcid] for dcid in dcids], index=dcids.index)
return results


Expand Down
2 changes: 1 addition & 1 deletion datacommons/places.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,5 +91,5 @@ def get_places_in(dcids, place_type):
# Create the results and format it appropriately
result = utils._format_expand_payload(payload, 'place', must_exist=dcids)
if isinstance(dcids, pd.Series):
return pd.Series([result[dcid] for dcid in dcids])
return pd.Series([result[dcid] for dcid in dcids], index=dcids.index)
return result
4 changes: 2 additions & 2 deletions datacommons/populations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def get_populations(dcids, population_type, constraining_properties={}):
payload, 'population', must_exist=dcids)
if isinstance(dcids, pd.Series):
flattened = utils._flatten_results(result, default_value="")
return pd.Series([flattened[dcid] for dcid in dcids])
return pd.Series([flattened[dcid] for dcid in dcids], index=dcids.index)

# Drop empty results while flattening
return utils._flatten_results(result)
Expand Down Expand Up @@ -223,7 +223,7 @@ def get_observations(dcids,
payload, 'observation', must_exist=dcids)
if isinstance(dcids, pd.Series):
flattened = utils._flatten_results(result, default_value="")
series = pd.Series([flattened[dcid] for dcid in dcids])
series = pd.Series([flattened[dcid] for dcid in dcids], index=dcids.index)
return series.apply(pd.to_numeric, errors='coerce')

# Drop empty results by calling _flatten_results without default_value, then
Expand Down