summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author <philippe colliot>2016-01-15 16:39:32 +0100
committer <philippe colliot>2016-01-15 16:39:32 +0100
commit3070b2ca91f7bfe624daf8f692e85d2e02cf6b56 (patch)
tree20166b71c41baa74a37201522e3e7463b0b90954
parent9be8508170ae34680ab8107f04a6398db373ecc2 (diff)
downloadpoi-service-3070b2ca91f7bfe624daf8f692e85d2e02cf6b56.tar.gz
Add the map to the repository (it has been removed from the server)
-rw-r--r--src/navigation/README6
-rw-r--r--src/navigation/map/.gitignore1
-rw-r--r--src/navigation/map/switzerland.binbin0 -> 72471762 bytes
-rw-r--r--src/poi-service/README52
-rw-r--r--test/poi-service/README17
5 files changed, 42 insertions, 34 deletions
diff --git a/src/navigation/README b/src/navigation/README
index d63e832..f7ab9ed 100644
--- a/src/navigation/README
+++ b/src/navigation/README
@@ -1,4 +1,4 @@
-Release date of the file: 04-08-2015
+Release date of the file: 15-01-2016
Status: OK
Project:
@@ -48,10 +48,6 @@ cd navit
patch -p0 -i ../patches/search_list_get_unique.diff
cd ../
-Get the sample map:
-wget -O ./map/switzerland.bin.tmp http://www.navit-project.org/switzerland.bin
-mv ./map/switzerland.bin.tmp ./map/switzerland.bin
-
===============================
Directory Structure
===============================
diff --git a/src/navigation/map/.gitignore b/src/navigation/map/.gitignore
deleted file mode 100644
index a8a0dce..0000000
--- a/src/navigation/map/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.bin
diff --git a/src/navigation/map/switzerland.bin b/src/navigation/map/switzerland.bin
new file mode 100644
index 0000000..627eb9c
--- /dev/null
+++ b/src/navigation/map/switzerland.bin
Binary files differ
diff --git a/src/poi-service/README b/src/poi-service/README
index 5c64dcd..a86ba0d 100644
--- a/src/poi-service/README
+++ b/src/poi-service/README
@@ -1,4 +1,4 @@
-Release date of the file: 18-11-2015
+Release date of the file: 15-01-2016
Status: OK
Project:
@@ -31,32 +31,44 @@ Ubuntu 15.10 64bits
To get the code:
Code is part of the navigation-service repository, so you need to clone the whole content:
git clone http://git.projects.genivi.org/lbs/navigation-service.git $WORKING-DIR
-
-===============================
-How To Build poi-server
-===============================
-Create and enter the build folder:
+=============================================================================================
+How-to for the proof of concept
+=============================================================================================
+
+==========================================
+All-in-one script
+==========================================
+./rebuild_all.sh
+
+==========================================
+How-to step by step, with explanations
+==========================================
+---Create and enter the build folder---
mkdir ./build
cd build
-
-Build:
cmake ../
make
cd ..
-===============================
-How To Run poi-server
-===============================
-
+==========================================
+How To Run
+==========================================
./bin/poi-server -f ./resource/poi-database-sample.db
-===============================
-How To Build poi-manager-server
-===============================
+=============================================================================================
+How to for the common api based proof of concept (for testing add/remove stuff into a database)
+=============================================================================================
NB: You need CommonAPI 3.1.2 and Franca 0.9.1 installed
+==========================================
+All-in-one script
+==========================================
+./rebuild_all.sh -f
+==========================================
+How-to step by step, with explanations
+==========================================
You need to pass as parameter to the cmake the link to your patched dbus library (required by CommonAPI)
cd build
@@ -64,9 +76,9 @@ cmake -DWITH_FRANCA_DBUS_INTERFACE=ON -DDBUS_LIB_PATH=yourPath -DCOMMONAPI_DBUS_
make
cd ..
-===============================
-How To Run poi-manager-server
-===============================
+==========================================
+How To Run
+==========================================
Copy the configuration file ./resource/commonapi-dbus.ini in a directory of your choice
@@ -78,9 +90,9 @@ export COMMONAPI_DBUS_DEFAULT_CONFIG=<your path>/commonapi-dbus.ini
cp ./resource/poi-database-managed.db ./bin
./bin/poi-manager-server -f ./bin/poi-database-managed.db
-===============================
+==========================================
About CommonAPI issues
-===============================
+==========================================
It seems to have an issue with the .cmake files when two versions of CommonAPI are installed
(see into /usr/local/lib/cmake/)
diff --git a/test/poi-service/README b/test/poi-service/README
index 46e5b6b..0962bd2 100644
--- a/test/poi-service/README
+++ b/test/poi-service/README
@@ -42,14 +42,14 @@ locale | grep 'LC_NUMERIC'
# you must get
LC_NUMERIC="en_US.UTF-8"
-===============================
+==========================================
Current versions of additional code
-===============================
+==========================================
<current version of positioning> (git): 32f9e5ce48f76c5c9833dda0e1743ab8b45dc574
-===============================
+==========================================
How to get additional code
-===============================
+==========================================
Get positioning:
git clone http://git.projects.genivi.org/lbs/positioning.git ./positioning
cd positioning
@@ -57,7 +57,7 @@ git checkout <current version of positioning>
cd ../
=============================================================================================
-How to for the proof of concept
+How-to for the proof of concept
=============================================================================================
(you're supposed to have got additional code before)
@@ -137,11 +137,12 @@ For a new search, click on CANCEL first
=============================================================================================
How to for the common api based proof of concept (for testing add/remove stuff into a database)
=============================================================================================
+NB: You need CommonAPI 3.1.2 and Franca 0.9.1 installed
==========================================
All-in-one script
==========================================
-./rebuil_all.sh -f
+./rebuild_all.sh -f
==========================================
How-to step by step, with explanations
@@ -157,9 +158,9 @@ cmake -DWITH_FRANCA_DBUS_INTERFACE=ON -DDBUS_LIB_PATH=yourPath -DCOMMONAPI_DBUS_
make
-===============================
+==========================================
How To Run
-===============================
+==========================================
./run_capi
NB: the configuration file ./resource/commonapi-dbus.ini is copied into $HOME