Skip to content

Commit d500065

Browse files
committed
Fixed error in the sample configuration file
1 parent 18f89a1 commit d500065

File tree

6 files changed

+100
-101
lines changed

6 files changed

+100
-101
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ src/data/output/*
6363
src/data/input/affinity/*
6464
src/data/input/protected_areas/*
6565
src/data/input/vector/*
66+
**/*.tif.aux.xml
6667

6768
# Distribution / packaging
6869
.Python

src/3_enrichment.ipynb

Lines changed: 31 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -903,22 +903,7 @@
903903
"Using auxiliary tabular data from /src/data/input/impedance/lulc_descr_esa.csv.\n",
904904
"User-specified mapping of LULC codes and OSM features is used.\n",
905905
"LULC dictionary: {'lulc_road': 7, 'lulc_railway': 7, 'lulc_water': 1}\n",
906-
"Good news! The spatial resolution of your raster data is consistent between X and Y.\n",
907-
"Input raster dataset /src/data/input/lulc/lulc_esa_2017.tif was opened successfully.\n",
908-
"Coordinate reference system of the input raster dataset is EPSG:32630\n",
909-
"x_min: 538670.0\n",
910-
"x_max: 610530.0\n",
911-
"y_min: 5883540.0\n",
912-
"y_max: 5959790.0\n",
913-
"Spatial resolution of input raster dataset (cell size): 10.0\n",
914-
"Good news! The CRS of your input raster dataset is the Cartesian (projected) one.\n",
915-
"Input raster dataset will be enriched with OSM data.\n",
916-
"Using vector file to refine raster data: osm_merged_2017.gpkg\n",
917-
"Path to the input vector dataset: /src/data/input/vector/osm_merged_2017.gpkg\n",
918-
"Layers found in the input vector file: ['railways', 'roads', 'waterbodies', 'waterways']\n",
919-
"Please continue if the layers in the vector file listed below are correct:\n",
920-
" railways, roads, waterbodies, waterways.\n",
921-
"Found 1 GeoPackage files in the directory: /src/data/input/vector.\n"
906+
"Good news! The spatial resolution of your raster data is consistent between X and Y.\n"
922907
]
923908
},
924909
{
@@ -933,31 +918,27 @@
933918
"name": "stdout",
934919
"output_type": "stream",
935920
"text": [
936-
"CRS of the vector dataset 'osm_merged_2017.gpkg' is EPSG:4326.\n",
937-
"Transforming the vector dataset to the specified CRS.\n"
938-
]
939-
},
940-
{
941-
"name": "stderr",
942-
"output_type": "stream",
943-
"text": [
944-
"/src/vector_proc.py:37: UserWarning: CRS of the vector dataset '4326' does not match the specified CRS: 32630.\n",
945-
" warnings.warn(f\"CRS of the vector dataset '{vector_crs}' does not match the specified CRS: {crs}.\")\n"
946-
]
947-
},
948-
{
949-
"name": "stdout",
950-
"output_type": "stream",
951-
"text": [
952-
"Vector dataset 'osm_merged_2017.gpkg' was transformed successfully and the original file was overwritten.\n",
953-
"Good news! All vector geometries in GeoPackage 'osm_merged_2017.gpkg' (layer 'railways') are valid.\n",
954-
"----------------------------------------\n",
955-
"Good news! All vector geometries in GeoPackage 'osm_merged_2017.gpkg' (layer 'roads') are valid.\n",
956-
"----------------------------------------\n",
957-
"Good news! All vector geometries in GeoPackage 'osm_merged_2017.gpkg' (layer 'waterbodies') are valid.\n",
958-
"----------------------------------------\n",
959-
"Good news! All vector geometries in GeoPackage 'osm_merged_2017.gpkg' (layer 'waterways') are valid.\n",
960-
"----------------------------------------\n",
921+
"Input raster dataset /src/data/input/lulc/lulc_esa_2017.tif was opened successfully.\n",
922+
"Coordinate reference system of the input raster dataset is EPSG:32630\n",
923+
"x_min: 538670.0\n",
924+
"x_max: 610530.0\n",
925+
"y_min: 5883540.0\n",
926+
"y_max: 5959790.0\n",
927+
"Spatial resolution of input raster dataset (cell size): 10.0\n",
928+
"Good news! The CRS of your input raster dataset is the Cartesian (projected) one.\n",
929+
"Input raster dataset will be enriched with OSM data.\n",
930+
"Using vector file to refine raster data: osm_merged_2017.gpkg\n",
931+
"Path to the input vector dataset: /src/data/input/vector/osm_merged_2017.gpkg\n",
932+
"Layers found in the input vector file: ['railways', 'roads', 'waterbodies', 'waterways']\n",
933+
"Please continue if the layers in the vector file listed below are correct:\n",
934+
" railways, roads, waterbodies, waterways.\n",
935+
"Found 3 GeoPackage files in the directory: /src/data/input/vector.\n",
936+
"CRS of the vector dataset 'osm_merged_2017.gpkg' is EPSG:32630.\n",
937+
"Good news! CRS of the vector dataset 'osm_merged_2017.gpkg' matches the specified CRS: 32630.\n",
938+
"CRS of the vector dataset 'railways_2017_buffered.gpkg' is EPSG:32630.\n",
939+
"Good news! CRS of the vector dataset 'railways_2017_buffered.gpkg' matches the specified CRS: 32630.\n",
940+
"CRS of the vector dataset 'roads_2017_buffered.gpkg' is EPSG:32630.\n",
941+
"Good news! CRS of the vector dataset 'roads_2017_buffered.gpkg' matches the specified CRS: 32630.\n",
961942
"Width column does not exist in subset. Using the custom value of width from the configuration file...\n",
962943
"Buffering railways layer...\n",
963944
"Successfully buffered railways layer and saved to /src/data/input/vector/railways_2017_buffered.gpkg.\n",
@@ -983,8 +964,8 @@
983964
"output_type": "stream",
984965
"text": [
985966
"Layer name: roads\n",
986-
"Road types found in the input vector file: {'motorway_link', 'secondary_link', 'primary_link', 'tertiary_link', 'tertiary', 'trunk_link', 'trunk', 'secondary', 'motorway', 'primary'}\n",
987-
"Road types to be rasterized: ['tertiary', 'trunk', 'secondary', 'motorway', 'primary']\n",
967+
"Road types found in the input vector file: {'tertiary', 'motorway_link', 'trunk', 'secondary_link', 'primary_link', 'trunk_link', 'tertiary_link', 'secondary', 'primary', 'motorway'}\n",
968+
"Road types to be rasterized: ['tertiary', 'trunk', 'secondary', 'primary', 'motorway']\n",
988969
"Layer to access: roads\n",
989970
"The following command to extract features:\n",
990971
"\n",
@@ -1018,22 +999,22 @@
1018999
"Layer to access: roads\n",
10191000
"The following command to extract features:\n",
10201001
"\n",
1021-
" ogr2ogr -f GPKG /src/data/output/roads_motorway.gpkg /src/data/input/vector/roads_2017_buffered.gpkg -sql \"SELECT * FROM roads WHERE highway LIKE '%motorway%'\"\n",
1002+
" ogr2ogr -f GPKG /src/data/output/roads_primary.gpkg /src/data/input/vector/roads_2017_buffered.gpkg -sql \"SELECT * FROM roads WHERE highway LIKE '%primary%'\"\n",
10221003
" \n",
1023-
"New layer saved to /src/data/output/roads_motorway.gpkg\n",
1004+
"New layer saved to /src/data/output/roads_primary.gpkg\n",
10241005
"Input file size is 7186, 7625\n",
10251006
"0...10...20...30...40...50...60...70...80...90...100 - done.\n",
1026-
"Rasterized output saved to: /src/data/output/roads_motorway_2017.tif\n",
1007+
"Rasterized output saved to: /src/data/output/roads_primary_2017.tif\n",
10271008
"----------------------------------------\n",
10281009
"Layer to access: roads\n",
10291010
"The following command to extract features:\n",
10301011
"\n",
1031-
" ogr2ogr -f GPKG /src/data/output/roads_primary.gpkg /src/data/input/vector/roads_2017_buffered.gpkg -sql \"SELECT * FROM roads WHERE highway LIKE '%primary%'\"\n",
1012+
" ogr2ogr -f GPKG /src/data/output/roads_motorway.gpkg /src/data/input/vector/roads_2017_buffered.gpkg -sql \"SELECT * FROM roads WHERE highway LIKE '%motorway%'\"\n",
10321013
" \n",
1033-
"New layer saved to /src/data/output/roads_primary.gpkg\n",
1014+
"New layer saved to /src/data/output/roads_motorway.gpkg\n",
10341015
"Input file size is 7186, 7625\n",
10351016
"0...10...20...30...40...50...60...70...80...90...100 - done.\n",
1036-
"Rasterized output saved to: /src/data/output/roads_primary_2017.tif\n",
1017+
"Rasterized output saved to: /src/data/output/roads_motorway_2017.tif\n",
10371018
"----------------------------------------\n",
10381019
"Input file size is 7186, 7625\n",
10391020
"0...10...20...30...40...50...60...70...80...90...100 - done.\n",
@@ -1072,7 +1053,7 @@
10721053
"name": "stdout",
10731054
"output_type": "stream",
10741055
"text": [
1075-
"Elapsed time: 134.20 seconds\n"
1056+
"Elapsed time: 183.34 seconds\n"
10761057
]
10771058
}
10781059
],

0 commit comments

Comments
 (0)