Skip to content

Commit

Permalink
fix util import
Browse files Browse the repository at this point in the history
  • Loading branch information
dbrakenhoff committed Dec 2, 2019
1 parent ca185e8 commit ae6d730
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
6 changes: 3 additions & 3 deletions observations/obs_collection.py
Original file line number Diff line number Diff line change
Expand Up @@ -1079,7 +1079,7 @@ def get_maaiveld(self, xcol='x', ycol='y', buffer=10.,
'this method will probabaly not work on collections with 0 or 1 observation points')

# attempt art_tools import
art = _import_art_tools()
art = util._import_art_tools()


# get x and y values from oc_col
Expand Down Expand Up @@ -1612,7 +1612,7 @@ def to_map(self, ax=None, figsize=(15, 15), label='gws',

if add_topo:
# attempt art_tools import
art = _import_art_tools()
art = util._import_art_tools()
art.OpenTopo(ax=ax, verbose=verbose).plot(
verbose=verbose, alpha=0.5)

Expand Down Expand Up @@ -1673,7 +1673,7 @@ def to_mapgraphs(self, graph=None, plots_per_map=10, figsize=(16, 10),
"""

# attempt art_tools import
art = _import_art_tools()
art = util._import_art_tools()

if graph is None:
graph = np.full((4, 4), True)
Expand Down
5 changes: 3 additions & 2 deletions observations/observation.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
from scipy import interpolate

from . import io_dino
from . import util


class Obs(DataFrame):
Expand Down Expand Up @@ -315,7 +316,7 @@ def get_maaiveld(self, buffer=10, **kwargs):
"""

# attempt art_tools import
art = _import_art_tools()
art = util._import_art_tools()


extent=[self.x-buffer, self.x+buffer, self.y-buffer, self.y+buffer]
Expand Down Expand Up @@ -449,7 +450,7 @@ def from_dino_server(cls, name, filternr=1.,

if get_metadata:
# attempt art_tools import
art = _import_art_tools()
art = util._import_art_tools()

raw_meta = art.dino_wfs.get_dino_piezometer_metadata(
[meta['locatie']])
Expand Down

0 comments on commit ae6d730

Please sign in to comment.