Merge pull request #1854 from SEED-platform/1833-ulid-footprints

ULID, UBID, and Footprints
SEED-platform · Apr 9, 2019 · dc9ee91 · dc9ee91
2 parents d810c46 + f6882d2
commit dc9ee91
Show file tree

Hide file tree

Showing 46 changed files with 1,631 additions and 120 deletions.
diff --git a/locale/en_US/LC_MESSAGES/django.mo b/locale/en_US/LC_MESSAGES/django.mo
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
@@ -205,8 +205,8 @@ msgstr "Associated Tax Lot IDs"
 msgid "At least one of the following Property fields is required: Address Line 1, Custom ID 1, UBID, or PM Property ID."
 msgstr "At least one of the following Property fields is required: Address Line 1, Custom ID 1, UBID, or PM Property ID."
 
-msgid "At least one of the following Tax Lot fields is required: Address Line 1, Custom ID 1, or Jurisdiction Tax Lot ID."
-msgstr "At least one of the following Tax Lot fields is required: Address Line 1, Custom ID 1, or Jurisdiction Tax Lot ID."
+msgid "At least one of the following Tax Lot fields is required: Address Line 1, Custom ID 1, Jurisdiction Tax Lot ID, or ULID."
+msgstr "At least one of the following Tax Lot fields is required: Address Line 1, Custom ID 1, Jurisdiction Tax Lot ID, or ULID."
 
 #: seed/models/models.py:136
 msgid "Auditing"
@@ -339,6 +339,9 @@ msgstr "Commercial"
 msgid "Complete"
 msgstr "Complete"
 
+msgid "COMPLETE_AND_REFRESH"
+msgstr "Complete and Refresh Page"
+
 msgid "Compliance"
 msgstr "Compliance"
 
@@ -690,6 +693,9 @@ msgstr "Email Address:"
 msgid "end_date"
 msgstr "end_date"
 
+msgid "Energy"
+msgstr "Energy"
+
 msgid "Energy Alerts"
 msgstr "Energy Alerts"
 
@@ -699,6 +705,12 @@ msgstr "Energy data file"
 msgid "ENERGY STAR Score"
 msgstr "ENERGY STAR Score"
 
+msgid "ENERGY_TYPE_DISPLAY_CHOICE_PLACEHOLDER"
+msgstr "----Choose energy type----"
+
+msgid "ENERGY_UNIT_DISPLAY_CHOICE_PLACEHOLDER"
+msgstr "----Change display unit----"
+
 #: config/settings/common.py:214
 msgid "English"
 msgstr "English"
@@ -780,7 +792,7 @@ msgid "Field Name"
 msgstr "Field Name"
 
 msgid "FIELD_NAMES_FOR_MATCHING_ADVICE"
-msgstr "<span class=\"label label-info\">Field names for matching:</span> The following fields are used by SEED to match records: <strong>Jurisdiction Tax Lot ID</strong>, <strong>PM Property ID</strong>, <strong>Custom ID 1</strong>, <strong>Address Line 1</strong>, and <strong>UBID</strong>. If there are fields in a datafile mapped to these names, the program will attempt to match on those same names in existing records."
+msgstr "<span class=\"label label-info\">Field names for matching:</span> The following fields are used by SEED to match records: <strong>Jurisdiction Tax Lot ID</strong>, <strong>PM Property ID</strong>, <strong>Custom ID 1</strong>, <strong>Address Line 1</strong>, <strong>UBID</strong>, and <strong>ULID</strong>. If there are fields in a datafile mapped to these names, the program will attempt to match on those same names in existing records."
 
 msgid "FIELDS NEEDED TO MAKE MATCHES:"
 msgstr "FIELDS NEEDED TO MAKE MATCHES:"
@@ -889,6 +901,9 @@ msgstr "gray"
 msgid "green"
 msgstr "green"
 
+msgid "GREENBUTTON_CONTENTS_TITLE"
+msgstr "Confirm GreenButton File Contents"
+
 msgid "Gross Floor Area"
 msgstr "Gross Floor Area"
 
@@ -951,6 +966,9 @@ msgstr "Include in your Tax Lot List all tax lots shared with you."
 msgid "INTERNAL"
 msgstr "INTERNAL"
 
