X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-demo-hmi%2Fnavigation%2Fmapviewer%2Fmapviewer.service;h=971327cc2ea9ef257e7306d3b94c4ff79ec91d0b;hb=refs%2Fchanges%2F89%2F22289%2F1;hp=5a78843c72d39ee96e20e7cb71c82f7581225ef1;hpb=58e35ecf32af3aaf18af1e9576de74892f61cae5;p=AGL%2Fmeta-agl-demo.git

diff --git a/recipes-demo-hmi/navigation/mapviewer/mapviewer.service b/recipes-demo-hmi/navigation/mapviewer/mapviewer.service
index 5a78843c7..971327cc2 100644
--- a/recipes-demo-hmi/navigation/mapviewer/mapviewer.service
+++ b/recipes-demo-hmi/navigation/mapviewer/mapviewer.service
@@ -1,25 +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 render order 0x1000000 
-ExecStartPost=/usr/bin/LayerManagerControl set surface 0x1000000 source region 0 0 384 368
-ExecStartPost=/usr/bin/LayerManagerControl set surface 0x000000 destination region 0 0 384 368
-ExecStartPost=/usr/bin/LayerManagerControl set screen 1 render order 1000
-ExecStartPost=/usr/bin/LayerManagerControl set layer 1000 visibility 1
-ExecStartPost=/usr/bin/LayerManagerControl set surface 0x1000000 visibility 1
-
+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