Merge pull request #455 from matobaa/feature/454_revise_notations_of_…

…marks fixes #454
codeforjapan · Jan 6, 2024 · 6486e1a · 6486e1a
2 parents b9b9817 + 4e0d40b
commit 6486e1a
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 29 deletions.
diff --git a/assets/config/2024-noto-earthquake.json b/assets/config/2024-noto-earthquake.json
@@ -39,31 +39,31 @@
   "type": "KML",
   "layer_settings": {
     "能登町": {
-      "name": "能登町",
-      "name_en": "Noto Town",
-      "color": "#992222",
-      "bg_color": "#CA9491",
-      "icon_class": "fa-solid fa-1",
+      "name": "地域の目印（ランドマーク）",
+      "name_en": "Landmark",
+      "color": "#4f4f5a",
+      "bg_color": "#B7B7BE",
+      "icon_class": "fa-solid fa-map-pin",
       "class": "layer_gs_ok"
     },
     "能登町避難所": {
-      "name": "能登町避難所",
+      "name": "避難所（能登町指定避難先）",
       "name_en": "Evacuation center in Noto Town",
-      "color": "#4F4F5A",
-      "bg_color": "#B7B7BE",
-      "icon_class": "fa-solid fa-2",
+      "color": "#276445",
+      "bg_color": "#A4C1B0",
+      "icon_class": "fa-solid fa-street-view",
       "class": "layer_gs_undefined"
     },
     "他自治体": {
-      "name": "他自治体",
-      "name_en": "Other municipalities",
-      "color": "#285797",
-      "bg_color": "#A3BBDA",
-      "icon_class": "fa-solid fa-3",
+      "name": "避難所（他自治体指定避難先）",
+      "name_en": "Evacuation center out of Noto Town",
+      "color": "#276445",
+      "bg_color": "#A4C1B0",
+      "icon_class": "fa-solid fa-street-view",
       "class": "layer_water_chibacity"
     },
     "SNS情報": {
-      "name": "SNS情報",
+      "name": "自主避難先",
       "name_en": "SNS information",
       "color": "#276445",
       "bg_color": "#A4C1B0",
@@ -79,26 +79,26 @@
       "class": "layer_charger"
     },
     "能登半島地震 給水": {
-      "name": "給水",
-      "name_en": "Noto Peninsula Earthquake Water Supply",
-      "color": "#2196f3",
-      "bg_color": "#2196f3",
-      "icon_class": "fas fa-tint",
+      "name": "給水所",
+      "name_en": "Water Supply",
+      "color": "#285797",
+      "bg_color": "#A3BBDA",
+      "icon_class": "fa-solid fa-droplet",
       "class": "layer_water"
     },
     "能登半島地震 給水_新潟県": {
-      "name": "給水",
-      "name_en": "Noto Peninsula Earthquake Water Supply",
-      "color": "#2196f3",
-      "bg_color": "#2196f3",
-      "icon_class": "fas fa-tint",
+      "name": "給水所（新潟県）",
+      "name_en": "Water Supply",
+      "color": "#285797",
+      "bg_color": "#A3BBDA",
+      "icon_class": "fa-solid fa-droplet",
       "class": "layer_water"
     },
     "営業中のガソリンスタンド": {
       "name": "ガソリンスタンド",
       "name_en": "Gas Station",
-      "color": "#ffc107",
-      "bg_color": "#ffc107",
+      "color": "#992222",
+      "bg_color": "#CA9491",
       "icon_class": "fas fa-gas-pump",
       "class": "layer_gas_station"
     }

diff --git a/components/PrintableMap.vue b/components/PrintableMap.vue
@@ -36,7 +36,7 @@ div
                     :style="{backgroundColor:mapConfig.layer_settings[marker.category]?.color}"
                   )
                   span.popup-poi-type
-                    | {{getMarkerCategoryText(marker.category, $i18n.locale)}}
+                    | {{getMarkerCategoryText(mapConfig.layer_settings[marker.category]?.name||marker.category, $i18n.locale)}}
                 p
                   | {{$i18n.t("PrintableMap.name")}} {{getMarkerNameText(marker.feature.properties, $i18n.locale)}}
                 div.popup-detail-content
@@ -120,7 +120,7 @@ div
                 i(
                   :class="mapConfig.layer_settings[group.category]?.icon_class"
                 )
-              span {{getMarkerCategoryText(group.category, $i18n.locale)}}
+              span {{getMarkerCategoryText(mapConfig.layer_settings[group.category]?.name||group.category, $i18n.locale)}}
             ul.list-items.grid-noGutter
               li.col-12_xs-6(v-for="marker in group.markers")
                 span.item-number {{inBoundsMarkers.indexOf(marker) +1}}