X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/c98e59be03a8ccf1a42c3ecb4ae21a7701cabfb3..6300d3619a6c429204c589a29a4abea88e15d47e:/lib/template/details-html.php?ds=sidebyside
diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index e2799539..1da69301 100644
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -18,7 +18,6 @@
new OpenLayers.Control.Permalink(),
new OpenLayers.Control.Navigation(),
new OpenLayers.Control.PanZoomBar(),
- new OpenLayers.Control.MouseDefaults(),
new OpenLayers.Control.MousePosition(),
new OpenLayers.Control.Attribution()],
maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34,20037508.34,20037508.34),
@@ -46,18 +45,31 @@
});
var feature = freader.read('');
+ var featureCentre = freader.read('POINT( )');
if (feature) {
map.zoomToExtent(feature.geometry.getBounds());
-
feature.style = {
strokeColor: "#75ADFF",
fillColor: "#F0F7FF",
strokeWidth: ,
strokeOpacity: 0.75,
fillOpacity: 0.75,
- pointRadius: 100
+ pointRadius: 50
};
+
+
+ featureCentre.style = {
+ strokeColor: "#008800",
+ fillColor: "#338833",
+ strokeWidth: ,
+ strokeOpacity: 0.75,
+ fillOpacity: 0.75,
+ pointRadius: 8
+ };
+ vectorLayer.addFeatures([feature,featureCentre]);
+
vectorLayer.addFeatures([feature]);
+
}
}
@@ -68,9 +80,9 @@
echo '
';
if ($aPointDetails['icon'])
{
- echo '';
+ echo '';
}
- echo $aPointDetails['localname'].'
';
+ echo $aPointDetails['localname']."\n";
echo '';
echo '
Name: ';
foreach($aPointDetails['aNames'] as $sKey => $sValue)
@@ -84,6 +96,7 @@
echo '
Rank: '.$aPointDetails['rank_search_label'].'
';
if ($aPointDetails['calculated_importance']) echo '
Importance: '.$aPointDetails['calculated_importance'].($aPointDetails['importance']?'':' (estimated)').'
';
echo '
Coverage: '.($aPointDetails['isarea']=='t'?'Polygon':'Point').'
';
+ echo '
Centre Point: '.$aPointDetails['lat'].','.$aPointDetails['lon'].'
';
$sOSMType = ($aPointDetails['osm_type'] == 'N'?'node':($aPointDetails['osm_type'] == 'W'?'way':($aPointDetails['osm_type'] == 'R'?'relation':'')));
if ($sOSMType) echo '
';
if ($aPointDetails['wikipedia'])
@@ -97,9 +110,9 @@
echo '
'.$sValue.' ('.$sKey.')
';
}
echo '
';
- echo '
';
+ echo "\n";
- echo 'Address
';
+ echo "Address
\n";
echo '';
$iPrevRank = 1000000;
$sPrevLocalName = '';
@@ -123,14 +136,14 @@
echo ',
'.$aAddressLine['distance'].'';
echo '
GOTO';
echo ')';
- echo '
';
+ echo "\n";
}
- echo '';
+ echo "\n";
if ($aLinkedLines)
{
- echo 'Linked Places
';
- echo '';
+ echo "
Linked Places
\n";
+ echo '
';
foreach($aLinkedLines as $aAddressLine)
{
$sOSMType = ($aAddressLine['osm_type'] == 'N'?'node':($aAddressLine['osm_type'] == 'W'?'way':($aAddressLine['osm_type'] == 'R'?'relation':'')));
@@ -139,16 +152,16 @@
echo '
'.(trim($aAddressLine['localname'])?$aAddressLine['localname']:'No Name').'';
echo ' (';
echo '
Type: '.$aAddressLine['class'].':'.$aAddressLine['type'].'';
- if ($sOSMType) echo ',
'.$sOSMType.' '.$aAddressLine['osm_id'].'';
+ if ($sOSMType) echo ',
'.$sOSMType.' '.$aAddressLine['osm_id'].'';
echo ',
'.$aAddressLine['admin_level'].'';
- echo ',
'.$aAddressLine['rank_search_label'].'';
+ if (isset($aAddressLine['rank_search_label'])) echo ',
'.$aAddressLine['rank_search_label'].'';
// echo ',
'.($aAddressLine['fromarea']=='t'?'Polygon':'Point').'';
echo ',
'.$aAddressLine['distance'].'';
echo '
GOTO';
echo ')';
- echo '
';
+ echo "
\n";
}
- echo '';
+ echo "\n";
}
if ($aPlaceSearchNameKeywords)
@@ -156,7 +169,7 @@
echo 'Name Keywords
';
foreach($aPlaceSearchNameKeywords as $aRow)
{
- echo ''.$aRow['word_token'].'
';
+ echo ''.$aRow['word_token']."
\n";
}
}
@@ -165,24 +178,28 @@
echo 'Address Keywords
';
foreach($aPlaceSearchAddressKeywords as $aRow)
{
- echo ''.($aRow['word_token'][0]==' '?'*':'').$aRow['word_token'].'('.$aRow['word_id'].')'.'
';
+ echo ''.($aRow['word_token'][0]==' '?'*':'').$aRow['word_token'].'('.$aRow['word_id'].')'."
\n";
}
}
if (sizeof($aParentOfLines))
{
- echo 'Parent Of:
';
+ echo "Parent Of:
\n\n";
$aGroupedAddressLines = array();
foreach($aParentOfLines as $aAddressLine)
{
- if (!isset($aGroupedAddressLines[$aAddressLine['type']])) $aGroupedAddressLines[$aAddressLine['type']] = array();
- $aGroupedAddressLines[$aAddressLine['type']][] = $aAddressLine;
+ if ($aAddressLine['type'] == 'yes') $sType = $aAddressLine['class'];
+ else $sType = $aAddressLine['type'];
+
+ if (!isset($aGroupedAddressLines[$sType]))
+ $aGroupedAddressLines[$sType] = array();
+ $aGroupedAddressLines[$sType][] = $aAddressLine;
}
foreach($aGroupedAddressLines as $sGroupHeading => $aParentOfLines)
{
$sGroupHeading = ucwords($sGroupHeading);
- echo "
$sGroupHeading
";
+ echo "
$sGroupHeading
\n";
foreach($aParentOfLines as $aAddressLine)
{
$aAddressLine['localname'] = $aAddressLine['localname']?$aAddressLine['localname']:$aAddressLine['housenumber'];
@@ -191,15 +208,12 @@
echo '
';
echo '
'.(trim($aAddressLine['localname'])?$aAddressLine['localname']:'No Name').'';
echo ' (';
-// echo '
Type: '.$aAddressLine['class'].':'.$aAddressLine['type'].'';
-// echo ',
'.$aAddressLine['admin_level'].'';
-// echo ',
'.$aAddressLine['rank_address'].'';
echo '
'.($aAddressLine['isarea']=='t'?'Polygon':'Point').'';
echo ',
~'.(round($aAddressLine['distance']*69,1)).' miles';
- if ($sOSMType) echo ',
'.$sOSMType.' '.$aAddressLine['osm_id'].'';
+ if ($sOSMType) echo ',
'.$sOSMType.' '.$aAddressLine['osm_id'].'';
echo ',
GOTO';
echo ')';
- echo '
';
+ echo "
\n";
}
}
if (sizeof($aParentOfLines) >= 500) {