introduce Result class in Geocode and SearchDescription

[nominatim.git] / VAGRANT.md

diff --git a/VAGRANT.md b/VAGRANT.md
index cd3ed311f01443bfb3987f94339cf052e4075bf7..41d3024efe5749abf2e9841bc5ebb8cbcd348299 100644 (file)
--- a/VAGRANT.md
+++ b/VAGRANT.md
@@ -17,7 +17,7 @@ is.
 
 3. Nominatim 
 
 
 3. Nominatim 
 

-        git clone --recursive https://github.com/twain47/Nominatim.git
+        git clone --recursive https://github.com/openstreetmap/Nominatim.git

 
     If you haven't used `--recursive`, then you can load the submodules using
     
 
     If you haven't used `--recursive`, then you can load the submodules using
     


@@ -43,19 +43,17 @@ is.
     
     See the FAQ how to skip this step and point Nominatim to an existing database.
 
     
     See the FAQ how to skip this step and point Nominatim to an existing database.
 

-  ```
-  # inside the virtual machine:
-  mkdir data
-  cd build
-    wget --no-verbose --output-document=../data/monaco.osm.pbf http://download.geofabrik.de/europe/monaco-latest.osm.pbf
-    ./utils/setup.php --osm-file ../data/monaco.osm.pbf --osm2pgsql-cache 1000 --all 2>&1 | tee monaco.$$.log
-    ./utils/specialphrases.php --countries > ../data/specialphrases_countries.sql
-    psql -d nominatim -f ../data/specialphrases_countries.sql
-    ```
+      ```
+      # inside the virtual machine:
+      mkdir data
+      cd build
+      wget --no-verbose --output-document=../data/monaco.osm.pbf http://download.geofabrik.de/europe/monaco-latest.osm.pbf
+      ./utils/setup.php --osm-file ../data/monaco.osm.pbf --osm2pgsql-cache 1000 --all 2>&1 | tee monaco.$$.log
+      ```

 
 

-  To repeat an import you'd need to delete the database first
+    To repeat an import you'd need to delete the database first

 
 

-        dropdb -if-exists nominatim
+        dropdb --if-exists nominatim

 
 
 
 
 
 


@@ -104,7 +102,7 @@ and then
 
 ## Running unit tests
 
 
 ## Running unit tests
 

-    cd ~/Nominatim/tests-php
+    cd ~/Nominatim/tests/php

     phpunit ./
 
 
     phpunit ./