+msgid "Interval"
+msgstr "Interval"
+
 msgid "INVALID_EXTENSION_ALERT"
 msgstr "<strong>Sorry!</strong> SEED doesn't currently support that file format. Only <strong>.csv</strong>, <strong>.xls</strong>, <strong>.xlsx</strong>, and <strong>.xml</strong> files are supported."
 
@@ -1208,6 +1226,12 @@ msgstr "Merged properties"
 msgid "Merged tax lots"
 msgstr "Merged tax lots"
 
+msgid "METER_DISPLAY_SETTINGS_TITLE"
+msgstr "Meter energy display units (change one at a time)"
+
+msgid "METER_READING_COUNTS_TITLE"
+msgstr "Meter Reading Counts"
+
 msgid "Min"
 msgstr "Min"
 
@@ -1424,6 +1448,9 @@ msgstr "Pairing Settings"
 msgid "Parent ID"
 msgstr "Parent ID"
 
+msgid "PARSED_ENERGY_TYPES_AND_UNITS_TITLE"
+msgstr "Parsed Energy Types and Units"
+
 #: seed/landing/forms.py:20
 msgid "Password"
 msgstr "Password"
@@ -1491,6 +1518,15 @@ msgstr "PM Property ID"
 msgid "PM Release Date"
 msgstr "PM Release Date"
 
+msgid "PM_METER_IMPORT_BUTTON"
+msgstr "Upload Portfolio Manager Meter Usage"
+
+msgid "PM_METER_IMPORT_NO_ASSOCIATION"
+msgstr "Unable to Import - No associations to previously imported properties"
+
+msgid "PM_METER_IMPORT_RESULTS"
+msgstr "Portfolio Manager Meter Import Results"
+
 msgid "Postal Code (Property)"
 msgstr "Postal Code (Property)"
 
@@ -1800,6 +1836,9 @@ msgstr "Select the type of file(s) you would like to add to"
 msgid "Select which columns to include in the list:"
 msgstr "Select which columns to include in the list:"
 
+msgid "SELECT_DATA_SET_TITLE"
+msgstr "Select Data Set"
+
 msgid "SELECT_THE_TYPE_OF_FILE_TO_ADD_TO_DATASET"
 msgstr "Select the type of file(s) you would like to add to {dataset_name}."
 
@@ -2075,6 +2114,9 @@ msgstr "The Standard Energy Efficiency Data (SEED)™ Platform is a software app
 msgid "There is also a link to the SEED-Platform Users forum, where you can connect with other users."
 msgstr "There is also a link to the SEED-Platform Users forum, where you can connect with other users."
 
+msgid "THERMAL_CONV_ASSUMPTION_TITLE"
+msgstr "Thermal Conversion Assumption"
+
 msgid "This cycle name is already taken."
 msgstr "This cycle name is already taken."
 
@@ -2173,9 +2215,24 @@ msgstr "Upload your energy data file(s)"
 msgid "Upload your energy data."
 msgstr "Upload your energy data."
 
+msgid "UPLOAD_COMPLETE_TITLE"
+msgstr "Upload Complete"
+
+msgid "UPLOAD_FILE"
+msgstr "Upload File"
+
+msgid "UPLOAD_GB_DATA_BUTTON"
+msgstr "Upload GreenButton Data"
+
+msgid "UPLOAD_PM_READINGS_MODAL_TITLE"
+msgstr "Upload Portfolio Manager Meter Readings"
+
 msgid "uploading file"
 msgstr "uploading file"
 
+msgid "UPLOADING_FILE_TITLE"
+msgstr "Uploading File"
+
 msgid "UPLOADING_PROGRESS"
 msgstr "Uploading <strong>{dataset_filename}</strong>"
 

diff --git a/locale/fr_CA/LC_MESSAGES/django.mo b/locale/fr_CA/LC_MESSAGES/django.mo
diff --git a/locale/fr_CA/LC_MESSAGES/django.po b/locale/fr_CA/LC_MESSAGES/django.po
@@ -206,8 +206,8 @@ msgstr "IDs des lots d'impôt associé"
 msgid "At least one of the following Property fields is required: Address Line 1, Custom ID 1, UBID, or PM Property ID."
 msgstr "Au moins un des champs de propriété suivants est requis: Adresse ligne 1, personnalisée ID 1, UBID ou PM ID de Propriété."
 
