Merge pull request #17 from SPTKL/master

ishiland · web-flow · commit ae7757075983 · 2019-03-01T09:27:03.000-05:00
Fixing census tract formatting issue
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,8 @@
 /__pycache__/
 /dist/
 /build/
+/venv/
+/.vscode/
 MANIFEST
 cover
 .coverage
diff --git a/geosupport/function_info/work_area_layouts/output/1B.csv b/geosupport/function_info/work_area_layouts/output/1B.csv
@@ -49,11 +49,11 @@ Feature Type Code,,1,211,211,,,
 Segment Type Code,,1,212,212,,,
 Alley or Cross Street List Flag,,1,213,213,A - Alley Split X - Cross Street List Modified,,
 Coincidence Segment Count,,1,214,214,,,
-1990 Census Tract,,6,218,223,,,
-2010 Census Tract,,6,224,229,,,
+1990 Census Tract,,6,218,223,,,CT
+2010 Census Tract,,6,224,229,,,CT
 2010 Census Block,,4,230,233,,,
 2010 Census Block Suffix,,1,234,234,Not Implemented,,
-2000 Census Tract,,6,235,240,,,
+2000 Census Tract,,6,235,240,,,CT
 2000 Census Block,,4,241,244,,,
 2000 Census Block Suffix,,1,245,245,,,
 Neighborhood Tabulation Area (NTA),,4,246,249,,,
diff --git a/geosupport/function_info/work_area_layouts/output/1_1E.csv b/geosupport/function_info/work_area_layouts/output/1_1E.csv
@@ -52,11 +52,11 @@ Segment Type Code,1,212,212,,,,
 Alley or Cross Street List Flag,1,213,213,A - Alley Split X - Cross Street ,,,
 Coincidence Segment Count,1,214,214,,,,
 Borough of Census Tract,1,217,217,Internal,,,
-1990 Census Tract,6,218,223,,,,
-2010 Census Tract,6,224,229,,,,
+1990 Census Tract,6,218,223,,,,CT
+2010 Census Tract,6,224,229,,,,CT
 2010 Census Block,4,230,233,,,,
 2010 Census Block Suffix,1,234,234,Not Implemented,,,
-2000 Census Tract,6,235,240,,,,
+2000 Census Tract,6,235,240,,,,CT
 2000 Census Block,4,241,244,,,,
 2000 Census Block Suffix,1,245,245,,,,
 Neighborhood Tabulation Area (NTA),4,246,249,,,,
diff --git a/geosupport/function_info/work_area_layouts/output/2.csv b/geosupport/function_info/work_area_layouts/output/2.csv
@@ -38,8 +38,8 @@ Fire Battalion,2,128,129,,,,
 Fire Company Type,1,130,130,,,,
 Fire Company Number,3,131,133,,,,
 Community School District,2,134,135,,,,
-2010 Census Tract,6,136,141,,,,
-1990 Census Tract,6,142,147,,,,
+2010 Census Tract,6,136,141,,,,CT
+1990 Census Tract,6,142,147,,,,CT
 List of Pairs of Level Codes,10,148,157,Not Implemented,,,
 Police Patrol Borough,2,158,159,,,,
 Assembly District,2,160,161,,,,
@@ -49,7 +49,7 @@ Civil Court District,2,166,167,,,,
 City Council District,2,168,169,,,,
 CD Eligibility,1,170,170,,,,
 Distance Between Duplicate Intersections,5,171,175,,,,
-2000 Census Tract,6,176,181,,,,
+2000 Census Tract,6,176,181,,,,CT
 Health Center District,2,182,183,,,,
 Sanitation District,3,184,186,,,,
 Sanitation Section/Subsection,2,187,188,,,,
diff --git a/geosupport/function_info/work_area_layouts/output/2W.csv b/geosupport/function_info/work_area_layouts/output/2W.csv
@@ -38,8 +38,8 @@ Fire Battalion,2,128,129,,,,
 Fire Company Type,1,130,130,,,,
 Fire Company Number,3,131,133,,,,
 Community School District,2,134,135,,,,
