more package movement.

src/ocgis/api/dataset/dataset.py

@@ -1,6 +1,6 @@
 import netCDF4 as nc
 from shapely import prepared
-from ocgis.meta.interface.interface import GlobalInterface
+from ocgis.interface.interface import GlobalInterface
 from ocgis.util.helpers import keep, sub_range, iter_array
 import numpy as np
 import ocgis.exc as exc

src/ocgis/api/definition.py

@@ -4,7 +4,7 @@
 from shapely.geometry.multipolygon import MultiPolygon
 from shapely.geometry.polygon import Polygon
 from ocgis.util.shp_cabinet import ShpCabinet
-from ocgis.meta.interface.element import Element
+from ocgis.interface.element import Element
 from ocgis.calc.base import OcgFunctionTree, OcgCvArgFunction
 from ocgis.calc import library
 

src/ocgis/api/interpreter.py

@@ -1,9 +1,9 @@
 from ocgis import exc, env
 from ocgis.api import definition
-from ocgis.spatial.union import union_geom_dicts
 from ocgis.conv.meta import MetaConverter
 from ocgis.conv.converter import OcgConverter
 from subset import SubsetOperation
+from ocgis.util.spatial.union import union_geoms
 
 ## TODO: add method to estimate request size
 
@@ -61,7 +61,7 @@ def execute(self):
  ## also true for the case of the selection geometry being requested as
  ## aggregated.
  if self.ops.output_format == 'nc' or self.ops.agg_selection is True:
- self.ops.geom = union_geom_dicts(self.ops.geom)
+ self.ops.geom = union_geoms(self.ops.geom)
 
  ## limited operations available for netcdf
  if self.ops.output_format == 'nc':

src/ocgis/api/subset.py

@@ -1,12 +1,12 @@
 import itertools
 from multiprocessing import Pool
 from ocgis.calc.engine import OcgCalculationEngine
-from ocgis.meta.interface.interface import SpatialInterfacePolygon
-from ocgis.spatial.clip import clip
-from ocgis.spatial.union import union
+from ocgis.interface.interface import SpatialInterfacePolygon
 import copy
-from ocgis.spatial.wrap import unwrap_geoms, wrap_coll
 from ocgis.api.dataset.dataset import OcgDataset
+from ocgis.util.spatial.wrap import unwrap_geoms, wrap_coll
+from ocgis.util.spatial.clip import clip
+from ocgis.util.spatial.union import union
 
 
 class SubsetOperation(object):

src/ocgis/conv/converter.py

@@ -1,8 +1,8 @@
 from ocgis.util.helpers import get_temp_path, vprint
-from ocgis.meta.interface.projection import UsNationalEqualArea
 from shapely.geometry.point import Point
 from shapely.geometry.multipolygon import MultiPolygon
 from shapely import wkb
+from ocgis.interface.projection import UsNationalEqualArea
 
 
 class OcgConverter(object):

src/ocgis/conv/nc.py

@@ -1,6 +1,6 @@
 from ocgis.conv.converter import OcgConverter
 import netCDF4 as nc
-from ocgis.meta.interface.interface import DummyLevelInterface,\
+from ocgis.interface.interface import DummyLevelInterface,\
  SpatialInterfacePoint
 import numpy as np
 

src/ocgis/meta/interface/interface.py → src/ocgis/interface/interface.py

@@ -6,7 +6,7 @@
 from shapely.geometry.polygon import Polygon
 from shapely import prepared
 from shapely.geometry.point import Point
-from ocgis.meta.interface.projection import get_projection
+from ocgis.interface.projection import get_projection
 from copy import copy
 from ocgis.util.helpers import vprint, iter_array
 
@@ -134,7 +134,7 @@ def select(self,polygon):
  ##tdk
  if polygon is not None:
  vprint('building spatial index...')
- from ocgis.util import spatial_index as si
+ from ocgis.util.spatial import index as si
  grid = si.build_index_grid(30.0,polygon)
  index = si.build_index(polygon,grid)
  index_intersects = si.index_intersects

src/ocgis/test/test_work.py

@@ -80,12 +80,12 @@ def iter_operations(self,start=0):
  False
  ]}
  interface = {'interface':[
-# {},
+ {},
  {'s_abstraction':'point'}
  ]}
 
  agg_selection = {'agg_selection':[
- True,
+# True,
  False
  ]}
 
@@ -98,11 +98,17 @@ def iter_operations(self,start=0):
  None
  ]}
  allow_empty = {'allow_empty':[
- True,
+# True,
  False
  ]}
+ calc = {'calc':[
+ [{'func':'mean','name':'my_mean'}],
+ None,
+ ]}
 
- args = [output_format,snippet,dataset,geom,aggregate,spatial_operation,vector_wrap,interface,agg_selection,level_range,time_range,allow_empty]
+ args = [output_format,snippet,dataset,geom,aggregate,spatial_operation,
+ vector_wrap,interface,agg_selection,level_range,time_range,
+ allow_empty,calc]
 
  combined = OrderedDict()
  for arg in args: combined.update(arg)

src/ocgis/util/spatial_index.py → src/ocgis/util/spatial/index.py

@@ -1,12 +1,6 @@
 import numpy as np
 from shapely.geometry.multipolygon import MultiPolygon
-from shapely import prepared
 from ocgis.util.helpers import make_poly
-from ocgis.util.shp_cabinet import ShpCabinet
-from shapely.geometry.point import Point
-import time
-import matplotlib.pyplot as plt
-from ocgis.spatial.union import union_geom_dicts
 
 
 def shapely_grid(dim,rtup,ctup,target=None):

src/ocgis/spatial/union.py → src/ocgis/util/spatial/union.py

@@ -1,7 +1,7 @@
 import numpy as np
 from shapely.ops import cascaded_union
 from shapely.geometry.multipolygon import MultiPolygon
-from copy import copy
+from copy import deepcopy
 from shapely.geometry.point import Point
 from shapely.geometry.multipoint import MultiPoint
 
@@ -72,12 +72,12 @@ def union_sum(weight,value):
  weighted[dim_time,dim_level,0,0] = np.ma.average(value[dim_time,dim_level,:,:],weights=weight)
  return(weighted)
 
-def union_geom_dicts(geom_dicts):
- if len(geom_dicts) == 1:
- ret = copy(geom_dicts)
+def union_geoms(geoms):
+ if len(geoms) == 1:
+ ret = deepcopy(geoms)
  else:
  ugeom = []
- for dct in geom_dicts:
+ for dct in geoms:
  geom = dct['geom']
  if isinstance(geom,MultiPolygon):
  for poly in geom: