Commit 621abd21 authored by jlaura's avatar jlaura Committed by Kelvin Rodriguez
Browse files

Changes overlap to sql only (#280)

parent ea697212

autocnet/graph/network.py

+0 −48
Original line number Diff line number Diff line
@@ -1428,54 +1428,6 @@ class NetworkCandidateGraph(CandidateGraph): 
        for i, n in self.nodes(data='data'):

            n.generate_vrt(**kwargs)



    def compute_overlaps(self):

        """

        For the candidate graph, compute the overlapping polygons that

        comprise the entire candidate graph / footprint map. Each overlap

        includes an 'overlaps' attribute/column that includes a list of the

        footprint polygons that have contributed to given overlap.



        """

        query = """

    SELECT ST_AsEWKB(geom) AS geom FROM ST_Dump((

        SELECT ST_Polygonize(the_geom) AS the_geom FROM (

            SELECT ST_Union(the_geom) AS the_geom FROM (

                SELECT ST_ExteriorRing((ST_DUMP(footprint_latlon)).geom) AS the_geom

                FROM images) AS lines

        ) AS noded_lines

    )

)"""

        session = Session()

        oquery = session.query(Overlay)

        iquery = session.query(Images)



        rows = []

        srid = config['spatial']['srid']

        for q in engine.execute(query).fetchall():

            overlaps = []

            b = bytes(q['geom'])

            qgeom = shapely.wkb.loads(b)

            res = iquery.filter(Images.footprint_latlon.ST_Intersects(geoalchemy2.shape.from_shape(qgeom, srid=srid)))

            for i in res:

                fgeom = geoalchemy2.shape.to_shape(i.footprint_latlon)

                area = qgeom.intersection(fgeom).area

                if area < 1e-6:

                    continue

                overlaps.append(i.id)

            o = Overlay(geom=f'SRID={srid};{qgeom.qkt}', overlaps=overlaps)

            res = oquery.filter(Overlay.overlaps == o.overlaps).first()

            if res is None:

                rows.append(o)



        session.bulk_save_objects(rows)

        session.commit()



        # If an overlap has only 1 entry, it is a sliver and we want to remove it.

        res = oquery.filter(sqlalchemy.func.array_length(Overlay.overlaps, 1) <= 1)

        res.delete(synchronize_session=False)

        session.commit()

        session.close()



    def to_isis(self, path, flistpath=None,         sql = """

SELECT points.id, measures.serial, points.pointtype, measures.sample, measures.line, measures.measuretype,

measures.imageid

autocnet/io/db/model.py

+4 −3
Original line number Diff line number Diff line
@@ -180,8 +180,9 @@ class Images(Base): 
    __tablename__ = 'images'



    id = Column(Integer, primary_key=True, autoincrement=True)

    name = Column(String, unique=True)

    path = Column(String, unique=True)

    name = Column(String)

    path = Column(String)

    serial = Column(String, unique=True)

    active = Column(Boolean)

    footprint_latlon = Column(Geometry('MultiPolygon', srid=949900, dimension=2, spatial_index=True))

    footprint_bodyfixed = Column(Geometry('MULTIPOLYGON', dimension=2))
@@ -218,7 +219,7 @@ class Images(Base): 
class Overlay(Base):

    __tablename__ = 'overlay'

    id = Column(Integer, primary_key=True, autoincrement=True)

    overlaps = Column(ARRAY(Integer))

    intersections = Column(ARRAY(Integer))

    #geom = Column(Geometry(geometry_type='POLYGON', management=True))  # sqlite

    geom = Column(Geometry('POLYGON', srid=949900, dimension=2, spatial_index=True))  # postgresql

sql/compute_overlapping_geometries.sql

0 → 100644
+21 −0
Original line number Diff line number Diff line 
INSERT INTO overlay(geom)

(

	SELECT ST_AsEWKB(geom) AS geom FROM ST_Dump((

        SELECT ST_Polygonize(the_geom) AS the_geom FROM (

            SELECT ST_Union(the_geom) AS the_geom FROM (

                SELECT ST_ExteriorRing((ST_DUMP(footprint_latlon)).geom) AS the_geom

                FROM images WHERE images.footprint_latlon IS NOT NULL) AS lines

        ) AS noded_lines

    ))

);



UPDATE overlay

SET intersections = imgs.iid

FROM (

		SELECT overlay.id, array_agg(images.id) as iid

		FROM overlay, images

		WHERE images.footprint_latlon is NOT NULL AND

		ST_AREA(ST_INTERSECTION(overlay.geom, images.footprint_latlon)) > 0.000001

		GROUP BY overlay.id

	) AS imgs

WHERE imgs.id = overlay.id;