simplify geometry handling in details page

[nominatim.git] / lib / template / details-html.php

diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index b89bf747b3357a1b3c1a3764ec5c5f619d4c0eba..a4619b55c6173adac947242e097fd0098374571a 100644 (file)
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -32,8 +32,7 @@ body {
 }
     </style>
        <script src="js/OpenLayers.js"></script>
 }
     </style>
        <script src="js/OpenLayers.js"></script>

-       <script src="js/OpenStreetMap.js"></script>
-       <script src="prototype-1.6.0.3.js"></script>
+       <script src="js/tiles.js"></script>

        <script type="text/javascript">
         
                var map;
        <script type="text/javascript">
         
                var map;


@@ -52,9 +51,10 @@ body {
                 numZoomLevels: 19,
                 units: 'm',
                 projection: new OpenLayers.Projection("EPSG:900913"),
                 numZoomLevels: 19,
                 units: 'm',
                 projection: new OpenLayers.Projection("EPSG:900913"),

-                displayProjection: new OpenLayers.Projection("EPSG:4326"),
+                displayProjection: new OpenLayers.Projection("EPSG:4326")

                } );
                } );

-                       map.addLayer(new OpenLayers.Layer.OSM.Mapnik("Mapnik"));
+                       map.addLayer(new OpenLayers.Layer.OSM.<?php echo CONST_Tile_Default;?>("Default",
+                        { attribution : '© <a target="_parent" href="http://www.openstreetmap.org">OpenStreetMap</a> and contributors, under an <a target="_parent" href="http://www.openstreetmap.org/copyright">open license</a>'}));

 
                         var layer_style = OpenLayers.Util.extend({}, OpenLayers.Feature.Vector.style['default']);
                         layer_style.fillOpacity = 0.2;
 
                         var layer_style = OpenLayers.Util.extend({}, OpenLayers.Feature.Vector.style['default']);
                         layer_style.fillOpacity = 0.2;


@@ -69,24 +69,31 @@ body {
                                fillColor: "#F0F7FF",
                                strokeWidth: 2,
                                strokeOpacity: 0.75,
                                fillColor: "#F0F7FF",
                                strokeWidth: 2,
                                strokeOpacity: 0.75,

-                               fillOpacity: 0.75,
+                               fillOpacity: 0.75

                        };
                        var proj_EPSG4326 = new OpenLayers.Projection("EPSG:4326");
                        var proj_map = map.getProjectionObject();
                        };
                        var proj_EPSG4326 = new OpenLayers.Projection("EPSG:4326");
                        var proj_map = map.getProjectionObject();

-                       var latlon;
-<?php
-foreach($aPolyPoints as $aPolyPoint)
-{
-       echo "                        pointList.push(new OpenLayers.Geometry.Point(".$aPolyPoint[1].",".$aPolyPoint[2]."));\n";
-}
-?>
-                       var linearRing = new OpenLayers.Geometry.LinearRing(pointList).transform(proj_EPSG4326, proj_map);;
-                       var polygonFeature = new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Polygon([linearRing]),null,style);
-                       vectorLayer.addFeatures([polygonFeature]);

 
 

-                       map.zoomToExtent(new OpenLayers.Bounds(<?php echo $aPointPolygon['minlon']?>, <?php echo $aPointPolygon['minlat']?>, <?php echo $aPointPolygon['maxlon']?>, <?php echo $aPointPolygon['maxlat']?>).transform(proj_EPSG4326, proj_map));
+                       freader = new OpenLayers.Format.WKT({
+                               'internalProjection': proj_map,
+                               'externalProjection': proj_EPSG4326
+                       });
+
+                       var feature = freader.read('<?php echo $aPointDetails['outlinestring'];?>');
+                       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
+                               };
+                               vectorLayer.addFeatures([feature]);
+                       }

                }
                }

-               

        </script>
   </head>
   <body onload="init();">
        </script>
   </head>
   <body onload="init();">