-msgid "At least one of the following Tax Lot fields is required: Address Line 1, Custom ID 1, or Jurisdiction Tax Lot ID."
-msgstr "Au moins l'un des domaines fiscal Lot suivants est requis: Adresse ligne 1, sur mesure Id 1 ou juridiction fiscale Lot Id."
+msgid "At least one of the following Tax Lot fields is required: Address Line 1, Custom ID 1, Jurisdiction Tax Lot ID, or ULID."
+msgstr "Au moins l'un des domaines fiscal Lot suivants est requis: Adresse ligne 1, sur mesure Id 1, juridiction fiscale Lot Id, ou ULID."
 
 #: seed/models/models.py:136
 msgid "Auditing"
@@ -342,6 +342,9 @@ msgstr "Commercial"
 msgid "Complete"
 msgstr "Complète"
 
+msgid "COMPLETE_AND_REFRESH"
+msgstr "Complétez et Actualisez la Page"
+
 msgid "Compliance"
 msgstr "Conformité"
 
@@ -694,6 +697,9 @@ msgstr "Adresse e-mail:"
 msgid "end_date"
 msgstr "date de fin"
 
+msgid "Energy"
+msgstr "Énergie"
+
 msgid "Energy Alerts"
 msgstr "Alertes énergétiques"
 
@@ -703,6 +709,12 @@ msgstr "Fichier de données d'énergie"
 msgid "ENERGY STAR Score"
 msgstr "Compte ENERGY STAR"
 
+msgid "ENERGY_TYPE_DISPLAY_CHOICE_PLACEHOLDER"
+msgstr "---- Choisissez le type d'énergie ----"
+
+msgid "ENERGY_UNIT_DISPLAY_CHOICE_PLACEHOLDER"
+msgstr "---- Changer l'unité d'affichage ----"
+
 #: config/settings/common.py:214
 msgid "English"
 msgstr "Anglais"
@@ -784,7 +796,7 @@ msgid "Field Name"
 msgstr "Nom de champ"
 
 msgid "FIELD_NAMES_FOR_MATCHING_ADVICE"
-msgstr "<span class=\"label label-info\">Noms de zone pour l'appariement:</span> Les champs suivants sont utilisés par SEED pour faire correspondre les enregistrements: <strong>Juridiction Numéro de lot fiscal</strong>, <strong>Numéro de propriété PM</strong>, <strong>ID personnalisé 1</strong>, <strong>Ligne d'adresse 1</strong>, et <strong>UBID</strong>. Si des champs dans un fichier de données sont mappés à ces noms, le programme tentera de faire correspondre ces mêmes noms dans les enregistrements existants."
+msgstr "<span class=\"label label-info\">Noms de zone pour l'appariement:</span> Les champs suivants sont utilisés par SEED pour faire correspondre les enregistrements: <strong>Juridiction Numéro de lot fiscal</strong>, <strong>Numéro de propriété PM</strong>, <strong>ID personnalisé 1</strong>, <strong>Ligne d'adresse 1</strong>, <strong>UBID</strong>, et <strong>ULID</strong>. Si des champs dans un fichier de données sont mappés à ces noms, le programme tentera de faire correspondre ces mêmes noms dans les enregistrements existants."
 
 msgid "FIELDS NEEDED TO MAKE MATCHES:"
 msgstr "CHAMPS NÉCESSAIRES POUR ÉTABLIR DES CORRESPONDANCES:"
@@ -893,6 +905,9 @@ msgstr "gris"
 msgid "green"
 msgstr "vert"
 
+msgid "GREENBUTTON_CONTENTS_TITLE"
+msgstr "Confirmer le contenu du fichier GreenButton"
+
 msgid "Gross Floor Area"
 msgstr "Surface brute"
 
@@ -955,6 +970,9 @@ msgstr "Inclure dans votre Liste de Lots d'Impôt tous les lots d'impôt partag
 msgid "INTERNAL"
 msgstr "INTERNE"
 
+msgid "Interval"
+msgstr "Intervalle"
+
 msgid "INVALID_EXTENSION_ALERT"
 msgstr "<strong>Désolée!</strong> SEED ne supporte actuellement pas ce format de fichier. Seuls les fichiers <strong>.csv</strong>, <strong>.xls</strong>, <strong>.xlsx</strong>, et <strong>.xml</strong> sont pris en charge."
 
@@ -1213,6 +1231,12 @@ msgstr "Propriétés fusionnées"
 msgid "Merged tax lots"
 msgstr "Lots d'impôt fusionnés"
 
