refactor: Rename vector_features_from_network -> `create_vector_fea…

…tures_from_network`
OpenGeoscience · Aug 21, 2024 · a287c78 · a287c78
1 parent 296dc78
commit a287c78
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/sample_data/use_cases/new_york_energy/import_networks.py b/sample_data/use_cases/new_york_energy/import_networks.py
@@ -9,7 +9,7 @@
 from django.contrib.gis.db.models.functions import Distance
 from django.contrib.gis.geos import Point, LineString
 from uvdat.core.models import Network, NetworkEdge, NetworkNode, VectorMapLayer
-from uvdat.core.tasks.networks import vector_features_from_network
+from uvdat.core.tasks.networks import create_vector_features_from_network
 
 
 TOLERANCE_METERS = 15
@@ -74,7 +74,7 @@ def create_network(dataset, network_name, geodata):
     not_connected.delete()
 
     NetworkEdge.objects.bulk_create(edges, batch_size=1000)
-    vector_features_from_network(network)
+    create_vector_features_from_network(network)
     print(f'\t\tCreated {network.nodes.count()} nodes and {network.edges.count()} edges.')
 
 

diff --git a/sample_data/use_cases/new_york_energy/nysdp.py b/sample_data/use_cases/new_york_energy/nysdp.py
@@ -8,7 +8,7 @@
 
 from django.contrib.gis.geos import GEOSGeometry, Point, LineString
 from uvdat.core.models import Dataset, Network, NetworkNode, NetworkEdge, VectorMapLayer, VectorFeature, SourceRegion
-from uvdat.core.tasks.networks import vector_features_from_network
+from uvdat.core.tasks.networks import create_vector_features_from_network
 
 from .interpret_network import interpret_group
 
@@ -173,7 +173,7 @@ def create_consolidated_network(dataset, **kwargs):
         ], batch_size=1000)
 
         print(f'\t\t{network.nodes.count()} nodes created, {network.edges.count()} edges created.')
-        vector_features_from_network(network)
+        create_vector_features_from_network(network)
 
     print(f'\t\t{dataset.networks.count()} separate networks created.')
     print(f'\tCompleted in {(datetime.now() - start).total_seconds()} seconds.')
diff --git a/uvdat/core/tasks/networks.py b/uvdat/core/tasks/networks.py
@@ -213,8 +213,8 @@ def geojson_from_network(dataset):
     return new_geodata.to_json()
 
 
-def vector_features_from_network(network):
-    map_layer, created = VectorMapLayer.objects.get_or_create(dataset=network.dataset, index=0)
+def create_vector_features_from_network(network):
+    map_layer, _ = VectorMapLayer.objects.get_or_create(dataset=network.dataset, index=0)
     VectorFeature.objects.bulk_create(
         [
             VectorFeature(