@@ -95,7 +102,7 @@ foreach($aPolyPoints as $aPolyPoint)
        echo '<h1>';
        if ($aPointDetails['icon'])
        {
        echo '<h1>';
        if ($aPointDetails['icon'])
        {

-               echo '<img style="float:right;margin-right:40px;" src="'.'http://katie.openstreetmap.org/~twain/images/mapicons/'.$aPointDetails['icon'].'.n.32.png'.'">';
+               echo '<img style="float:right;margin-right:40px;" src="'.CONST_Website_BaseURL.'images/mapicons/'.$aPointDetails['icon'].'.n.32.png'.'">';

        }
        echo $aPointDetails['localname'].'</h1>';
        echo '<div class="locationdetails">';
        }
        echo $aPointDetails['localname'].'</h1>';
        echo '<div class="locationdetails">';


@@ -112,6 +119,11 @@ foreach($aPolyPoints as $aPolyPoint)
        echo ' <div>Coverage: <span class="area">'.($aPointDetails['isarea']=='t'?'Polygon':'Point').'</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"><span class="label"></span>'.$sOSMType.' <a href="http://www.openstreetmap.org/browse/'.$sOSMType.'/'.$aPointDetails['osm_id'].'">'.$aPointDetails['osm_id'].'</a></span></div>';
        echo ' <div>Coverage: <span class="area">'.($aPointDetails['isarea']=='t'?'Polygon':'Point').'</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"><span class="label"></span>'.$sOSMType.' <a href="http://www.openstreetmap.org/browse/'.$sOSMType.'/'.$aPointDetails['osm_id'].'">'.$aPointDetails['osm_id'].'</a></span></div>';

