Skip to content

Remove problematic characters from feature dirs #142

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
merged 1 commit into from
Jul 7, 2020
Merged

Remove problematic characters from feature dirs #142

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
26 changes: 15 additions & 11 deletions geometric_features/geometric_features.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ def read(self, componentName, objectType, featureNames=None, tags=None,

Parameters
----------
componentName : {'bedmap2', 'iceshelves', 'landice', 'natural_earth', 'ocean'}
The component from which to retieve the geometric features
componentName : {'bedmachine', 'bedmap2', 'iceshelves', 'landice', 'natural_earth', 'ocean'}
The component from which to retrieve the geometric features

objectType : {'point', 'transect', 'region'}
The type of geometry to load, a point (0D), transect (1D) or region
Expand All @@ -91,8 +91,9 @@ def read(self, componentName, objectType, featureNames=None, tags=None,
The names of geometric features to read

tags : list of str, optional
A list of tags to check for. A feature is only read in if it has
all tags.
A list of tags to check for. When ``allTags=True``, a feature is
only read in if it has all tags. Otherwise, features with any of
the tags are read.

allTags : bool, optional
Whether a feature must have all tags (instead of any of the tags)
Expand Down Expand Up @@ -172,8 +173,8 @@ def _download_geometric_features(self, componentName, objectType,

Parameters
----------
componentName : {'bedmap2', 'iceshelves', 'landice', 'natural_earth', 'ocean'}
The component from which to retieve the geometric features
componentName : {'bedmachine', 'bedmap2', 'iceshelves', 'landice', 'natural_earth', 'ocean'}
The component from which to retrieve the geometric features

objectType : {'point', 'transect', 'region'}
The type of geometry to load, a point (0D), transect (1D) or region
Expand Down Expand Up @@ -222,8 +223,8 @@ def _get_feature_names(self, componentName, objectType, featureNames,

Parameters
----------
componentName : {'bedmap2', 'iceshelves', 'landice', 'natural_earth', 'ocean'}
The component from which to retieve the geometric features
componentName : {'bedmachine', 'bedmap2', 'iceshelves', 'landice', 'natural_earth', 'ocean'}
The component from which to retrieve the geometric features

objectType : {'point', 'transect', 'region'}
The type of geometry to load, a point (0D), transect (1D) or region
Expand Down Expand Up @@ -297,8 +298,8 @@ def _get_file_name(componentName, objectType, featureName):

Parameters
----------
componentName : {'bedmap2', 'iceshelves', 'landice', 'natural_earth', 'ocean'}
The component from which to retieve the geometric features
componentName : {'bedmachine', 'bedmap2', 'iceshelves', 'landice', 'natural_earth', 'ocean'}
The component from which to retrieve the geometric features

objectType : {'point', 'transect', 'region'}
The type of geometry to load, a point (0D), transect (1D) or region
Expand All @@ -316,7 +317,10 @@ def _get_file_name(componentName, objectType, featureName):
# -------
# Douglas Jacobsen, Xylar Asay-Davis

featureDir = featureName.strip().replace(' ', '_').strip('\'').strip('.')
badCharacters = '<>:"/\\|?*\',;'
featureDir = featureName.strip().replace(' ', '_').strip('.')
for char in badCharacters:
featureDir = featureDir.replace(char, '')
fileName = os.path.join(componentName, objectType, featureDir,
'{}.geojson'.format(objectType))

Expand Down