From f14e57e3656a5500563bdd32537ac1295d4a3f52 Mon Sep 17 00:00:00 2001
From: asanoaozora <fifitaneki@hotmail.com>
Date: Thu, 21 Sep 2017 16:48:50 +0200
Subject: update service config files for GDP

---
 src/navigation/map-viewer/navit_genivi_mapviewer_fsa.service        | 4 ++--
 .../navigation-core/navit_genivi_navigationcore_fsa.service         | 4 ++--
 src/navigation/run                                                  | 5 ++++-
 test/navigation/resource/location_seoul.xml                         | 6 +++---
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/navigation/map-viewer/navit_genivi_mapviewer_fsa.service b/src/navigation/map-viewer/navit_genivi_mapviewer_fsa.service
index 1a6fae3..eac1952 100644
--- a/src/navigation/map-viewer/navit_genivi_mapviewer_fsa.service
+++ b/src/navigation/map-viewer/navit_genivi_mapviewer_fsa.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Navit (Mapviewer part) Service for FSA configuration file
-Requires=dbus.service enhanced-position-service.service
-After=enhanced-position-service_fsa.service
+Requires=dbus.service enhanced-position-service.service gdp-new-hmi.service
+After=enhanced-position-service.service gdp-new-hmi.service
 
 [Service]
 Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/0/dbus/user_bus_socket
diff --git a/src/navigation/navigation-core/navit_genivi_navigationcore_fsa.service b/src/navigation/navigation-core/navit_genivi_navigationcore_fsa.service
index 47bcf27..796efd8 100644
--- a/src/navigation/navigation-core/navit_genivi_navigationcore_fsa.service
+++ b/src/navigation/navigation-core/navit_genivi_navigationcore_fsa.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Navit (Navigationcore part) Service for FSA configuration file
-Requires=dbus.service enhanced-position-service.service
-After=enhanced-position-service.service 
+Requires=dbus.service enhanced-position-service.service gdp-new-hmi.service
+After=enhanced-position-service.service gdp-new-hmi.service
 
 [Service]
 Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/0/dbus/user_bus_socket
diff --git a/src/navigation/run b/src/navigation/run
index 7495691..24efa16 100755
--- a/src/navigation/run
+++ b/src/navigation/run
@@ -115,6 +115,9 @@ do
 		tokyo)
 			center="139.74 35.70"
 			;;
+		seoul)
+			center="126.99 37.54"
+			;;
 		[0-9-]*)
 			center=$OPTARG
 			;;
@@ -148,7 +151,7 @@ do
 	h)
 		echo "Usage:"
 		echo "$0 [-c center][-gnoprvx]"
-		echo "-c: Set center (supported values: paris,tokyo,longitude,latitude). Default is geneve"
+		echo "-c: Set center (supported values: paris,tokyo,seoul,longitude,latitude). Default is geneve"
 		echo "-g: Run subprocesses within gdb (only with -x)"
 		echo "-h: This help"
 		echo "-n: Don't start enhanced-position-service"
diff --git a/test/navigation/resource/location_seoul.xml b/test/navigation/resource/location_seoul.xml
index 7822594..cb73833 100644
--- a/test/navigation/resource/location_seoul.xml
+++ b/test/navigation/resource/location_seoul.xml
@@ -2,9 +2,9 @@
 <location>
 <latitude>37.538835</latitude>
 <longitude>126.993809</longitude>
-<country>Korea</country>
-<city>서울</city>
-<street>hoenamu-ro 28-gil yongsan-gu</street>
+<country>Korea, Republic of</country>
+<city>용산구</city>
+<street>한강로</street>
 <number>47</number>
 </location>
 </location-set>
-- 
cgit v1.2.1