Replace address lookup with access to 'address' package generic database.

This adds map location data to the address and links to OSM, multimap and googlemap

2 files changed, 27 insertions, 15 deletions

diff --git a/templates/display_address.tpl b/templates/display_address.tpl
index a2a7620..9235eb1 100644
--- a/templates/display_address.tpl
+++ b/templates/display_address.tpl
@@ -7,10 +7,16 @@
 					{$pageInfo.pao},<br />{/if}
 				{if isset($pageInfo.number) && ($pageInfo.number <> '') }
 					{$pageInfo.number},<br />{/if}
-				{if isset($pageInfo.street) && ($pageInfo.street <> '') }
-					{$pageInfo.street},<br />{/if}
-				{if isset($pageInfo.locality) && ($pageInfo.locality <> '') }
-					{$pageInfo.locality},&nbsp;{/if}
+				{if isset($pageInfo.house) && ($pageInfo.house <> '') }
+					{$pageInfo.house},<br />{/if}
+				{if isset($pageInfo.add1) && ($pageInfo.add1 <> '') }
+					{$pageInfo.add1},<br />{/if}
+				{if isset($pageInfo.add2) && ($pageInfo.add2 <> '') }
+					{$pageInfo.add2},&nbsp;{/if}
+				{if isset($pageInfo.add3) && ($pageInfo.add3 <> '') }
+					{$pageInfo.add3},<br />{/if}
+				{if isset($pageInfo.add4) && ($pageInfo.add4 <> '') }
+					{$pageInfo.add4},&nbsp;{/if}
 				{if isset($pageInfo.town) && ($pageInfo.town <> '') }
 					{$pageInfo.town},&nbsp;{/if}
 				{if isset($pageInfo.county) && ($pageInfo.county <> '') }
@@ -23,8 +29,12 @@
 			{formlabel label="Visual Centre Coordinates" for="street_start_x"}
 			{forminput}
 				Easting: {$pageInfo.x_coordinate|escape} Northing: {$pageInfo.y_coordinate|escape}
-				&nbsp;&lt;<a href="http://www.multimap.com/maps/?map={$pageInfo.prop_lat},{$pageInfo.prop_lng}|17|4&loc=GB:{$pageInfo.prop_lat}:{$pageInfo.prop_lng}:17" title="{$pageInfo.title}">
+				&nbsp;&lt;<a href="http://www.openstreetmap.org/index.html?mlat={$pageInfo.x_coordinate}&mlon={$pageInfo.y_coordinate}&zoom=16&layers=BOFT" title="{$propertyInfo.title}">
+					OpenStreetMap
+				</a>&gt;&nbsp;&lt;<a href="http://www.bing.com/maps/?cp={$pageInfo.x_coordinate}~{$pageInfo.y_coordinate}&lvl=16&style=r#" title="{$pageInfo.title}">
 					Multimap
+				</a>&gt;&nbsp;&lt;<a href="http://www.google.co.uk/maps?f=q&source=s_q&hl=en&ll={$pageInfo.x_coordinate},{$pageInfo.y_coordinate}&z=16" title="{$pageInfo.title}">
+					Google
 				</a>&gt;<br />
 				{$pageInfo.rpa|escape}
 			{/forminput}
diff --git a/templates/list.tpl b/templates/list.tpl
index f6f199a..b882623 100644
--- a/templates/list.tpl
+++ b/templates/list.tpl
@@ -41,21 +41,23 @@
 						{if isset($listcontacts[content].uprn) && ($listcontacts[content].uprn <> '') }UPRN: {$listcontacts[content].uprn}&nbsp;&nbsp;{/if}
 						{if isset($listcontacts[content].postcode) && ($listcontacts[content].postcode <> '') }
 							{tr}Address{/tr}&nbsp;-&nbsp; 
-							{if isset($listcontacts[content].sao) && ($listcontacts[content].sao <> '') }
-								{$listcontacts[content].sao},&nbsp;{/if}
-							{if isset($listcontacts[content].pao) && ($listcontacts[content].pao <> '') }
-								{$listcontacts[content].pao},&nbsp;{/if}
-							{if isset($listcontacts[content].number) && ($listcontacts[content].number <> '') }
-								{$listcontacts[content].number},&nbsp;{/if}
-							{if isset($listcontacts[content].street) && ($listcontacts[content].street <> '') }
-								{$listcontacts[content].street},&nbsp;{/if}
-							{if isset($listcontacts[content].locality) && ($listcontacts[content].locality <> '') }
-								{$listcontacts[content].locality},&nbsp;{/if}
+							{if isset($listcontacts[content].house) && ($listcontacts[content].house <> '') }
+								{$listcontacts[content].house},&nbsp;{/if}
+							{if isset($listcontacts[content].add1) && ($listcontacts[content].add1 <> '') }
+								{$listcontacts[content].add1},&nbsp;{/if}
+							{if isset($listcontacts[content].add2) && ($listcontacts[content].add2 <> '') }
+								{$listcontacts[content].add2},&nbsp;{/if}
+							{if isset($listcontacts[content].add3) && ($listcontacts[content].add3 <> '') }
+								{$listcontacts[content].add3},&nbsp;{/if}
+							{if isset($listcontacts[content].add4) && ($listcontacts[content].add4 <> '') }
+								{$listcontacts[content].add4},&nbsp;{/if}
 							{if isset($listcontacts[content].town) && ($listcontacts[content].town <> '') }
 								{$listcontacts[content].town},&nbsp;{/if}
 							{if isset($listcontacts[content].county) && ($listcontacts[content].county <> '') }
 								{$listcontacts[content].county},&nbsp;{/if}
 							{$listcontacts[content].postcode}&nbsp;&nbsp;
+							{if isset($listcontacts[content].grideast) }
+								&lt;{$listcontacts[content].grideast|escape}&nbsp;,&nbsp;{$listcontacts[content].gridnorth|escape}&gt;&nbsp;{/if}
 						{/if}
 						<br />
 						{tr}Refs{/tr}: {$listcontacts[content].refs|default:0}&nbsp;&nbsp;