Merge pull request #39 from buildig/202107

Release 202107 changes.

Author: tormi

Diff for: convert.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -exu
 URL="https://www.thenbs.com/-/media/uk/files/xls/uniclass/2021-07/uniclass2015"
-rm *.csv
+rm -rf uniclass2015
 mkdir -p uniclass2015
 cp -a Uniclass2015_Tables.csv.txt Uniclass2015_Tables.csv
 

Diff for: uniclass2015/Uniclass2015.csv

@@ -115,6 +115,7 @@ Ac_15_10_32,15,10,32,,Geophysical surveying,10-10-75/135 Geophysical survey;,11.
 Ac_15_10_34,15,10,34,,Ground-penetrating radar surveying,,
 Ac_15_10_70,15,10,70,,Radio frequency location surveying,,
 Ac_15_10_80,15,10,80,,Satellite surveying,,
+Ac_15_10_88,15,10,88,,Thermal imaging surveying,,
 Ac_15_10_90,15,10,90,,Trial holes surveying,,
 Ac_15_15,15,15,,,Building services condition surveying,10-20-75/110 Engineering services survey;,11.1.1 Project team and design team consultants' fees (default);
 Ac_15_15_06,15,15,06,,Below-ground services surveying,10-10-95/110 Underground services survey;,11.1.2 Other consultants' fees (default);
@@ -691,7 +692,9 @@ Ac_65_65,65,65,,,Ventilation and air conditioning systems commissioning,,
 Ac_65_65_02,65,65,02,,Air systems commissioning,,
 Ac_70,70,,,,Electrical activities,,
 Ac_70_60,70,60,,,Electrical installations testing,,
+Ac_70_60_26,70,60,26,,Electrical equipment inspection and testing,,
 Ac_70_60_28,70,60,28,,Emergency lighting installations testing,,
+Ac_70_60_35,70,60,35,,Hazardous areas electrical wiring inspection and testing,,
 Ac_70_60_37,70,60,37,,High voltage electrical installations testing,,
 Ac_70_60_46,70,60,46,,Lighting installations testing,,
 Ac_70_60_47,70,60,47,,Lightning protection installations testing,,

Diff for: uniclass2015/Uniclass2015_Ac.csv

@@ -1,4 +1,7 @@
 Code,Group,Sub group,Section,Object,Title,NBS Code,NRM
+EF_15,15,,,,Earthworks and remediation ,,
+EF_15_10,15,10,,,Groundworks and earthworks,,
+EF_15_30,15,30,,,"Remediation, repair and renovation",,
 EF_20,20,,,,Structural elements,,
 EF_20_05,20,05,,,Substructure,,
 EF_20_05_30,20,05,30,,Foundations,,
@@ -11,6 +14,7 @@ EF_20_10_80,20,10,80,,Solid structures,,
 EF_20_50,20,50,,,Bridge structures,,
 EF_20_50_01,20,50,01,,Abutments,,
 EF_20_50_07,20,50,07,,Bearings,,
+EF_20_50_10,20,50,10,,Bridge decks,,
 EF_20_50_64,20,50,64,,Piers,,
 EF_20_50_82,20,50,82,,Span,,
 EF_25,25,,,,Wall and barrier elements,,
@@ -25,7 +29,6 @@ EF_30_30,30,30,,,Decks,,
 EF_30_60,30,60,,,Pavements,,
 EF_30_60_60,30,60,60,,Pedestrian paving,,
 EF_30_60_95,30,60,95,,Vehicular paving,,
-EF_30_70,30,70,,,Bridge decks,,
 EF_35,35,,,,Stairs and ramps,,
 EF_35_10,35,10,,,Stairs,,
 EF_35_10_30,35,10,30,,External stairs,,
