ondemandnavi: remove org.agl.naviapi.conf from recipe

[AGL/meta-agl-demo.git] / recipes-demo-hmi / navigation / mapviewer / mapviewer.service

diff --git a/recipes-demo-hmi/navigation/mapviewer/mapviewer.service b/recipes-demo-hmi/navigation/mapviewer/mapviewer.service
index eba4a0d..971327c 100644 (file)
--- a/recipes-demo-hmi/navigation/mapviewer/mapviewer.service
+++ b/recipes-demo-hmi/navigation/mapviewer/mapviewer.service
@@ -1,22 +1,22 @@
 [Unit]
-Conflicts=getty@tty1.service
-After=weston.service
+Requires=afm-api-windowmanager@0.service
+After=afm-api-windowmanager@0.service
 
-# map viewr is a child application which can work with navigation.
+# mapviewer is a child application which can work with navigation.
 # This app requires mapdata. It has to be stored at /var/mapdata/navi_data_UK .
-# currently the position to be shown is 384x368 surface on screen 1 for CES2017 cluster demo.
+# currently the position to be shown is 384x368 surface on screen 1 for cluster demo.
 
 [Service]
-Environment=NAVI_DATA_DIR=/var/mapdata/navi_data_UK/japan_TR9 XDG_RUNTIME_DIR=/run/user/0
+Environment="XDG_RUNTIME_DIR=/run/platform/display"
 ExecStartPre=/bin/sleep 5
 ExecStart=/usr/bin/mapview
-ExecStartPost=/usr/bin/LayerManagerControl create layer 1000 1920 1080
-ExecStartPost=/usr/bin/LayerManagerControl set layer 1000 visibility 1
-ExecStartPost=/usr/bin/LayerManagerControl set screen 1 render order 1000
+ExecStartPost=/usr/bin/LayerManagerControl create layer 11001 1920 1080
+ExecStartPost=/usr/bin/LayerManagerControl set layer 11001 visibility 1
+ExecStartPost=/usr/bin/LayerManagerControl set screen 1 render order 11001
 ExecStartPost=/usr/AGL/mapviewer/mapviewer-settings.sh
-
 ExecStop=/usr/bin/killall -s KILL mapview
 Type=simple
+Restart=always
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=afm-user-session@.target