From df3202017e681dc6973c66d8fc779604c6d29e3f Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 8 Nov 2012 20:37:23 +0100
Subject: [PATCH] avoid matching of error message twice

---
 lib/template/details-error-html.php | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/lib/template/details-error-html.php b/lib/template/details-error-html.php
index 5f075b93..d8e7fd62 100644
--- a/lib/template/details-error-html.php
+++ b/lib/template/details-error-html.php
@@ -144,35 +144,33 @@ body {
     <p>This object has an invalid geometry.</p>
     <p><b>Details:</b> <?php
 
-$sVal = $aPointDetails['errormessage'];
+$sVal = $aPointDetails['errormessage']?$aPointDetails['errormessage']:'&nbsp;';
 $sOSMType = ($aPointDetails['osm_type'] == 'N'?'node':($aPointDetails['osm_type'] == 'W'?'way':($aPointDetails['osm_type'] == 'R'?'relation':'')));
 $sOSMID = $aPointDetails['osm_id'];
 
-$bHaveLatLng = false;
-if (preg_match('/Self-intersection\\[([0-9.\\-]+) ([0-9.\\-]+)\\]/',$sVal,$aMatch))
+if (isset($aPointDetails['error_x'])
 {
-	$sLat = $aMatch[2];
-	$sLon = $aMatch[1];
-	$bHaveLatLng = true;
-	echo "<a href=\"http://www.openstreetmap.org/?lat=".$sLat."&lon=".$sLon."&zoom=18&layers=M&".$sOSMType."=".$sOSMID."\">".($sVal?$sVal:'&nbsp;')."</a>";
+	$sLat = $aPointDetails['error_y'];
+	$sLon = $aPointDetails['error_x'];
+	echo "<a href=\"http://www.openstreetmap.org/?lat=".$sLat."&lon=".$sLon."&zoom=18&layers=M&".$sOSMType."=".$sOSMID."\">".$sVal."</a>";
 }
 else
 {
-	echo ($sVal?$sVal:'&nbsp;');
+	echo $sVal;
 }
 ?>
     <p><b>Edit:</b> in <?php
-if ($bHaveLatLng)
+if (isset($aPointDetails['error_x'])
 {
 	$fWidth = 0.0002;
-	echo " <a href=\"http://localhost:8111/load_and_zoom?left=".($sLon-$fWidth)."&right=".($sLon+$fWidth)."&top=".($sLat+$fWidth)."&bottom=".($sLat-$fWidth)."\" target=\"josm\">Remote Controll (JOSM / Merkaartor)</a>";
+	echo " <a href=\"http://localhost:8111/load_and_zoom?left=".($sLon-$fWidth)."&right=".($sLon+$fWidth)."&top=".($sLat+$fWidth)."&bottom=".($sLat-$fWidth)."\" target=\"josm\">Remote Control (JOSM / Merkaartor)</a>";
 	echo " | <a href=\"http://www.openstreetmap.org/edit?editor=potlatch2&bbox=".($sLon-$fWidth).",".($sLat-$fWidth).",".($sLon+$fWidth).",".($sLat+$fWidth)."\" target=\"potlatch2\">Potlatch 2</a>";
 }
 else
 {
-	echo " <a href=\"http://localhost:8111/import?url=http://www.openstreetmap.org/api/0.6/".$sOSMType.'/'.$sOSMID."/full\" target=\"josm\">Remote Controll (JOSM / Merkaartor)</a>";
+	echo " <a href=\"http://localhost:8111/import?url=http://www.openstreetmap.org/api/0.6/".$sOSMType.'/'.$sOSMID."/full\" target=\"josm\">Remote Control (JOSM / Merkaartor)</a>";
 	// Should be better to load by object id - but this doesn't seem to zoom correctly
-	//echo " <a href=\"http://localhost:8111/load_object?new_layer=true&objects=".strtolower($aPointDetails['osm_type']).$sOSMID."\" target=\"josm\">Remote Controll (JOSM / Merkaartor)</a>";
+	//echo " <a href=\"http://localhost:8111/load_object?new_layer=true&objects=".strtolower($aPointDetails['osm_type']).$sOSMID."\" target=\"josm\">Remote Control (JOSM / Merkaartor)</a>";
 }
 
 ?></p>
-- 
2.39.5