Vector Feature Relationships

geoinsight/core/tasks/dataset.py

@@ -166,10 +166,9 @@ def convert_dataset(
             create_network(vector_data, network_options)
         elif region_options:
             create_source_regions(vector_data, region_options)
+        else:
+            create_vector_features(vector_data)
 
-        # Create vector features after geojson_data may have
-        # been altered by create_network or create_source_regions
-        create_vector_features(vector_data)
         vector_data.get_summary()
 
     create_layers_and_frames(dataset, layer_options)

geoinsight/core/tasks/networks.py

@@ -93,6 +93,12 @@ def create_network(vector_data, network_options):
                         and str(v).lower() != 'nan'
                     },
                 )
+            from_node_obj.vector_feature = VectorFeature.objects.create(
+                vector_data=vector_data,
+                geometry=from_node_obj.location,
+                properties=from_node_obj.metadata,
+            )
+            from_node_obj.save()
 
             if i < len(route_nodes) - 1:
                 next_node = route_nodes.iloc[i + 1]
@@ -122,6 +128,12 @@ def create_network(vector_data, network_options):
                             and str(v).lower() != 'nan'
                         },
                     )
+                to_node_obj.vector_feature = VectorFeature.objects.create(
+                    vector_data=vector_data,
+                    geometry=to_node_obj.location,
+                    properties=to_node_obj.metadata,
+                )
+                to_node_obj.save()
 
                 route_points_start_index = route_points_reprojected.index[
                     route_points_reprojected['geometry'] == cutoff_points[current_node_name]
@@ -136,7 +148,7 @@ def create_network(vector_data, network_options):
                 edge_line_geometry = LineString(*[Point(p.x, p.y) for p in edge_points['geometry']])
 
                 try:
-                    NetworkEdge.objects.get(
+                    edge = NetworkEdge.objects.get(
                         network=network,
                         name=f'{current_node_name} - {next_node_name}',
                     )
@@ -150,18 +162,28 @@ def create_network(vector_data, network_options):
                             .to_dict()
                         )
                     )
-                    NetworkEdge.objects.create(
+                    edge = NetworkEdge.objects.create(
                         network=network,
                         name=f'{current_node_name} - {next_node_name}',
                         from_node=from_node_obj,
                         to_node=to_node_obj,
                         line_geometry=edge_line_geometry,
                         metadata=metadata,
                     )
+                edge.vector_feature = VectorFeature.objects.create(
+                    vector_data=vector_data,
+                    geometry=edge.line_geometry,
+                    properties=edge.metadata,
+                )
+                edge.save()
 
     all_nodes = NetworkNode.objects.filter(network=network)
     all_edges = NetworkEdge.objects.filter(network=network)
     print('\t\t', f'{all_nodes.count()} nodes and {all_edges.count()} edges created.')
+
+    all_features = VectorFeature.objects.filter(vector_data=vector_data)
+    print('\t\t', f'{all_features.count()} vector features created.')
+
     # rewrite vector_data geojson_data with updated features
     vector_data.write_geojson_data(geojson_from_network(vector_data.dataset))
     vector_data.metadata['network'] = True

geoinsight/core/tasks/regions.py

@@ -3,7 +3,7 @@
 from django.contrib.gis.geos import GEOSGeometry
 import geopandas
 
-from geoinsight.core.models import Region
+from geoinsight.core.models import Region, VectorFeature
 
 
 def create_source_regions(vector_data, region_options):
@@ -31,12 +31,17 @@ def create_source_regions(vector_data, region_options):
             geometry['coordinates'] = [geometry['coordinates']]
 
         # Create region with properties and MultiPolygon
-        region = Region(
+        region = Region.objects.create(
             name=name,
             boundary=GEOSGeometry(str(geometry)),
             metadata=properties,
             dataset=dataset,
         )
+        region.vector_feature = VectorFeature.objects.create(
+            vector_data=vector_data,
+            geometry=region.boundary,
+            properties=region.metadata,
+        )
         region.save()
         region_count += 1
 
@@ -58,3 +63,6 @@ def create_source_regions(vector_data, region_options):
     vector_data.write_geojson_data(new_geodata.to_json())
     vector_data.save()
     print('\t\t', f'{region_count} regions created.')
+
+    all_features = VectorFeature.objects.filter(vector_data=vector_data)
+    print('\t\t', f'{all_features.count()} vector features created.')