Merge pull request #146 from BuildingSync/Updated-BEDES-Mapping

Update BEDES Mapping

Author: haneslinger

bsyncviewer/lib/bedes/bedes_parser.py

@@ -118,7 +118,7 @@ def _cache_terms(self):
                                 # print("DEF: {}".format(the_def['#text'] + ' ' + the_def['a']['#text']))
                             elif 'span' in the_def.keys():
                                 # edge case: <span>. grab span.text element
-                                assembled['Term-Definition'] = the_def['span']['#text']
+                                assembled['Term-Definition'] = the_def['span']
                                 # print("DEF: {}".format(the_def['span']['#text']))
                         else:
                             assembled['Term-Definition'] = the_def

bsyncviewer/lib/bedes/v2.5/bedes_online_dictionary_uuid-lo.xml

@@ -0,0 +1,59 @@
+BSync String,BEDES String
+Addresses,Address
+Applicable Start Time,Interval Start Date
+Applicable End Time,Interval End Date
+Asset Score,Commercial Building Energy Asset Score
+Billpayer,Customer
+Businesses,Business
+Calculation Method,Cost Effectiveness Screening Method
+Categories,Category
+CDD,Cooling degree days
+CMU,Concrete Masonry Unit
+DB,Dry Bulb
+Deliveries,Delivery
+Desuperheat,Desuperheater
+Dir,Directional
+ENERGYSTAR,ENERGY STAR Portfolio Manager
+EWT,Entering Water Temperature
+Funding From Incentives,Incentives
+Door Glazed Area Fraction,Percent Glazing
+HDD,Heating Degree Days
+HPWH,Heat Pump Water Heater
+Street Additional Info,Address Line 2
+Interruptibility,Interruptible
+Latest,Most Recent
+Clothes Washer Loader Type,Laundry Configuration
+Lowered,Tuning
+LWT,Leaving Water Temperature
+Maxk,Max
+NP,NPV
+Street Number Numeric,Address Number
+OA,Outside Air
+OM,Operation Maintanance
+Postal Code Plus4,ZIP Plus 4
+PM,ENERGY STAR Portfolio Manager
+Price Escalation Rate,Escalation Rate
+Program,Assessment Program
+Publicly,Public
+Pumping,Pump
+PV,Photovoltaic
+Qualification,Credential
+Retrocommissions,Retrocommissioning
+Role,Type
+Setup,Reset Routine
+Shelves,Shelf
+Roof Slope,Roof Shape
+Sourced,Source
+Time Stamp,Time
+Story,Floor
+Tightness,Air Infiltration Description
+TOU,Time Of Use
+Utilities,Utility
+Vof,of
+Yearof,Year Of
+Street Address,Address Line 1
+Auditor,Energy Auditor
+ID,Identifier
+Maxk Wh,Max kWh
+Maxk W,Max kW
+Energy Storage,Energy Storage Technology

bsyncviewer/lib/bedes/v2.5/bedes_online_dictionary_uuid-terms.xml

@@ -47,9 +47,10 @@ def handle(self, *args, **options):
         save_to_db = options['save_to_db']
 
         if save_to_db:
-            self.stdout.write('Reparsing BEDES data and Saving BEDES mappings to database')
+            self.stdout.write('Saving BEDES mappings to database from already generated mapping files.')
+            # if save_to_db is True, save CSV files to DB (no reparse)
             # if save_to_db is True, save CSV files to DB (always reparse just in case)
-            self.parse(bedes_version, schema_version)
+            # self.parse(bedes_version, schema_version)
             self.save_mappings_to_database(bedes_version, schema_version)
         else:
             # do the parsing (only)
@@ -720,13 +721,14 @@ def save_mappings_to_database(self, bedes_version, schema_version):
             # get_or_create here b/c CSV structure maps schema attributes to bedes terms
             # there could be multiple listings of the same bedes term.
             if term['distance'] != "":
-                BedesEnumeration.objects.get_or_create(
-                    content_uuid=term['bedes_content_uuid'],
-                    term=term['bedes_term'],
-                    definition=term['bedes_definition'],
-                    url=term['bedes_url'],
-                    related_term_uuid=term['bedes_related_term_uuid']
+                bedes_enum, _ = BedesEnumeration.objects.get_or_create(
+                    content_uuid=term['bedes_content_uuid']
                 )
+                bedes_enum.term = term['bedes_term']
+                bedes_enum.definition = term['bedes_definition']
+                bedes_enum.url = term['bedes_url']
+                bedes_enum.related_term_uuid = term['bedes_related_term_uuid']
+                bedes_enum.save()
 
         # rewind
         csv_file.seek(0)

bsyncviewer/lib/bedes/v2.5/manual_mapping_table.csv

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.24 on 2021-12-28 19:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bsyncviewer', '0010_schema_enumerations_file'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='bedesenumeration',
+            name='term',
+            field=models.CharField(max_length=100),
+        ),
+    ]

bsyncviewer/management/commands/bedes.py

@@ -24,7 +24,7 @@ class BedesMapping(models.Model):
 # Bedes Enumeration
 class BedesEnumeration(models.Model):
     content_uuid = models.CharField(max_length=100, unique=True)
-    term = models.CharField(max_length=100, unique=True)
+    term = models.CharField(max_length=100)
     url = models.CharField(max_length=300)
     definition = models.TextField(blank=True, null=True)
     related_term_uuid = models.CharField(max_length=100, unique=False)