diff --git a/examples/development.py b/examples/development.py index fba4346..be3cc36 100644 --- a/examples/development.py +++ b/examples/development.py @@ -2,18 +2,32 @@ import fixbikenet as fbn -fbn.settings.import_path = '../dataexport/cities/cityexport/' +# fbn.settings.import_path = '/Users/mszell/Tresorit/bikenetkitshare/' fbn.constants._BETWEENNESS_RANDOM_NODES = 100 -fbn.settings.export_file_format = 'geojson' +fbn.settings.export_file_format = 'gpkg' +fbn.constants._ROUTING_PENALTY = {0: 1.5, 1: 1} -city = "paris_fr" -gaps = fbn.fixbikenet( - city_query = city, - import_files = { - 'city_boundary': 'boundaries/'+city+'.geojson', - 'street_network': 'streetbike_networks/'+city+'.gpkg', - }, -) + +fbn.fixbikenet( + city_query="Frederiksberg", + radius = 1000, + mingap = 0, + maxgap = 500, + numgaps = 20, + import_files={ + 'city_boundary': "./tests/test_data/frederiksberg_boundary.geojson", + 'street_network': "./tests/test_data/frederiksberg_streetbike_network.gpkg", + }, + ) + +# city = "frederiksberg_dk" +# gaps = fbn.fixbikenet( +# city_query = city, +# import_files = { +# 'city_boundary': 'boundaries/'+city+'.geojson', +# 'street_network': 'streetbike_networks/'+city+'.gpkg', +# }, +# ) # data is saved in directory ./results \ No newline at end of file diff --git a/fixbikenet/fixbikenet.py b/fixbikenet/fixbikenet.py index 27493cd..eedc1c6 100644 --- a/fixbikenet/fixbikenet.py +++ b/fixbikenet/fixbikenet.py @@ -216,6 +216,16 @@ def fixbikenet( progress_bar.update(1) progress_bar.close() + # Cleanup + keepedgedata = ['length', 'geometry'] + keepgapdata = ['source', 'target', 'benefit', 'name', 'ordering', 'length', 'geometry'] + for p in edges_pbi_gdf.keys(): + if p not in keepedgedata: + del edges_pbi_gdf[p] + for p in gaps_ordered.keys(): + if p not in keepgapdata: + del gaps_ordered[p] + # Generate export data filename if export_data: os.makedirs(settings.export_path, exist_ok=True) @@ -228,7 +238,6 @@ def fixbikenet( ) if export_data: - edges_pbi_gdf.drop(["osmid"], axis=1, inplace=True) edges_gdf.drop(["osmid"], axis=1, inplace=True) city_boundary.to_crs(epsg=4326, inplace=True) if settings.export_file_format == "geojson": diff --git a/tests/test_data/frederiksberg-fixbikenet-gaps.gpkg b/tests/test_data/frederiksberg-fixbikenet-gaps.gpkg index bec4c79..1add0eb 100644 Binary files a/tests/test_data/frederiksberg-fixbikenet-gaps.gpkg and b/tests/test_data/frederiksberg-fixbikenet-gaps.gpkg differ