Update to UFG

Author: JamesVirgo

openudm/RasterToolkit.cpp

@@ -37,6 +37,27 @@ struct RTTile {
 	}
 };
 
+//simple tile structure
+struct UFTile {
+	int dph;
+	int build_cov;
+	int roads_cov;
+	int green_cov;
+	std::string str;
+	std::string str90;
+	IRaster ras;
+	IRaster ras90;
+
+	UFTile() {	
+		dph = 0;
+		build_cov = 0;
+		roads_cov = 0;
+		green_cov = 0;
+		str = "";
+		str90 = "";
+	}
+};
+
 bool DevCompare(const std::string& iRas1, const std::string& iRas2, const std::string& result);
 bool IRasterCompare(const std::string& iRas1, const std::string& iRas2, const std::string& result);
 bool DRasterCompare(const std::string& dRas1, const std::string& dRas2, const std::string& result);
@@ -79,4 +100,7 @@ void IRasterToHeader(const std::string& inputRaster, const std::string& outputHe
 
 int ParameterFromHeader(const std::string& header, const std::string& parameter);
 
-void IRasterSetToValue(const std::string& rasterHeader, int value, const std::string& outputRaster);
+void IRasterSetToValue(const std::string& rasterHeader, int value, const std::string& outputRaster);
+
+void UFGCoverageFromDensity(const std::string& densityFolder, const std::string& tilesFolder);
+void UFGFabricFomCoverage(const std::string& densityFolder, const std::string& tilesFolder);

openudm/RasterToolkit.h

@@ -0,0 +1,5 @@
+tile_dph,tile_str,tile90_str,pc_build,pc_roads,pc_green
+7,D1.asc,D1R.asc,8,14,78
+12,D2.asc,D2R.asc,13,14,73
+23,D3.asc,D3R.asc,18,22,60
+30,D4.asc,D4R.asc,20,24,56

openudm/Tiles/tiles-detached.csv

@@ -0,0 +1,5 @@
+tile_dph,tile_str,tile90_str,pc_build,pc_roads,pc_green
+77,F1.asc,F1R.asc,20,32,48
+101,F2.asc,F2R.asc,21,38,41
+164,F3.asc,F3R.asc,27,54,19
+216,F4.asc,F4R.asc,27,46,27

openudm/Tiles/tiles-flats.csv

@@ -0,0 +1,5 @@
+tile_dph,tile_str,tile90_str,pc_build,pc_roads,pc_green
+13,S1.asc,S1R.asc,8,16,76
+23,S2.asc,S2R.asc,13,19,68
+31,S3.asc,S3R.asc,17,22,61
+42,S4.asc,S4R.asc,20,30,50

openudm/Tiles/tiles-semi-detached.csv

@@ -0,0 +1,5 @@
+tile_dph,tile_str,tile90_str,pc_build,pc_roads,pc_green
+22,T1.asc,T1R.asc,12,25,63
+68,T2.asc,T2R.asc,29,32,39
+90,T3.asc,T3R.asc,34,43,23
+109,T4.asc,T4R.asc,34,51,15

openudm/Tiles/tiles-terraced.csv

@@ -0,0 +1,22 @@
+density,detached,semi-detached,terraced,flats
+5,77,15,4,4
+10,63,24,8,5
+15,55,27,13,5
+20,48,31,13,8
+25,40,34,16,10
+30,32,38,19,11
+35,23,43,22,12
+40,18,41,27,14
+45,12,39,31,18
+50,10,33,37,20
+55,8,29,38,25
+60,6,26,43,25
+65,5,22,43,30
+70,4,20,46,30
+75,4,17,44,35
+80,3,15,43,39
+85,3,14,42,41
+90,3,12,42,43
+95,2,9,39,50
+100,2,9,45,44
+100,1,5,23,71

openudm/Tiles/types-vs-density.csv

@@ -0,0 +1,69 @@
+import os
+import sys
+import csv
+import getopt
+
+# import swig-wrapped RasterToolkit as rt
+from openudm import (RasterToolkit as rt)
+
+
+#def urban_fabric_generator_entrypoint():
+def ufg_coverage_from_density_entrypoint():
+    """
+    Commandline entrypoint
+    """
+    # default values for required input variables
+    data_path_tiles = ''
+
+    # get args list
+    args = sys.argv[1:]
+
+    # parse passed command line arguments
+    try:
+        # e.g. i = input file (colon indicates input expected)        
+        opts, args = getopt.getopt(args, "i:t:", ["input_data_path=", 'tile_data_path='])
+    except getopt.GetoptError as err:
+        print(err)
+        sys.exit(2)
+
+    input_data_path = None
+    tile_data_path = None    
+
+    # check each passed argument and assign values to variables
+    for opt, arg in opts:
+        print(opt)
+        if opt in ("-i", "input_data_path="):
+            input_data_path = arg
+        elif opt in ("-t", 'tile_data_path='):
+            tile_data_path = arg        
+        else:
+            print('Un-recognised argument %s' %opt)
+            sys.exit(2)
+
+    if input_data_path is None:
+        print('Input data path is required')
+        sys.exit(2)
+    
+    ufg_coverage_from_density(dph_path=input_data_path, tiles_path=tile_data_path)
+
+
+#def urban_fabric_generator(dph_path, out_path=None, tiles_path=None):
+def ufg_coverage_from_density(dph_path, tiles_path=None):
+    """
+    Runs a function to generate raster files containing urban coverage.
+    Input data to be in the UDM data dir and output written to same directory.
+
+    Inputs:
+    - dph_path: the path to the folder containing the dph raster    
+    - tiles_path : accepts a file path to a folder which contains the tiles to generate urban coverage.
+    """
+
+    if tiles_path is None:
+        tiles_path = os.path.abspath(os.path.join(os.path.dirname(__file__), 'Tiles'))
+
+    print(tiles_path)    
+
+    # call wrapped C++ UFG function    
+    rt.UFGCoverageFromDensity(dph_path, tiles_path)
+
+    return

openudm/UFGCoverageFromDensity.py

@@ -0,0 +1,69 @@
+import os
+import sys
+import csv
+import getopt
+
+# import swig-wrapped RasterToolkit as rt
+from openudm import (RasterToolkit as rt)
+
+
+#def urban_fabric_generator_entrypoint():
+def ufg_fabric_from_coverage_entrypoint():
+    """
+    Commandline entrypoint
+    """
+    # default values for required input variables
+    data_path_tiles = ''
+
+    # get args list
+    args = sys.argv[1:]
+
+    # parse passed command line arguments
+    try:
+        # e.g. i = input file (colon indicates input expected)        
+        opts, args = getopt.getopt(args, "i:t:", ["input_data_path=", 'tile_data_path='])
+    except getopt.GetoptError as err:
+        print(err)
+        sys.exit(2)
+
+    input_data_path = None
+    tile_data_path = None    
+
+    # check each passed argument and assign values to variables
+    for opt, arg in opts:
+        print(opt)
+        if opt in ("-i", "input_data_path="):
+            input_data_path = arg
+        elif opt in ("-t", 'tile_data_path='):
+            tile_data_path = arg        
+        else:
+            print('Un-recognised argument %s' %opt)
+            sys.exit(2)
+
+    if input_data_path is None:
+        print('Input data path is required')
+        sys.exit(2)
+    
+    ufg_fabric_from_coverage(dph_path=input_data_path, tiles_path=tile_data_path)
+
+
+#def urban_fabric_generator(dph_path, out_path=None, tiles_path=None):
+def ufg_fabric_from_coverage(dph_path, tiles_path=None):
+    """
+    Runs a function to generate a raster file containing urban fabric.
+    Input data to be in the UDM data dir and output written to same directory.
+
+    Inputs:
+    - dph_path: the path to the folder containing the dph raster    
+    - tiles_path : accepts a file path to a folder which contains the tiles to generate urban coverage.
+    """
+
+    if tiles_path is None:
+        tiles_path = os.path.abspath(os.path.join(os.path.dirname(__file__), 'Tiles'))
+
+    print(tiles_path)    
+
+    # call wrapped C++ UFG function    
+    rt.UFGFabricFromCoverage(dph_path, tiles_path)
+
+    return