Skip to content

Commit 70c3686

Browse files
committed
Update Fabric Generator
1 parent bc1240f commit 70c3686

9 files changed

Lines changed: 78 additions & 76 deletions

File tree

openudm/Tiles/F1.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ncols 20
22
nrows 20
33
xllcorner 0
4-
yllcorner 110
4+
yllcorner 0
55
cellsize 5
66
NODATA_value -1
77
20 20 20 20 20 20 20 20 20 21 21 20 20 20 20 20 20 20 20 20

openudm/Tiles/F1R.asc

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@ xllcorner 0
44
yllcorner 0
55
cellsize 5
66
NODATA_value -1
7-
20 20 20 20 20 20 20 20 21 21 21 20 20 20 20 20 20 20 20 20
8-
20 20 20 20 20 20 20 20 21 21 21 20 22 22 22 22 22 22 22 20
9-
20 20 20 20 20 20 20 20 21 21 21 20 22 22 22 22 22 22 22 20
10-
20 20 20 20 20 20 20 20 21 21 21 20 22 22 22 22 22 22 22 20
11-
20 20 20 20 20 20 20 21 21 21 21 20 22 22 22 22 22 22 22 20
12-
20 20 20 20 20 20 21 21 21 21 21 21 22 22 22 22 22 22 22 20
13-
20 20 20 20 20 21 21 21 21 21 21 21 22 22 22 22 22 22 22 20
14-
20 20 20 20 21 21 21 21 21 21 21 20 20 20 20 20 20 20 20 20
15-
21 21 21 21 21 21 21 21 21 21 21 20 20 20 20 20 20 20 20 20
7+
20 20 20 20 20 20 20 20 20 21 21 20 20 20 20 20 20 20 20 20
8+
20 22 22 22 22 22 22 20 20 21 21 20 20 20 20 20 20 20 20 20
9+
20 22 22 22 22 22 22 20 20 21 21 20 20 20 20 20 20 20 20 20
10+
20 22 22 22 22 22 22 20 20 21 21 21 20 20 20 20 20 20 20 20
11+
20 22 22 22 22 22 22 20 20 21 21 21 21 20 20 20 20 20 20 20
12+
20 22 22 22 22 22 22 20 20 21 21 21 21 21 20 20 20 20 20 20
13+
20 22 22 22 22 22 22 20 20 21 21 21 21 21 21 20 20 20 20 20
14+
20 22 22 22 22 22 22 20 20 21 21 21 21 21 21 21 20 20 20 20
15+
20 20 20 20 20 21 21 20 20 21 21 21 21 21 21 21 21 20 20 20
1616
21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21
1717
21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21
18-
20 20 20 20 20 20 20 20 20 21 21 21 21 21 21 21 21 20 20 20
19-
20 20 20 20 20 20 20 20 20 21 21 21 21 21 21 21 20 20 20 20
20-
20 22 22 22 22 22 22 20 20 21 21 21 21 21 21 20 20 20 20 20
21-
20 22 22 22 22 22 22 20 20 21 21 21 21 21 20 20 20 20 20 20
22-
20 22 22 22 22 22 22 20 20 21 21 21 21 20 20 20 20 20 20 20
23-
20 22 22 22 22 22 22 20 20 21 21 21 20 20 20 20 20 20 20 20
24-
20 22 22 22 22 22 22 22 21 21 21 20 20 20 20 20 20 20 20 20
25-
20 22 22 22 22 22 22 22 21 21 21 20 20 20 20 20 20 20 20 20
26-
20 20 20 20 20 20 20 20 20 21 21 20 20 20 20 20 20 20 20 20
18+
21 21 21 21 21 21 21 21 21 21 21 20 20 20 20 20 20 21 21 20
19+
20 20 20 20 21 21 21 21 21 21 21 20 20 20 20 20 20 22 22 20
20+
20 20 20 20 20 21 21 21 21 21 21 20 20 22 22 22 22 22 22 20
21+
20 20 20 20 20 20 21 21 21 21 21 20 20 22 22 22 22 22 22 20
22+
20 20 20 20 20 20 20 21 21 21 21 20 20 22 22 22 22 22 22 20
23+
20 20 20 20 20 20 20 20 21 21 21 20 20 22 22 22 22 22 22 20
24+
20 20 20 20 20 20 20 20 21 21 21 20 20 22 22 22 22 22 22 20
25+
20 20 20 20 20 20 20 20 21 21 21 20 20 22 22 22 22 22 22 20
26+
20 20 20 20 20 20 20 20 21 21 21 20 20 20 20 20 20 20 20 20

