Commit c246435d authored by Lauren Adoram-Kershner's avatar Lauren Adoram-Kershner
Browse files

removing the commented out code

parent 07ff4b88

autocnet/graph/edge.py

+0 −7
Original line number Diff line number Diff line
@@ -975,13 +975,6 @@ class NetworkEdge(Edge): 
        session.close()



    def get_overlapping_indices(self, kps):

        # ecef = pyproj.Proj(proj='geocent',

	# 		               a=self.parent.config['spatial']['semimajor_rad'],

	# 		               b=self.parent.config['spatial']['semiminor_rad'])

        # lla = pyproj.Proj(proj='longlat',

	#		              a=self.parent.config['spatial']['semiminor_rad'],

	#		              b=self.parent.config['spatial']['semimajor_rad'])

        # lons, lats, alts = pyproj.transform(ecef, lla, kps.xm.values, kps.ym.values, kps.zm.values)

        lons, lats, alts = reproject([kps.xm.values, kps.ym.values, kps.zm.values], semi_major, semi_minor, 'geocent', 'latlon')

        points = [Point(lons[i], lats[i]) for i in range(len(lons))]

        mask = [i for i in range(len(points)) if self.intersection.contains(points[i])]

autocnet/graph/network.py

+0 −6
Original line number Diff line number Diff line
@@ -19,9 +19,6 @@ import shapely.wkt as swkt 
import shapely.wkb as swkb

import shapely.ops





# import pyproj



from plio.io.io_controlnetwork import to_isis, from_isis

from plio.io import io_hdf, io_json

from plio.utils import utils as io_utils
@@ -1823,8 +1820,6 @@ WHERE 


    def place_points_from_cnet(self, cnet):

        semi_major, semi_minor = config["spatial"]["semimajor_rad"], config["spatial"]["semiminor_rad"]

        # ecef = pyproj.Proj(proj='geocent', a=semi_major, b=semi_minor)

        # lla = pyproj.Proj(proj='latlon', a=semi_major, b=semi_minor)



        if isinstance(cnet, str):

            cnet = from_isis(cnet)
@@ -1855,7 +1850,6 @@ WHERE 


            row = cnetpoint.iloc[0]

            x,y,z= row.adjustedX, row.adjustedY, row.adjustedZ

            # lon, lat, alt = pyproj.transform(ecef, lla, x, y, z)

            lon, lat, alt = reproject([x, y, z], semi_major, semi_minor, 'geocent', 'latlon')

autocnet/spatial/overlap.py

+0 −2
Original line number Diff line number Diff line
@@ -154,8 +154,6 @@ def place_points_in_overlap(nodes, geom, cam_type="csm", 
    points = []

    semi_major = config['spatial']['semimajor_rad']

    semi_minor = config['spatial']['semiminor_rad']

    # ecef = pyproj.Proj(proj='geocent', a=semi_major, b=semi_minor, lon_wrap=180)

    # lla = pyproj.Proj(proj='latlon', a=semi_major, b=semi_minor, lon_wrap=180)

    valid = compgeom.distribute_points_in_geom(geom, **distribute_points_kwargs)

    if not valid:

        warnings.warn('Failed to distribute points in overlap')