+msgid "METER_DISPLAY_SETTINGS_TITLE"
+msgstr "Compteur d'énergie d'affichage (changer un à la fois)"
+
+msgid "METER_READING_COUNTS_TITLE"
+msgstr "Compte de Relevé de Compteur"
+
 msgid "Min"
 msgstr "Min"
 
@@ -1429,6 +1453,9 @@ msgstr "Paramètres de jumelage"
 msgid "Parent ID"
 msgstr "ID du Parent"
 
+msgid "PARSED_ENERGY_TYPES_AND_UNITS_TITLE"
+msgstr "Types d'énergie et unités analysées"
+
 #: seed/landing/forms.py:20
 msgid "Password"
 msgstr "Mot de passe"
@@ -1496,6 +1523,15 @@ msgstr "ID de Propriété PM"
 msgid "PM Release Date"
 msgstr "PM Date de sortie"
 
+msgid "PM_METER_IMPORT_BUTTON"
+msgstr "Consommation d'énergie d'importation de Portfolio Manager"
+
+msgid "PM_METER_IMPORT_NO_ASSOCIATION"
+msgstr "Importation impossible - Aucune association à des propriétés précédemment importées"
+
+msgid "PM_METER_IMPORT_RESULTS"
+msgstr "Résultats d'importation de Portfolio Manager"
+
 msgid "Postal Code (Property)"
 msgstr "Code postal (propriété)"
 
@@ -1805,6 +1841,9 @@ msgstr "Sélectionnez le type de fichier (s) que vous souhaitez ajouter à"
 msgid "Select which columns to include in the list:"
 msgstr "Sélectionnez les colonnes à inclure dans la liste:"
 
+msgid "SELECT_DATA_SET_TITLE"
+msgstr "Sélectionner un ensemble de données"
+
 msgid "SELECT_THE_TYPE_OF_FILE_TO_ADD_TO_DATASET"
 msgstr "Sélectionnez le type de fichier(s) que vous souhaitez ajouter à {dataset_name}."
 
@@ -2080,6 +2119,9 @@ msgstr "La Plate-forme SEED™ (Standard Energy Efficiency Data) est une applica
 msgid "There is also a link to the SEED-Platform Users forum, where you can connect with other users."
 msgstr "Il y a aussi un lien vers le forum SEED-Platform Users, où vous pouvez vous connecter avec d'autres utilisateurs."
 
+msgid "THERMAL_CONV_ASSUMPTION_TITLE"
+msgstr "Choix de Conversion Thermique"
+
 msgid "This cycle name is already taken."
 msgstr "Ce nom de cycle est déjà pris."
 
@@ -2179,9 +2221,24 @@ msgstr "Téléchargez vos fichier(s) de données d'énergie"
 msgid "Upload your energy data."
 msgstr "Téléchargez vos données d'énergie."
 
+msgid "UPLOAD_COMPLETE_TITLE"
+msgstr "Téléchargement Complet"
+
+msgid "UPLOAD_FILE"
+msgstr "Téléverser un Fichier"
+
+msgid "UPLOAD_GB_DATA_BUTTON"
+msgstr "Importer des Données GreenButton"
+
+msgid "UPLOAD_PM_READINGS_MODAL_TITLE"
+msgstr "Importer des lectures de compteur Portfolio Manager"
+
 msgid "uploading file"
 msgstr "téléchargeant le fichier"
 
+msgid "UPLOADING_FILE_TITLE"
+msgstr "Téléchargement de Fichier"
+
 msgid "UPLOADING_PROGRESS"
 msgstr "Téléchargeant <strong>{dataset_filename}</strong>"
 

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -54,6 +54,8 @@ xmltodict==0.11.0
 requests==2.20.0
 lxml==4.2.5
 probablepeople==0.5.4
+# Parsing and managing geojson data (this is only used in managed tasks at the moment)
+geojson==2.4.1
 
 # pnnl/buildingid
 -e git+https://github.com/SEED-platform/buildingid.git@fd9067f70ae40f6ae3bf2bad6e31b5d2a9e8b150#egg=buildingid

diff --git a/seed/data_importer/equivalence_partitioner.py b/seed/data_importer/equivalence_partitioner.py
@@ -116,6 +116,7 @@ def make_taxlotstate_equivalence(kls):
         """
         tax_lot_equivalence_fields = [
             ("jurisdiction_tax_lot_id", "custom_id_1"),
+            ("ulid",),
             ("custom_id_1",),
             ("normalized_address",)
         ]