Include the centre point on the details page

diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index e2799539c896cfbc89d424d48d6382f879dec705..b56f3989a5fb30ce4df0feff3d91491b4bd2f238 100644 (file)
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -46,18 +46,31 @@
                        });
 
                        var feature = freader.read('<?php echo $aPointDetails['outlinestring'];?>');
+                       var featureCentre = freader.read('POINT(<?php echo $aPointDetails['lon'];?> <?php echo $aPointDetails['lat'];?>)');
                        if (feature) {
                                map.zoomToExtent(feature.geometry.getBounds());
-
                                feature.style = {
                                        strokeColor: "#75ADFF",
                                        fillColor: "#F0F7FF",
                                        strokeWidth: <?php echo ($aPointDetails['isarea']=='t'?'2':'5');?>,
                                        strokeOpacity: 0.75,
                                        fillOpacity: 0.75,
-                                       pointRadius: 100
+                                       pointRadius: 50
+                               };
+
+<?php if ($aPointDetails['isarea']=='t') {?>
+                               featureCentre.style = {
+                                       strokeColor: "#008800",
+                                       fillColor: "#338833",
+                                       strokeWidth: <?php echo ($aPointDetails['isarea']=='t'?'2':'5');?>,
+                                       strokeOpacity: 0.75,
+                                       fillOpacity: 0.75,
+                                       pointRadius: 8
                                };
+                               vectorLayer.addFeatures([feature,featureCentre]);
+<?php } else { ?>
                                vectorLayer.addFeatures([feature]);
+<?php } ?>
                        }
                }
        </script>
@@ -84,6 +97,7 @@
        echo ' <div>Rank: <span class="rankaddress">'.$aPointDetails['rank_search_label'].'</span></div>';
        if ($aPointDetails['calculated_importance']) echo ' <div>Importance: <span class="rankaddress">'.$aPointDetails['calculated_importance'].($aPointDetails['importance']?'':' (estimated)').'</span></div>';
        echo ' <div>Coverage: <span class="area">'.($aPointDetails['isarea']=='t'?'Polygon':'Point').'</span></div>';
+       echo ' <div>Centre Point: <span class="area">'.$aPointDetails['lat'].','.$aPointDetails['lon'].'</span></div>';
        $sOSMType = ($aPointDetails['osm_type'] == 'N'?'node':($aPointDetails['osm_type'] == 'W'?'way':($aPointDetails['osm_type'] == 'R'?'relation':'')));
        if ($sOSMType) echo ' <div>OSM: <span class="osm">'.$sOSMType.' <a href="http://www.openstreetmap.org/browse/'.$sOSMType.'/'.$aPointDetails['osm_id'].'">'.$aPointDetails['osm_id'].'</a></span></div>';
        if ($aPointDetails['wikipedia'])

diff --git a/website/details.php b/website/details.php
index 124b0f902cd9d3de58f95562c9e252058b2df790..8c838d46bfc4fe7157660f5c144c649c7d187c47 100755 (executable)
--- a/website/details.php
+++ b/website/details.php
@@ -63,6 +63,8 @@
        $sSQL = "select place_id, osm_type, osm_id, class, type, name, admin_level, housenumber, street, isin, postcode, country_code, importance, wikipedia,";
        $sSQL .= " to_char(indexed_date, 'YYYY-MM-DD HH24:MI') as indexed_date, parent_place_id, rank_address, rank_search, get_searchrank_label(rank_search) as rank_search_label, get_name_by_language(name,$sLanguagePrefArraySQL) as localname, ";
        $sSQL .= " ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') as isarea, ";
+//     $sSQL .= " ST_Area(geometry::geography) as area, ";
+       $sSQL .= " ST_y(centroid) as lat, ST_x(centroid) as lon,";
        $sSQL .= " case when importance = 0 OR importance IS NULL then 0.75-(rank_search::float/40) else importance end as calculated_importance, ";
        $sSQL .= " ST_AsText(CASE WHEN ST_NPoints(geometry) > 5000 THEN ST_SimplifyPreserveTopology(geometry, 0.0001) ELSE geometry END) as outlinestring";
        $sSQL .= " from placex where place_id = $iPlaceID";