typo

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

diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index b89bf747b3357a1b3c1a3764ec5c5f619d4c0eba..9124d594c4c56a82a476189147512ba6e43cfac0 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,9 @@ 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"));

 
                         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,16 +68,18 @@ 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 latlon;
 <?php
                        };
                        var proj_EPSG4326 = new OpenLayers.Projection("EPSG:4326");
                        var proj_map = map.getProjectionObject();
                        var latlon;
 <?php

+if (isset($aPolyPoints)) {

 foreach($aPolyPoints as $aPolyPoint)
 {
        echo "                        pointList.push(new OpenLayers.Geometry.Point(".$aPolyPoint[1].",".$aPolyPoint[2]."));\n";
 }
 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);
 ?>
                        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);


@@ -95,7 +96,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">';


@@ -148,6 +149,24 @@ foreach($aPolyPoints as $aPolyPoint)
        }
        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))
        {
                echo '<h2>Parent Of (named features only):</h2>';
        if (sizeof($aParentOfLines))
        {
                echo '<h2>Parent Of (named features only):</h2>';