include a bit of extra details for polygon errors in output on details.php page

diff --git a/sql/tables.sql b/sql/tables.sql
index d5cf7bcd47eb0755ecbd2dcfdae9f2fac6092fe0..8f933abc0b0fb7dab7c6fbba1f336944190913f5 100644 (file)
--- a/sql/tables.sql
+++ b/sql/tables.sql
@@ -216,6 +216,7 @@ CREATE INDEX idx_placex_adminname on placex USING BTREE (make_standard_name(name
 
 DROP SEQUENCE seq_place;
 CREATE SEQUENCE seq_place start 1;
 
 DROP SEQUENCE seq_place;
 CREATE SEQUENCE seq_place start 1;

+GRANT SELECT on place to "www-data" ;

 GRANT SELECT on placex to "www-data" ;
 GRANT UPDATE ON placex to "www-data" ;
 GRANT SELECT ON search_name to "www-data" ;
 GRANT SELECT on placex to "www-data" ;
 GRANT UPDATE ON placex to "www-data" ;
 GRANT SELECT ON search_name to "www-data" ;

diff --git a/website/details.php b/website/details.php
index b7a38b2d7cc7c1cea3c000835de8e68b8393475a..c92e3f77ce3849b3d7b9206a8dc52f57bcee793c 100755 (executable)
--- a/website/details.php
+++ b/website/details.php
@@ -18,6 +18,17 @@
        if (isset($_GET['osmtype']) && isset($_GET['osmid']) && (int)$_GET['osmid'] && ($_GET['osmtype'] == 'N' || $_GET['osmtype'] == 'W' || $_GET['osmtype'] == 'R'))
        {
                $_GET['place_id'] = $oDB->getOne("select place_id from placex where osm_type = '".$_GET['osmtype']."' and osm_id = ".(int)$_GET['osmid']." order by type = 'postcode' asc");
        if (isset($_GET['osmtype']) && isset($_GET['osmid']) && (int)$_GET['osmid'] && ($_GET['osmtype'] == 'N' || $_GET['osmtype'] == 'W' || $_GET['osmtype'] == 'R'))
        {
                $_GET['place_id'] = $oDB->getOne("select place_id from placex where osm_type = '".$_GET['osmtype']."' and osm_id = ".(int)$_GET['osmid']." order by type = 'postcode' asc");

+
+               // Be nice about our error messages for broken geometry
+               if (!$_GET['place_id'])
+               {
+                       $sErrorMessage = $oDB->getOne("select ST_IsValidReason(geometry) from place where osm_type = '".$_GET['osmtype']."' and osm_id = ".(int)$_GET['osmid']." order by type = 'postcode' asc");
+                       if (!PEAR::isError($sErrorMessage) && $sErrorMessage) {
+                               echo "Problem with geometry: ";
+                               echo $sErrorMessage;
+                               exit;
+                       }
+               }

        }
 
        if (!isset($_GET['place_id']))
        }
 
        if (!isset($_GET['place_id']))