+       if ($aPointDetails['wikipedia'])
+       {
+               list($sWikipediaLanguage,$sWikipediaArticle) = explode(':',$aPointDetails['wikipedia']);
+               echo ' <div>Wikipedia Calculated: <span class="wikipedia"><a href="http://'.$sWikipediaLanguage.'.wikipedia.org/wiki/'.urlencode($sWikipediaArticle).'">'.$aPointDetails['wikipedia'].'</a></span></div>';
+       }

        echo ' <div>Extra Tags: ';
        foreach($aPointDetails['aExtraTags'] as $sKey => $sValue)
        {
        echo ' <div>Extra Tags: ';
        foreach($aPointDetails['aExtraTags'] as $sKey => $sValue)
        {


@@ -139,8 +151,8 @@ foreach($aPolyPoints as $aPolyPoint)
                echo '<span class="type"><span class="label">Type: </span>'.$aAddressLine['class'].':'.$aAddressLine['type'].'</span>';
                if ($sOSMType) echo ', <span class="osm"><span class="label"></span>'.$sOSMType.' <a href="http://www.openstreetmap.org/browse/'.$sOSMType.'/'.$aAddressLine['osm_id'].'">'.$aAddressLine['osm_id'].'</a></span>';
                echo ', <span class="adminlevel">'.$aAddressLine['admin_level'].'</span>';
                echo '<span class="type"><span class="label">Type: </span>'.$aAddressLine['class'].':'.$aAddressLine['type'].'</span>';
                if ($sOSMType) echo ', <span class="osm"><span class="label"></span>'.$sOSMType.' <a href="http://www.openstreetmap.org/browse/'.$sOSMType.'/'.$aAddressLine['osm_id'].'">'.$aAddressLine['osm_id'].'</a></span>';
                echo ', <span class="adminlevel">'.$aAddressLine['admin_level'].'</span>';

-               echo ', <span class="rankaddress">'.$aAddressLine['rank_search_label'].'</span>';
-               echo ', <span class="area">'.($aAddressLine['fromarea']=='t'?'Polygon':'Point').'</span>';
+               if (isset($aAddressLine['rank_search_label']) echo ', <span class="rankaddress">'.$aAddressLine['rank_search_label'].'</span>';
+//             echo ', <span class="area">'.($aAddressLine['fromarea']=='t'?'Polygon':'Point').'</span>';

                echo ', <span class="distance">'.$aAddressLine['distance'].'</span>';
                echo ' <a href="details.php?place_id='.$aAddressLine['place_id'].'">GOTO</a>';
                echo ')';
                echo ', <span class="distance">'.$aAddressLine['distance'].'</span>';
                echo ' <a href="details.php?place_id='.$aAddressLine['place_id'].'">GOTO</a>';
                echo ')';


@@ -148,9 +160,51 @@ foreach($aPolyPoints as $aPolyPoint)
        }
        echo '</div>';
 
        }
        echo '</div>';
 

+       if ($aLinkedLines)
+       {
+               echo '<h2>Linked Places</h2>';
+               echo '<div class=\"linked\">';
+               foreach($aLinkedLines as $aAddressLine)
+               {       
+                       $sOSMType = ($aAddressLine['osm_type'] == 'N'?'node':($aAddressLine['osm_type'] == 'W'?'way':($aAddressLine['osm_type'] == 'R'?'relation':'')));
+
+                       echo '<div class="line">';
+                       echo '<span class="name">'.(trim($aAddressLine['localname'])?$aAddressLine['localname']:'<span class="noname">No Name</span>').'</span>';
+                       echo ' (';
+                       echo '<span class="type"><span class="label">Type: </span>'.$aAddressLine['class'].':'.$aAddressLine['type'].'</span>';
+                       if ($sOSMType) echo ', <span class="osm"><span class="label"></span>'.$sOSMType.' <a href="http://www.openstreetmap.org/browse/'.$sOSMType.'/'.$aAddressLine['osm_id'].'">'.$aAddressLine['osm_id'].'</a></span>';
+                       echo ', <span class="adminlevel">'.$aAddressLine['admin_level'].'</span>';
+                       echo ', <span class="rankaddress">'.$aAddressLine['rank_search_label'].'</span>';
+//                     echo ', <span class="area">'.($aAddressLine['fromarea']=='t'?'Polygon':'Point').'</span>';
+                       echo ', <span class="distance">'.$aAddressLine['distance'].'</span>';
+                       echo ' <a href="details.php?place_id='.$aAddressLine['place_id'].'">GOTO</a>';
+                       echo ')';
+                       echo '</div>';
+               }
+               echo '</div>';
+       }
+
+       if ($aPlaceSearchNameKeywords)
+       {
+               echo '<h2>Name Keywords</h2>';
+               foreach($aPlaceSearchNameKeywords as $aRow)
+               {
+                       echo '<div>'.$aRow['word_token'].'</div>';
+               }
+       }
+
+       if ($aPlaceSearchAddressKeywords)
+       {
+               echo '<h2>Address Keywords</h2>';
+               foreach($aPlaceSearchAddressKeywords as $aRow)
+               {
+                       echo '<div>'.($aRow['word_token'][0]==' '?'*':'').$aRow['word_token'].'('.$aRow['word_id'].')'.'</div>';
+               }
+       }
+

        if (sizeof($aParentOfLines))
        {
        if (sizeof($aParentOfLines))
        {

-               echo '<h2>Parent Of (named features only):</h2>';
+               echo '<h2>Parent Of:</h2>';

 
                $aGroupedAddressLines = array();
                foreach($aParentOfLines as $aAddressLine)
 
                $aGroupedAddressLines = array();
                foreach($aParentOfLines as $aAddressLine)


@@ -181,6 +235,9 @@ foreach($aPolyPoints as $aPolyPoint)
                        echo '</div>';
                }
                }
                        echo '</div>';
                }
                }

+               if (sizeof($aParentOfLines) >= 500) {
+                       echo '<p>There are more child objects which are not shown.</p>';
+               }

                echo '</div>';
        }
 
                echo '</div>';
        }