diff --git a/assets/.DS_Store b/assets/.DS_Store deleted file mode 100644 index bf1e5be..0000000 Binary files a/assets/.DS_Store and /dev/null differ diff --git a/dashboard/.DS_Store b/dashboard/.DS_Store deleted file mode 100644 index bbcf9e3..0000000 Binary files a/dashboard/.DS_Store and /dev/null differ diff --git a/sugartrail/base.py b/sugartrail/base.py index 9648983..3138145 100644 --- a/sugartrail/base.py +++ b/sugartrail/base.py @@ -68,7 +68,8 @@ class Network: 'n':self.n, 'link_type': None, 'node_type': None, - 'node': None}] + 'node': None + }] else: print(f"Officer with ID:{str(new_value)} not found") self._officer_id = None @@ -90,7 +91,8 @@ class Network: 'n':self.n, 'link_type': '', 'node_type': '', - 'node': ''}] + 'node': '' + }] self.companies = [dict(sugartrail.processing.flatten(company_info))] else: print(f"Company with ID:{str(new_value)} not found") @@ -106,11 +108,13 @@ class Network: def address(self, new_value): """address setter.""" self._address = new_value - self.addresses = [dict({'address': self._address, - 'n':self.n, - 'link_type': '', - 'node_type': '', - 'node': ''})] + self.addresses = [dict({ + 'address': self._address, + 'n':self.n, + 'link_type': '', + 'node_type': '', + 'node': '' + })] @property def file(self): @@ -254,9 +258,20 @@ class Network: # iterate through each path from selected company to seed company: for i, row in enumerate(network_link_type_rows): # insert end of path node: - path.insert(0, {'hop': row['n'], "type": "Company", "id": select_company, "node": row['company_name'], "node_type": row['link_type'], "link_id": row['node']}) + path.insert(0, { + 'hop': row['n'], + "type": "Company", + "id": select_company, + "node": row['company_name'], + "node_type": row['link_type'], + "link_id": row['node'] + }) # define search terms for locating connected nodes: - search_terms = [{'n': row['n']-1, 'node_type':row['node_type'], 'node':row['node']}] + search_terms = [{ + 'n': row['n']-1, + 'node_type':row['node_type'], + 'node':row['node'] + }] # iterate through degrees of seperation till origin is reached: for j in range(row['n']-1,-1,-1): for term in search_terms: @@ -265,41 +280,95 @@ class Network: select_rows = list(filter(lambda d: d.get('address') == term['node'] and d.get('n') == j, self.addresses)) for k, select_row in enumerate(select_rows): if select_row['n'] == 0: - origin = {'hop': j, "type": "Address", "id": select_row['address'], "node": select_row['address'], "node_type": "", "link_id": ""} + origin = { + 'hop': j, + "type": "Address", + "id": select_row['address'], + "node": select_row['address'], + "node_type": "", + "link_id": "" + } if origin not in path: path.insert(0, origin) break else: - item = {'hop': j, "type": "Address", "id": select_row['address'], "node": select_row['address'], "node_type": select_row['link_type'], "link_id": select_row['node']} + item = { + 'hop': j, + "type": "Address", + "id": select_row['address'], + "node": select_row['address'], + "node_type": select_row['link_type'], + "link_id": select_row['node'] + } if item not in path: path.insert(0, item) - search_terms.append({'n': j-1, 'node_type':select_row['node_type'], 'node':select_row['node']}) + search_terms.append({ + 'n': j-1, + 'node_type':select_row['node_type'], + 'node':select_row['node'] + }) elif term['node_type'] == "Company": select_rows = list(filter(lambda d: d.get('company_id') == term['node'] and d.get('n') == j, self.company_ids)) for l, select_row in enumerate(select_rows): if select_row['n'] == 0: - origin = {'hop': j, "type": "Company", "id": select_row['company_id'], "node": select_row['company_name'], "node_type": "", "link_id": ""} + origin = { + 'hop': j, + "type": "Company", + "id": select_row['company_id'], + "node": select_row['company_name'], + "node_type": "", + "link_id": "" + } if origin not in path: path.insert(0, origin) break else: - item = {'hop': j, "type": "Company", "id": select_row['company_id'], "node": select_row['company_name'], "node_type": select_row['link_type'], "link_id": select_row['node']} + item = { + 'hop': j, + "type": "Company", + "id": select_row['company_id'], + "node": select_row['company_name'], + "node_type": select_row['link_type'], + "link_id": select_row['node'] + } if item not in path: path.insert(0, item) - search_terms.append({'n': j-1, 'node_type':select_row['node_type'], 'node':select_row['node']}) + search_terms.append({ + 'n': j-1, + 'node_type':select_row['node_type'], + 'node':select_row['node'] + }) elif term['node_type'] == "Person": select_rows = list(filter(lambda d: d.get('officer_id') == term['node'] and d.get('n') == j, self.officer_ids)) for m, select_row in enumerate(select_rows): if select_row['link_type'] == 0: - origin = {'hop': j, "type": "Person", "id": select_row["officer_id"], "node": select_row['name'], "node_type": "", "link_id": ""} + origin = { + 'hop': j, + "type": "Person", + "id": select_row["officer_id"], + "node": select_row['name'], + "node_type": "", + "link_id": "" + } if origin not in path: path.insert(0, origin) break else: - item = {'hop': j, "type": "Person", "id": select_row["officer_id"], "node": str(select_row['name']), "node_type": str(select_row['link_type']), "link_id": select_row['node']} + item = { + 'hop': j, + "type": "Person", + "id": select_row["officer_id"], + "node": str(select_row['name']), + "node_type": str(select_row['link_type']), + "link_id": select_row['node'] + } if item not in path: path.insert(0, item) - search_terms.append({'n': j-1, 'node_type':select_row['node_type'], 'node':select_row['node']}) + search_terms.append({ + 'n': j-1, + 'node_type':select_row['node_type'], + 'node':select_row['node'] + }) else: print(f"{row['node_type']} is invalid node_type") break @@ -410,17 +479,16 @@ class Network: lower_n_officers = [officer['officer_id'] for officer in list(filter(lambda d: d.get('n') < network.n+1, network.officer_ids))] if officers: for officer in officers: - # if 'address' in officer: - # # check address not already in the network - # if sugartrail.processing.normalise_address(officer['address']) not in lower_n_addresses: - # network.link_type = "Officer Corresponance Address" - # new_address = {'address': sugartrail.processing.normalise_address(officer['address']), 'n':network.n+1, 'link_type':network.link_type, 'node_type': network.node_type, 'node': network.node} - # if new_address not in new_addresses: - # new_addresses.append(new_address) - # # check not already in the network if officer['links']['officer']['appointments'].split('/')[2] not in lower_n_officers: network.link_type = "Officer" - new_officer = {'officer_id': str(officer['links']['officer']['appointments'].split('/')[2]), 'name': sugartrail.processing.normalise_name(officer['name']), 'n':network.n+1, 'link_type':network.link_type, 'node_type': network.node_type, 'node': network.node} + new_officer = { + 'officer_id': str(officer['links']['officer']['appointments'].split('/')[2]), + 'name': sugartrail.processing.normalise_name(officer['name']), + 'n':network.n+1, + 'link_type':network.link_type, + 'node_type': network.node_type, + 'node': network.node + } if new_officer not in new_officers: new_officers.append(new_officer) if self.get_psc_correspondance_address: @@ -432,7 +500,13 @@ class Network: if "address" in person: network.link_type = "Person of Significant Control Address" if sugartrail.processing.normalise_address(person['address']) not in lower_n_addresses: - new_address = {'address': sugartrail.processing.normalise_address(person['address']), 'n':network.n+1, 'link_type':network.link_type, 'node_type': network.node_type, 'node': network.node} + new_address = { + 'address': sugartrail.processing.normalise_address(person['address']), + 'n':network.n+1, + 'link_type':network.link_type, + 'node_type': network.node_type, + 'node': network.node + } if new_address not in new_addresses: new_addresses.append(new_address) if self.get_company_address_history: @@ -443,13 +517,24 @@ class Network: network.link_type = "Historic Address" if 'address' in address: if address['address'] not in lower_n_addresses: - new_address = {'address': address['address'], 'n':network.n+1, 'link_type':network.link_type, 'node_type': network.node_type, 'node': network.node} + new_address = { + 'address': address['address'], + 'n':network.n+1, + 'link_type':network.link_type, + 'node_type': network.node_type, + 'node': network.node + } if new_address not in new_addresses: - new_addresses.append(dict({'address': address['address'], 'n':network.n+1, 'link_type':network.link_type, 'node_type': network.node_type, 'node': network.node})) + new_addresses.append(dict({ + 'address': address['address'], + 'n':network.n+1, + 'link_type':network.link_type, + 'node_type': network.node_type, + 'node': network.node + })) network.addresses.extend(new_addresses) network.officer_ids.extend(new_officers) - def search_officer_id(self, network, officer_id): """Gets officers, companies and addresses connected to input officer (officer_id).""" @@ -467,22 +552,45 @@ class Network: for appointment in appointments['items']: if sugartrail.processing.normalise_address(appointment['address']) not in lower_n_addresses: network.link_type = "Appointment Address" - new_address = {'address': sugartrail.processing.normalise_address(appointment['address']), 'n':network.n+1, 'link_type':network.link_type, 'node_type': network.node_type, 'node': network.node} + new_address = { + 'address': sugartrail.processing.normalise_address(appointment['address']), + 'n':network.n+1, + 'link_type':network.link_type, + 'node_type': network.node_type, + 'node': network.node + } if new_address not in new_addresses: new_addresses.append(new_address) if appointment['appointed_to']['company_number'] not in lower_n_companies: network.link_type = "Appointment" - new_company = {'company_id': appointment['appointed_to']['company_number'], 'n':network.n+1, 'link_type':network.link_type, 'node_type': network.node_type, 'node': network.node} + new_company = { + 'company_id': appointment['appointed_to']['company_number'], + 'n':network.n+1, + 'link_type':network.link_type, + 'node_type': network.node_type, + 'node': network.node + } if new_company not in new_companies: new_companies.append(new_company) elif len(appointments['items']) > int(self.officer_appointments_maxsize): - network.maxsize_entities.append(dict({'node':officer_id,'type': 'Officer', 'maxsize_type': 'Appointments', 'size': len(appointments['items'])})) + network.maxsize_entities.append(dict({ + 'node':officer_id, + 'type': 'Officer', + 'maxsize_type': 'Appointments', + 'size': len(appointments['items']) + })) if self.get_officer_correspondance_address: correspondance_address = sugartrail.api.get_correspondance_address(officer_id) if correspondance_address: if sugartrail.processing.normalise_address(correspondance_address['items'][0]['address']) not in lower_n_addresses: network.link_type = "Officer Corresponance Address" - new_address = {'address': sugartrail.processing.normalise_address(correspondance_address['items'][0]['address']), 'n':network.n+1, 'link_type':network.link_type, 'node_type': network.node_type, 'node': network.node} + new_address = { + 'address': sugartrail.processing.normalise_address(correspondance_address['items'][0]['address']), + 'n':network.n+1, + 'link_type':network.link_type, + 'node_type': network.node_type, + 'node': network.node + } if new_address not in new_addresses: new_addresses.append(new_address) if self.get_officer_duplicates: @@ -492,11 +600,22 @@ class Network: for duplicate in duplicate_officers: network.link_type = "Duplicate Officer" if duplicate['links']['self'].split('/')[2] not in lower_n_officers: - new_officer = {'officer_id': duplicate['links']['self'].split('/')[2], 'name': duplicate['title'], 'n':network.n+1, 'link_type': network.link_type, 'node_type': network.node_type, 'node': network.node} + new_officer = { + 'officer_id': duplicate['links']['self'].split('/')[2], + 'name': duplicate['title'], 'n':network.n+1, + 'link_type': network.link_type, + 'node_type': network.node_type, + 'node': network.node + } if new_officer not in new_officers: new_officers.append(new_officer) elif len(duplicate_officers) > int(self.officer_duplicates_maxsize): - network.maxsize_entities.append(dict({'node':officer_id,'type': 'Officer', 'maxsize_type': 'Duplicates', 'size': len(duplicate_officers)})) + network.maxsize_entities.append(dict({ + 'node':officer_id, + 'type': 'Officer', + 'maxsize_type': 'Duplicates', + 'size': len(duplicate_officers) + })) network.addresses.extend(new_addresses) network.officer_ids.extend(new_officers) network.company_ids.extend(new_companies) @@ -523,11 +642,22 @@ class Network: for company in companies['items']: network.link_type = "Company at Address" if company['company_number'] not in lower_n_companies: - new_company = {'company_id': company['company_number'], 'n':network.n+1, 'link_type':network.link_type, 'node_type': network.node_type, 'node': network.node} + new_company = { + 'company_id': company['company_number'], + 'n':network.n+1, + 'link_type':network.link_type, + 'node_type': network.node_type, + 'node': network.node + } if new_company not in new_companies: new_companies.append(new_company) elif len(companies['items']) > int(self.companies_at_address_maxsize): - network.maxsize_entities.append(dict({'node':address,'type': 'Address', 'maxsize_type': 'Companies', 'size': len(companies['items'])})) + network.maxsize_entities.append(dict({ + 'node':address, + 'type': 'Address', + 'maxsize_type': 'Companies', + 'size': len(companies['items']) + })) if self.get_officers_at_address: officers = sugartrail.api.get_officers_at_address(address) if officers: @@ -536,10 +666,22 @@ class Network: if 'links' and 'title' in officer: network.link_type = "Officer at Address" if officer['links']['self'].split('/')[2] not in lower_n_officers: - new_officer = {'officer_id': officer['links']['self'].split('/')[2], 'name': officer['title'], 'n':network.n+1, 'link_type':network.link_type, 'node_type': network.node_type, 'node': network.node} + new_officer = { + 'officer_id': officer['links']['self'].split('/')[2], + 'name': officer['title'], + 'n':network.n+1, + 'link_type': network.link_type, + 'node_type': network.node_type, + 'node': network.node + } if new_officer not in new_officers: new_officers.append(new_officer) elif len(officers) > int(self.officers_at_address_maxsize): - network.maxsize_entities.append(dict({'node':address,'type': 'Address', 'maxsize_type': 'Officers', 'size': len(officers)})) + network.maxsize_entities.append(dict({ + 'node':address, + 'type': 'Address', + 'maxsize_type': 'Officers', + 'size': len(officers) + })) network.officer_ids.extend(new_officers) network.company_ids.extend(new_companies) diff --git a/sugartrail/mapview.py b/sugartrail/mapview.py index 0143c03..abbf8ae 100644 --- a/sugartrail/mapview.py +++ b/sugartrail/mapview.py @@ -19,28 +19,30 @@ def load_map_data(network): through other companies towards the origin company.""" # initialise historic address trail antpath address_trail = AntPath( - locations=[], - dash_array=[1,10], - delay=1000, - color='#ed2f2f', - pulse_color='#FFFFFF' + locations=[], + dash_array=[1,10], + delay=1000, + color='#ed2f2f', + pulse_color='#FFFFFF' ) # initialise trail from company to origin antpath origin_trail = AntPath( - locations=[], - dash_array=[1,10], - delay=1000, - color='#000000', - pulse_color='#FFFFFF' + locations=[], + dash_array=[1,10], + delay=1000, + color='#000000', + pulse_color='#FFFFFF' ) # initialise table for printing company to origin trail path_table = HTML( - value="" + value="" ) # initialise map - m = Map(center=(50, 0), - zoom=5, - layout=Layout(width='90%', height='650px')) + m = Map( + center=(50, 0), + zoom=5, + layout=Layout(width='90%', height='650px') + ) # add antpath layers m.add_layer(address_trail) m.add_layer(origin_trail) @@ -77,13 +79,29 @@ def get_marker_data(network,address_trail, origin_trail, path_table): message = HTML() message.value = str(company_name) + "
" + str(address) icon = AwesomeIcon( - marker_color=marker_color + marker_color=marker_color ) # find historic addresses path for company address_path = get_address_path(network,str(row['company_number'])) - marker = Marker(icon=icon, opacity=1, location=(row['lat'], row['lon']), draggable=False, popup=message, title="Address") + marker = Marker( + icon=icon, + opacity=1, + location=(row['lat'], + row['lon']), + draggable=False, + popup=message, + title="Address" + ) # attach on click behavoir for marker - marker.on_click(functools.partial(on_button_clicked, address_path=address_path, address_trail=address_trail, path_table=path_table, origin_trail=origin_trail, path=path, location=(row['lat'], row['lon']), locations_from_origin = locations_from_origin)) + marker.on_click(functools.partial( + on_button_clicked, + address_path=address_path, + address_trail=address_trail, + path_table=path_table, + origin_trail=origin_trail, + path=path, location=(row['lat'], row['lon']), + locations_from_origin = locations_from_origin + )) markers.append(marker) return markers