openudm/Tiles/F2.asc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ncols 20
22
nrows 20
3-
xllcorner 110
4-
yllcorner 110
3+
xllcorner 0
4+
yllcorner 0
55
cellsize 5
66
NODATA_value -1
77
20 20 20 20 20 20 20 20 20 21 21 21 21 21 21 21 21 21 21 21

openudm/Tiles/F2R.asc

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@ xllcorner 0
44
yllcorner 0
55
cellsize 5
66
NODATA_value -1
7+
20 20 20 20 20 20 20 20 20 21 21 21 21 21 21 21 21 21 21 21
8+
20 20 22 22 22 22 22 22 20 21 21 21 20 20 20 20 20 20 20 21
9+
20 20 22 22 22 22 22 20 20 21 21 21 20 20 20 20 20 20 20 21
10+
20 20 22 22 22 22 22 20 20 21 21 21 20 20 21 20 21 20 20 21
11+
20 20 22 22 22 22 22 20 20 21 21 21 20 20 20 20 20 20 20 21
12+
20 20 22 22 22 22 22 21 21 21 21 21 20 20 21 20 21 20 20 21
13+
20 20 22 22 22 22 22 20 20 21 21 21 20 20 20 20 20 20 20 21
14+
20 20 22 22 22 22 22 22 20 21 21 21 20 20 20 20 20 20 20 21
15+
20 20 20 20 20 20 20 20 20 21 21 21 21 21 21 21 21 21 21 21
16+
21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21
17+
21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21
718
21 21 21 21 21 21 21 21 21 21 21 20 20 20 20 20 20 20 20 20
8-
21 20 20 20 20 20 20 20 21 21 21 20 20 20 20 20 20 20 20 20
919
21 20 20 20 20 20 20 20 21 21 21 20 22 22 22 22 22 22 22 20
10-
21 20 20 20 21 20 20 20 21 21 21 20 22 22 22 22 22 22 22 20
20+
21 20 20 20 20 20 20 20 21 21 21 20 22 22 22 22 22 22 22 20
21+
21 20 20 20 21 20 20 20 21 21 21 21 21 22 22 22 22 22 22 20
1122
21 20 20 21 20 21 20 20 21 21 21 20 22 22 22 22 22 22 22 20
12-
21 20 20 20 21 20 20 20 21 21 21 20 22 22 22 22 22 22 22 20
23+
21 20 20 20 21 20 20 20 21 21 21 20 20 22 22 22 22 22 22 20
1324
21 20 20 20 20 20 20 20 21 21 21 20 22 22 22 22 22 22 22 20
14-
21 20 20 20 20 20 20 20 21 21 21 20 22 20 21 20 20 20 22 20
15-
21 21 21 21 21 21 21 21 21 21 21 20 20 20 21 20 20 20 20 20
16-
21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21
17-
21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21
18-
20 20 20 20 20 21 20 20 20 21 21 21 21 21 21 21 21 21 21 21
19-
20 22 22 20 22 21 22 22 20 21 21 21 20 20 20 20 20 20 20 21
20-
20 22 22 22 22 22 22 22 20 21 21 21 20 20 20 20 20 20 20 21
21-
20 22 22 22 22 22 22 22 20 21 21 21 20 20 21 20 21 20 20 21
22-
20 22 22 22 22 22 22 22 20 21 21 21 20 20 20 20 20 20 20 21
23-
20 22 22 22 22 22 22 22 20 21 21 21 20 20 21 20 21 20 20 21
24-
20 22 22 22 22 22 22 22 20 21 21 21 20 20 20 20 20 20 20 21
25-
20 22 22 22 22 22 22 22 20 21 21 21 20 20 20 20 20 20 20 21
26-
20 20 20 20 20 20 20 20 20 21 21 21 21 21 21 21 21 21 21 21
25+
21 20 20 20 20 20 20 20 21 21 21 20 22 22 22 22 22 22 22 20
26+
21 21 21 21 21 21 21 21 21 21 21 20 20 20 20 20 20 20 20 20

openudm/Tiles/F3.asc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ncols 20
22
nrows 20
3-
xllcorner 220
4-
yllcorner 110
3+
xllcorner 0
4+
yllcorner 0
55
cellsize 5
66
NODATA_value -1
77
20 20 20 20 20 20 20 20 21 21 21 21 21 21 21 21 21 21 21 21