-2010 Census Tract,6,136,141,,,,
-1990 Census Tract,6,142,147,,,,
+2010 Census Tract,6,136,141,,,,CT
+1990 Census Tract,6,142,147,,,,CT
 List of Pairs of Level Codes,10,148,157,Not Implemented,,,
 Police Patrol Borough,2,158,159,,,,
 Assembly District,2,160,161,,,,
@@ -49,7 +49,7 @@ Civil Court District,2,166,167,,,,
 City Council District,2,168,169,,,,
 CD Eligibility,1,170,170,,,,
 Distance Between Duplicate Intersections,5,171,175,,,,
-2000 Census Tract,6,176,181,,,,
+2000 Census Tract,6,176,181,,,,CT
 Health Center District,2,182,183,,,,
 Sanitation District,3,184,186,,,,
 Sanitation Section/Subsection,2,187,188,,,,
diff --git a/geosupport/function_info/work_area_layouts/output/3.csv b/geosupport/function_info/work_area_layouts/output/3.csv
@@ -51,11 +51,11 @@ Election District (ED),3,245,247,,LEFT SIDE:,,
 Assembly District (AD),2,248,249,,LEFT SIDE:,,
 Police Patrol Borough,2,250,251,,LEFT SIDE:,,
 Borough Code,1,253,253,,LEFT SIDE:,,
-1990 Census Tract,6,254,259,,LEFT SIDE:,,
-2010 Census Tract,6,260,265,,LEFT SIDE:,,
+1990 Census Tract,6,254,259,,LEFT SIDE:,,CT
+2010 Census Tract,6,260,265,,LEFT SIDE:,,CT
 2010 Census Block,4,266,269,,LEFT SIDE:,,
 2010 Census Block Suffix,1,270,270,Not Implemented,LEFT SIDE:,,
-2000 Census Tract,6,271,276,,LEFT SIDE:,,
+2000 Census Tract,6,271,276,,LEFT SIDE:,,CT
 2000 Census Block Suffix,1,281,281,,LEFT SIDE:,,
 Neighborhood Tabulation Area (NTA),4,289,292,,LEFT SIDE:,,
 RIGHT SIDE:,142,301,442,,,,
diff --git a/geosupport/function_info/work_area_layouts/output/3C.csv b/geosupport/function_info/work_area_layouts/output/3C.csv
@@ -50,11 +50,11 @@ Election District (ED),3,245,247,,,,
 Assembly District (AD),2,248,249,,,,
 Police Patrol Borough,2,250,251,,,,
 Borough Code,1,253,253,Internal Use,,,
-1990 Census Tract,6,254,259,,,,
-2010 Census Tract,6,260,265,,,,
+1990 Census Tract,6,254,259,,,,CT
+2010 Census Tract,6,260,265,,,,CT
 2010 Census Block,4,266,269,,,,
 2010 Census Block Suffix,1,270,270,Not Implemented,,,
-2000 Census Tract,6,271,276,,,,
+2000 Census Tract,6,271,276,,,,CT
 2000 Census Block,4,277,280,,,,
 2000 Census Block Suffix,1,281,281,,,,
 Neighborhood Tabulation Area (NTA),4,289,292,,,,
diff --git a/geosupport/io.py b/geosupport/io.py
@@ -87,6 +87,9 @@ def f(v):
     'intersections': list_of_workareas('INTERSECTION', 55),
     'node_list': list_of_nodes,
 
+    # Census Tract formatter
+    'CT': lambda v: '' if v is None else v.replace(' ', '0'),
+    
     # Default formatter
     '': lambda v: '' if v is None else str(v).strip().upper()
 }

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,9 @@ def f(v):`
`87`	`87`	`'intersections': list_of_workareas('INTERSECTION', 55),`
`88`	`88`	`'node_list': list_of_nodes,`
`89`	`89`
	`90`	`+ # Census Tract formatter`
	`91`	`+ 'CT': lambda v: '' if v is None else v.replace(' ', '0'),`
	`92`	`+`
`90`	`93`	`# Default formatter`
`91`	`94`	`'': lambda v: '' if v is None else str(v).strip().upper()`
`92`	`95`	`}`