X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/9f7844ec7a8fe4426eb8a34165158ca6712760e3..f0f6fcf256c83176dbcda0d0fd4fec977ea8a0ad:/lib/template/details-error-html.php?ds=sidebyside
diff --git a/lib/template/details-error-html.php b/lib/template/details-error-html.php
index b93d6495..1c6d2a0a 100644
--- a/lib/template/details-error-html.php
+++ b/lib/template/details-error-html.php
@@ -1,165 +1,133 @@
-
-
- OpenStreetMap Nominatim:
-
-
-
-
-
-
-
-
- ';
+
+ function osm_link($aFeature)
+ {
+ $sOSMType = ($aFeature['osm_type'] == 'N'?'node':($aFeature['osm_type'] == 'W'?'way':($aFeature['osm_type'] == 'R'?'relation':'')));
+ if ($sOSMType) {
+ return ''.$sOSMType.' '.$aFeature['osm_id'].'';
+ }
+ return '';
+ }
+
+ function osm_map_url($aFeature)
+ {
+ $sLon = $aFeature['error_x'];
+ $sLat = $aFeature['error_y'];
+
+ if (isset($sLat))
+ {
+ $sOSMType = ($aFeature['osm_type'] == 'N'?'node':($aFeature['osm_type'] == 'W'?'way':($aFeature['osm_type'] == 'R'?'relation':'')));
+ if ($sOSMType)
+ {
+ return "http://www.openstreetmap.org/?lat=".$sLat."&lon=".$sLon."&zoom=18&layers=M&".$sOSMType."=".$aFeature['osm_id'];
+ }
+ }
+ return '';
+ }
+
+ function josm_edit_url($aFeature)
+ {
+ $fWidth = 0.0002;
+ $sLon = $aFeature['error_x'];
+ $sLat = $aFeature['error_y'];
+
+ if (isset($sLat))
+ {
+ return "http://localhost:8111/load_and_zoom?left=".($sLon-$fWidth)."&right=".($sLon+$fWidth)."&top=".($sLat+$fWidth)."&bottom=".($sLat-$fWidth);
+ }
+
+ $sOSMType = ($aFeature['osm_type'] == 'N'?'node':($aFeature['osm_type'] == 'W'?'way':($aFeature['osm_type'] == 'R'?'relation':'')));
+ if ($sOSMType)
+ {
+ return 'http://localhost:8111/import?url=http://www.openstreetmap.org/api/0.6/'.$sOSMType.'/'.$aFeature['osm_id'].'/full';
+ // Should be better to load by object id - but this doesn't seem to zoom correctly
+ // return " Remote Control (JOSM / Merkaartor)";
+ }
+ return '';
+ }
+
+ function potlach_edit_url($aFeature)
+ {
+ $fWidth = 0.0002;
+ $sLat = $aFeature['error_y'];
+ $sLon = $aFeature['error_x'];
+
+ if (isset($sLat))
+ {
+ return "http://www.openstreetmap.org/edit?editor=potlatch2&bbox=".($sLon-$fWidth).",".($sLat-$fWidth).",".($sLon+$fWidth).",".($sLat+$fWidth);
+ }
+ return '';
+ }
+
+
+
?>
- This object has an invalid geometry.
- Details:
+
+
+
+
+
+
+
+
This object has an invalid geometry.
+
+
+ Type:
+
+
+
+ OSM:
+
+
+
+
Error
+
+
+
+
+
view on osm.org
+
-$sVal = $aPointDetails['errormessage'];
-$sOSMType = ($aPointDetails['osm_type'] == 'N'?'node':($aPointDetails['osm_type'] == 'W'?'way':($aPointDetails['osm_type'] == 'R'?'relation':'')));
-$sOSMID = $aPointDetails['osm_id'];
+
Edit
+
+
+
+
-if (preg_match('/Self-intersection\\[([0-9.\\-]+) ([0-9.\\-]+)\\]/',$sVal,$aMatch))
-{
- $sLat = $aMatch[2];
- $sLon = $aMatch[1];
- echo "
".($sVal?$sVal:' ')."";
-}
-else
-{
- echo ($sVal?$sVal:' ');
-}
+
+
+
+
-?>
-
-
+
+