Merge branch 'master' of https://github.com/agile-geoscience/striplog

� Conflicts:
�	striplog/striplog.py

striplog/striplog.py

@@ -679,7 +679,7 @@ def from_csv(cls, filename=None,
  return cls(list_of_Intervals, source=source)
 
  @classmethod
- def from_dict(cls, dict,
+ def from_dict2(cls, dict,
  lexicon=None,
  points=False,
  include=None,
@@ -692,7 +692,7 @@ def from_dict(cls, dict,
  stop=None,
  ):
  """
- Load from a CSV file or text.
+ Load from a dictionary reusing `from_csv` post processing.
 
  Args
  dict (dict): python dict containing the data.
@@ -734,6 +734,25 @@ def from_dict(cls, dict,
 
  return cls(list_of_Intervals, source=source)
 
+ @classmethod
+ def from_dict(cls, dictionary):
+ """
+ Take a dictionary of the form name:depth and return a striplog of
+ complete intervals.
+ """
+ d_sorted = sorted(dictionary.items(), key=lambda i: i[1])
+ names = [i[0] for i in d_sorted]
+ tops_ = [i[1] for i in d_sorted]
+ bases_ = tops_[1:] + [tops_[-1]+1]
+ comps_ = [Component({'formation': name}) for name in names]
+
+ list_of_Intervals = []
+ for top, base, comp in zip(tops_, bases_, comps_):
+ iv = Interval(top=top, base=base, components=[comp])
+ list_of_Intervals.append(iv)
+
+ return cls(list_of_Intervals)
+
  @classmethod
  def from_descriptions(cls, text,
  lexicon=None,
@@ -1132,7 +1151,7 @@ def copy(self):
  order=self.order,
  source=self.source)
 
- 
+
 
 
 
@@ -1267,7 +1286,7 @@ def to_log(self,
  you are asking for. It's up to you to make sure the function
  does what you want.
  bins (bool): Whether to return the index of the items from the
- lookup table. If False, then the item itself will be returned. 
+ lookup table. If False, then the item itself will be returned.
  dtype (str): The NumPy dtype string for the output log.
  table (list): Provide a look-up table of values if you want. If you
  don't, then it will be constructed from the data.
@@ -2660,7 +2679,7 @@ def from_macrostrat(cls, lng, lat, buffer_size=0.2):
  This is simply a helper function to make things easier, but it
  works because we know what our data looks like in advance.
 
- Note: In order to plot this, you will need to add space for text and 
+ Note: In order to plot this, you will need to add space for text and
  other decoration. This simply gives a Striplog back which _can_
  be plotted.
 
@@ -2677,8 +2696,8 @@ def from_macrostrat(cls, lng, lat, buffer_size=0.2):
  lat = 44.4454632
  buffer_size = 0.3
  striplog.striplog.from_macrostrat(lng, lat, buffer_size)
- {'top': Position({'middle': 358.9, 'units': 'm'}), 
- 'base': Position({'middle': 419.2, 'units': 'm'}), 
+ {'top': Position({'middle': 358.9, 'units': 'm'}),
+ 'base': Position({'middle': 419.2, 'units': 'm'}),
  'description': '', 'data': {}, 'components': [Component({
  'map_id': 948660.0, 'scale': 'small', 'source_id': 7.0,
  'name': 'Devonian plutonic: undivided granitic rocks',
@@ -2702,7 +2721,7 @@ def from_macrostrat(cls, lng, lat, buffer_size=0.2):
  't_int': 112.0, 'b_int': 122.0, 'color': '#409963',
  'source': 'MacroStrat.org (CC-BY)})]}
  """
- # Get the 
+ # Get the
  features = utils.geology_from_macrostrat(lng=lng, lat=lat,
  buffer_size=buffer_size)