openudm/Tiles/F3R.asc

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@ xllcorner 0
44
yllcorner 0
55
cellsize 5
66
NODATA_value -1
7-
21 21 21 21 21 21 21 21 21 21 21 21 20 20 20 20 20 20 20 20
8-
21 21 21 20 20 20 21 21 21 21 21 21 20 22 22 22 22 22 22 20
9-
21 21 21 21 21 21 21 21 21 21 21 21 20 22 22 22 22 22 22 20
10-
21 21 21 21 20 20 21 21 21 21 21 21 20 22 22 22 22 22 22 20
11-
21 21 21 21 21 21 21 21 21 21 21 21 20 22 22 22 22 22 22 20
12-
21 21 21 20 20 21 21 21 21 21 21 21 20 22 22 22 22 22 22 20
13-
21 21 21 21 21 21 21 21 21 21 21 21 20 22 22 22 22 22 22 20
14-
21 21 21 20 20 20 21 21 21 21 21 21 20 22 22 22 22 22 22 20
7+
20 20 20 20 20 20 20 20 21 21 21 21 21 21 21 21 21 21 21 21
8+
20 22 22 22 22 22 22 22 21 21 21 21 21 20 20 20 20 20 20 21
9+
20 22 22 22 22 22 22 22 21 21 21 21 21 22 22 22 22 22 20 21
10+
20 22 22 22 22 22 22 22 21 21 21 21 21 22 22 22 22 22 20 21
11+
20 22 22 22 22 22 22 22 21 21 21 21 21 22 22 22 22 22 20 21
12+
20 22 22 22 22 22 22 22 21 21 21 21 21 22 22 22 22 22 20 21
13+
20 22 22 22 22 22 22 22 21 21 21 21 21 22 22 22 22 22 20 21
14+
20 20 20 20 20 20 20 20 21 21 21 21 21 20 20 20 20 20 20 21
1515
21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21
1616
21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21
1717
21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21
18-
20 20 20 20 20 20 21 21 21 21 21 21 21 21 21 21 21 21 21 21
19-
20 22 22 22 22 22 21 21 21 21 21 21 21 21 21 21 21 21 21 21
20-
20 22 22 22 22 22 22 20 21 21 21 21 20 22 22 22 22 22 20 21
21-
20 22 22 22 22 22 22 20 21 21 21 21 20 22 22 22 22 22 20 21
22-
20 22 22 22 22 22 22 20 21 21 21 21 20 22 22 22 22 22 20 21
23-
20 22 22 22 22 22 22 20 21 21 21 21 20 22 22 22 22 22 20 21
24-
20 22 22 22 22 22 22 20 21 21 21 21 20 22 22 22 22 22 20 21
25-
20 22 22 22 22 22 22 20 21 21 21 21 20 20 20 20 20 20 20 21
26-
20 20 20 20 20 20 20 20 21 21 21 21 21 21 21 21 21 21 21 21
18+
21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21
19+
21 21 21 21 21 21 21 21 21 21 21 21 21 20 20 20 20 20 20 20
20+
21 21 21 21 21 21 21 21 21 21 21 21 21 22 22 22 22 22 22 20
21+
21 20 21 20 21 21 21 20 21 21 21 20 22 22 22 22 22 22 22 20
22+
21 20 21 20 21 20 21 20 21 21 21 20 22 22 22 22 22 22 22 20
23+
21 20 21 21 21 20 21 20 21 21 21 20 22 22 22 22 22 22 22 20
24+
21 21 21 21 21 21 21 21 21 21 21 20 22 22 22 22 22 22 22 20
25+
21 21 21 21 21 21 21 21 21 21 21 20 22 22 22 22 22 22 22 20
26+
21 21 21 21 21 21 21 21 21 21 21 20 20 20 20 20 20 20 20 20

openudm/Tiles/F4.asc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ncols 20
22
nrows 20
3-
xllcorner 330
4-
yllcorner 110
3+
xllcorner 0
4+
yllcorner 0
55
cellsize 5
66
NODATA_value -1
77
21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21