@@ -71,7 +74,7 @@ EF_55_05,55,05,,,Gas extraction and treatment,,
 EF_55_10,55,10,,,Liquid fuel extraction and treatment,,
 EF_55_15,55,15,,,Water extraction and treatment,,
 EF_55_20,55,20,,,Gas supply,,
-EF_55_30,55,30,,,Fire extinguishing supply,,
+EF_55_30,55,30,,,Fire-extinguishing supply,,
 EF_55_40,55,40,,,Steam supply,,
 EF_55_50,55,50,,,Liquid fuel supply,,
 EF_55_60,55,60,,,Process liquid supply,,

Diff for: uniclass2015/Uniclass2015_EF.csv

@@ -320,9 +320,11 @@ En_50_75_20,50,75,20,,Dewatering hubs,,
 En_50_75_26,50,75,26,,Effluent tanks,,
 En_50_75_30,50,75,30,,Final effluent pumping stations,,
 En_50_75_42,50,75,42,,Inter-stage effluent pumping stations,,
+En_50_75_68,50,75,68,,Pumping stations,,
 En_50_75_80,50,75,80,,Sludge treatment entities,,
 En_50_75_95,50,75,95,,Wastewater treatment entities,,
 En_50_75_96,50,75,96,,Wastewater storage structures,,
+En_50_75_97,50,75,97,,Wastewater treatment lagoons,,
 En_50_80,50,80,,,Dry waste treatment and disposal,,
 En_50_80_40,50,80,40,,Dry waste treatment structures,,
 En_50_80_70,50,80,70,,Dry waste disposal structures,,
@@ -349,7 +351,7 @@ En_55_15_75,55,15,75,,Raw water pumping stations,,
 En_55_20,55,20,,,Gas supply entities,,
 En_55_20_50,55,20,50,,Gas distribution structures,,
 En_55_20_60,55,20,60,,Gas distribution pipelines,,
-En_55_30,55,30,,,Fire extinguishing supply entities,,
+En_55_30,55,30,,,Fire-extinguishing supply entities,,
 En_55_40,55,40,,,Steam supply entities,,
 En_55_50,55,50,,,Liquid fuel supply entities,,
 En_55_50_20,55,50,20,,Fuel distribution pipelines,,
@@ -384,8 +386,8 @@ En_70_30,70,30,,,Electricity distribution and transmission entities,,
 En_70_30_18,70,30,18,,Electricity transmission pylons and lines,,
 En_70_30_26,70,30,26,,Extra-high-voltage sub-transmission substations,,
 En_70_30_28,70,30,28,,Extra-high-voltage transmission substations,,
-En_70_30_35,70,30,35,,High-voltage distribution substations,,
-En_70_30_45,70,30,45,,Low-voltage electricity substations,,
+En_70_30_35,70,30,35,,High-voltage distribution substations,05-80-10/123 Electricity substation;,
+En_70_30_45,70,30,45,,Low-voltage electricity substations,05-80-10/123 Electricity substation;,
 En_70_30_60,70,30,60,,Overhead power distribution lines,,
 En_70_30_90,70,30,90,,Underground electricity transmission lines,,
 En_75,75,,,,"Communications, security, safety and protection entities",,
@@ -442,8 +444,8 @@ En_80_45_08,80,45,08,,Bus parks,,
 En_80_45_11,80,45,11,,Car garaging entities,,
 En_80_45_17,80,45,17,,Coach parks,,
 En_80_45_20,80,45,20,,Cycle shelters,,
-En_80_45_55,80,45,55,,Multistorey vehicle parks,,
-En_80_45_85,80,45,85,,Surface vehicle parks,,
+En_80_45_55,80,45,55,,Multistorey vehicle parks,05-80-10/111 External car park;,
+En_80_45_85,80,45,85,,Surface vehicle parks,05-80-10/111 External car park;,
 En_80_45_89,80,45,89,,Truck parks,,
 En_80_45_92,80,45,92,,Underground vehicle parks,,
 En_80_50,80,50,,,Railway entities,,