diff --git a/arcpro_npg/npg/npg/npg_bool_hlp.py b/arcpro_npg/npg/npg/npg_bool_hlp.py index 00e5fab..95a5f04 100644 --- a/arcpro_npg/npg/npg/npg_bool_hlp.py +++ b/arcpro_npg/npg/npg/npg_bool_hlp.py @@ -34,10 +34,9 @@ import sys import numpy as np from numpy.lib.stride_tricks import sliding_window_view as swv -import npg -from npg.npGeo import roll_arrays -from npg_geom_hlp import sort_segment_pairs -from npg.npg_plots import plot_polygons, plot_2d # noqa +from .npGeo import roll_arrays +from .npg_geom_hlp import sort_segment_pairs +from .npg_plots import plot_polygons, plot_2d # noqa ft = {"bool": lambda x: repr(x.astype(np.int32)), "float_kind": '{: 6.2f}'.format} diff --git a/arcpro_npg/npg/tbx_tools.py b/arcpro_npg/npg/tbx_tools.py index f696d3a..0aff749 100644 --- a/arcpro_npg/npg/tbx_tools.py +++ b/arcpro_npg/npg/tbx_tools.py @@ -145,7 +145,7 @@ from npg.npg_arc_npg import (get_SR, get_shape_K, fc_to_Geo, Geo_to_fc, Geo_to_arc_shapes, fc_data) from npg.npg_create import circle, hex_flat, hex_pointy, rectangle, triangle -from npg.npg_overlay import dissolve, merge_ +from npg.npg_bool_ops import merge_, union_adj # Changed from npg_overlay from scipy.spatial import Voronoi # Delaunay @@ -697,7 +697,7 @@ def dissolve_boundaries(in_fc, gdb, name): g, oids, shp_kind, k, m, SR = _in_(in_fc, info) out_kind = shp_kind x, y = g.LL - g0 = dissolve(g, asGeo=True) + g0 = union_adj(g, asGeo=True) tweet("g0") # g0 = arrays_to_Geo(g0, kind=2, info="extent") g0 = g0.translate(dx=x, dy=y)