account for superflous whitespace in codes

Author: drkane

findthatpostcode/commands/codes.py

@@ -43,6 +43,14 @@ def process_date(value, date_format="%d/%m/%Y"):
     return datetime.datetime.strptime(value, date_format)
 
 
+def process_str(value):
+    if value in ["", "n/a"]:
+        return None
+    if not isinstance(value, str):
+        return value
+    return value.strip()
+
+
 def process_int(value):
     if value in ["", "n/a"]:
         return None
@@ -202,7 +210,7 @@ def import_chd(url=None, es_index=AREA_INDEX, encoding=DEFAULT_ENCODING):
                     "date_start": process_date(area["OPER_DATE"][0:10], "%d/%m/%Y"),
                     "date_end": process_date(area["TERM_DATE"][0:10], "%d/%m/%Y"),
                     "parent": area["PARENTCD"] if area["PARENTCD"] else None,
-                    "entity": area["ENTITYCD"],
+                    "entity": process_str(area["ENTITYCD"]),
                     "owner": area["OWNER"],
                     "active": area["STATUS"] == "live",
                     "areaehect": process_float(area["AREAEHECT"]),
@@ -213,7 +221,7 @@ def import_chd(url=None, es_index=AREA_INDEX, encoding=DEFAULT_ENCODING):
                     "predecessor": [],
                     "successor": [],
                     "equivalents": {},
-                    "type": ENTITIES.get(area["ENTITYCD"]),
+                    "type": ENTITIES.get(process_str(area["ENTITYCD"])),
                 }
             )
 

findthatpostcode/controllers/areas.py

@@ -18,6 +18,7 @@ class Areatype(Controller):
     areatypes = AREA_TYPES
 
     def __init__(self, id, data=None):
+        id = id.strip()
         if not data:
             data = self.areatypes.get(id)
         super().__init__(id, data)
@@ -51,6 +52,7 @@ def get_name(self, country=None):
 
     @classmethod
     def get_from_es(cls, id, es, es_config=None, full=False):
+        id = id.strip()
         if cls.areatypes.get(id):
             return cls(id)
         return super().get_from_es(id, es, es_config=es_config)

findthatpostcode/templates/area.html.j2

@@ -7,7 +7,7 @@
 {% set subtitle = "<span class='bg-red white pa2 mt2 dib'>INACTIVE</span> {}".format(result.relationships.areatype.get_name(result.id)) %}
 {% endif %}
 {% if result.attributes.ctry_name and result.attributes.ctry_name != result.attributes.name %}
-{% set subtitle = subtitle + " in " + result.attributes.ctry_name %}
+{% set subtitle = (subtitle or "Area") + " in " + result.attributes.ctry_name %}
 {% endif %}
 {% set example_postcodes = result.relationships.example_postcodes %}
 {% extends "base.html.j2" %}
@@ -19,6 +19,7 @@
 {% block content %}
 <div class="cf">
   <div class="fl w-third-l w-100 pr4 f5">
+    {{ result.relationships.areatype }}
     {% if result.has_boundary %}
     <div class="mb3">
       <a href="{{ url_for('areas.get_area_boundary', areacodes=result.id) }}" class="link blue underline-hover">Boundary