openudm/Tiles/F4R.asc

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@ yllcorner 0
55
cellsize 5
66
NODATA_value -1
77
21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21
8-
21 20 20 20 20 20 20 20 21 21 21 21 20 20 20 20 20 20 20 21
9-
21 20 22 22 22 22 22 20 21 21 21 21 20 22 22 22 22 22 20 21
10-
21 20 22 22 22 22 22 20 21 21 21 21 20 22 22 22 22 22 20 21
11-
21 20 22 22 22 22 22 20 21 21 21 21 20 22 22 22 22 22 20 21
12-
21 20 22 22 22 22 22 20 21 21 21 21 22 22 22 22 22 22 22 21
13-
21 20 22 22 22 22 22 20 21 21 21 21 22 22 22 22 22 22 22 21
14-
21 20 20 22 22 22 20 20 21 21 21 21 22 22 21 21 21 22 22 21
8+
21 20 20 20 20 22 22 22 21 21 21 21 20 20 20 20 20 20 20 21
9+
21 20 22 22 22 22 22 22 21 21 21 21 20 20 20 20 20 20 20 21
10+
21 20 22 22 22 22 22 21 21 21 21 21 20 20 20 20 20 20 20 21
11+
21 20 22 22 22 22 22 21 21 21 21 21 20 20 20 20 20 20 20 21
12+
21 20 22 22 22 22 22 21 21 21 21 21 20 20 20 20 20 20 20 21
13+
21 20 22 22 22 22 22 22 21 21 21 21 20 20 20 20 20 20 20 21
14+
21 20 20 20 20 22 22 22 21 21 21 21 20 20 20 20 20 20 20 21
1515
21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21
1616
21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21
1717
21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21
18-
21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21
19-
20 20 22 22 22 22 22 20 20 21 21 21 20 20 20 20 20 20 20 21
20-
20 22 22 22 22 22 22 22 20 21 21 21 20 20 20 20 20 20 20 21
21-
20 22 22 22 22 22 22 22 20 21 21 21 20 20 20 20 20 20 20 21
22-
20 22 22 22 22 22 22 22 20 21 21 21 20 20 20 20 20 20 20 21
23-
20 22 22 22 22 22 22 22 20 21 21 21 20 20 20 20 20 20 20 21
24-
20 22 22 22 22 22 22 22 20 21 21 21 20 20 20 20 20 20 20 21
25-
20 22 22 22 22 22 22 22 20 21 21 21 20 20 20 20 20 20 20 21
26-
20 20 20 20 20 20 20 20 20 21 21 21 21 21 21 21 21 21 21 21
18+
21 21 21 21 21 21 21 21 21 21 21 21 20 20 20 20 20 20 20 20
19+
21 20 20 20 20 20 20 20 21 21 21 21 20 22 22 22 22 22 22 20
20+
21 20 22 22 22 22 22 20 21 21 21 21 22 22 22 22 22 22 22 20
21+
21 20 22 22 22 22 22 22 21 21 21 21 22 22 22 22 22 22 22 20
22+
21 20 22 22 22 22 22 22 21 21 21 21 22 22 22 22 22 22 22 20
23+
21 20 22 22 22 22 22 22 21 21 21 21 22 22 22 22 22 22 22 20
24+
21 20 22 22 22 22 22 20 21 21 21 21 22 22 22 22 22 22 22 20
25+
21 20 20 20 20 20 20 20 21 21 21 21 20 22 22 22 22 22 22 20
26+
21 21 21 21 21 21 21 21 21 21 21 21 20 20 20 20 20 20 20 20

setup.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def readme():
7979

8080
setup(
8181
name='openudm',
82-
version='5.0.5',
82+
version='5.0.6',
8383
author='James Virgo',
8484
description='Urban Development Model',
8585
long_description=readme(),
@@ -88,7 +88,9 @@ def readme():
8888
ext_modules=ext_modules,
8989
entry_points={'console_scripts':
9090
['raster_to_vector=openudm.tools:output_raster_to_vector',
91-
'generate_urban_fabric=openudm.UrbanFabricGenerator:urban_fabric_generator_entrypoint'
91+
'generate_urban_fabric=openudm.UrbanFabricGenerator:urban_fabric_generator_entrypoint',
92+
'ufg_coverage=openudm.UFGCoverageFromDensity:ufg_coverage_from_density_entrypoint',
93+
'ufg_fabric=openudm.UFGFabricFromCoverage:ufg_fabric_from_coverage_entrypoint'
9294
]},
9395
package_data={
9496
"openudm": ["Tiles/*"]

0 commit comments

Comments
 (0)