Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / TokenSpecialTerm.php

diff --git a/lib/TokenSpecialTerm.php b/lib/TokenSpecialTerm.php
index d2a21721aacb95a7c113d577900a36af71e803dc..b2c312ec90e53d8a52b022aeb01ab057059fbd3f 100644 (file)
--- a/lib/TokenSpecialTerm.php
+++ b/lib/TokenSpecialTerm.php
@@ -2,16 +2,20 @@
 
 namespace Nominatim\Token;
 
 
 namespace Nominatim\Token;
 

-require_once(CONST_BasePath.'/lib/SpecialSearchOperator.php');
+require_once(CONST_LibDir.'/SpecialSearchOperator.php');

 
 /**
  * A word token describing a place type.
  */
 class SpecialTerm
 {
 
 /**
  * A word token describing a place type.
  */
 class SpecialTerm
 {

+    /// Database word id, if applicable.

     public $iId;
     public $iId;

+    /// Class (or OSM tag key) of the place to look for.

     public $sClass;
     public $sClass;

+    /// Type (or OSM tag value) of the place to look for.

     public $sType;
     public $sType;

+    /// Relationship of the operator to the object (see Operator class).

     public $iOperator;
 
     public function __construct($iID, $sClass, $sType, $iOperator)
     public $iOperator;
 
     public function __construct($iID, $sClass, $sType, $iOperator)


@@ -30,7 +34,7 @@ class SpecialTerm
                 'Info' => array(
                            'class' => $this->sClass,
                            'type' => $this->sType,
                 'Info' => array(
                            'class' => $this->sClass,
                            'type' => $this->sType,

-                           'operator' => Operator::toString($this->iOperator)
+                           'operator' => \Nominatim\Operator::toString($this->iOperator)

                           )
                );
     }
                           )
                );
     }