Remove the roles which have name written by pascal case

Change-Id: Ie66b4c6593b75d42e53a9f2426bd37823ec48991
Signed-off-by: Yuta Doi <yuta-d@witz-inc.co.jp>

2 files changed, 6 insertions, 6 deletions

diff --git a/layers.json b/layers.json
index c6c0916..097c03f 100644
--- a/layers.json
+++ b/layers.json
@@ -15,14 +15,14 @@
          "comment": "Single BackGround layer map for the Navigation, Radio and MediaPlayer"
       },
       {
-         "role": "^HomeScreen$|homescreen",
+         "role": "homescreen",
          "name": "FarHomeScreen",
          "layer_id": 1000,
          "area": { "type": "full" },
          "comment": "FarHomeScreen is the part of HomeScreen, and lawer layer of z order for HomeScreen"
       },
       {
-         "role": "Music|Video|WebBrowser|MediaPlayer|Radio|Phone|Navigation|HVAC|Settings|Dashboard|POI|Mixer|Fallback|launcher|music|video|browser|radio|phone|map|hvac|settings|dashboard|poi|mixer|sdl|fallback",
+         "role": "launcher|music|video|browser|radio|phone|map|hvac|settings|dashboard|poi|mixer|sdl|fallback",
          "name": "apps",
          "layer_id": 1001,
          "area": { "type": "rect", "rect": { "x": 0, "y": 218, "width": -1, "height": -433 } },
@@ -36,14 +36,14 @@
         "comment": "NearHomeScreen is the part of HomeScreen, and upper layer of z order for HomeScreen"
       },
       {
-        "role": "Restriction|restriction",
+        "role": "restriction",
         "name": "Restriction",
         "layer_id": 1003,
         "area": { "type": "rect", "rect": { "x": 0, "y": 218, "width": -1, "height": -433 } },
         "comment": "This layer is for restriction notification. This is used by restriction role"
       },
       {
-         "role": "^OnScreen.*|on_screen.*|pop_up|system_alert",
+         "role": "pop_up|system_alert",
          "name": "popups",
          "layer_id": 9999,
          "area": { "type": "rect", "rect": { "x": 0, "y": 760, "width": -1, "height": 400 } },
diff --git a/src/app.cpp b/src/app.cpp
index df59714..fedd227 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -768,7 +768,7 @@ result<int> App::api_request_surface(char const *drawing_name) {
       /**
        * register drawing_name as fallback and make it displayed.
        */
-      lid = this->layers.get_layer_id(std::string("Fallback"));
+      lid = this->layers.get_layer_id(std::string("fallback"));
       HMI_DEBUG("wm", "%s is not registered in layers.json, then fallback as normal app", drawing_name);
       if(!lid){
           return Err<int>("Drawing name does not match any role, Fallback is disabled");
@@ -811,7 +811,7 @@ char const *App::api_request_surface(char const *drawing_name,
       /**
        * register drawing_name as fallback and make it displayed.
        */
-      lid = this->layers.get_layer_id(std::string("Fallback"));
+      lid = this->layers.get_layer_id(std::string("fallback"));
       HMI_DEBUG("wm", "%s is not registered in layers.json, then fallback as normal app", drawing_name);
       if(!lid){
           return "Drawing name does not match any role, Fallback is disabled";