Merge pull request #475 from matobaa/fix/change_noto_water_supply_fol…

…der_name follow the foldername of noto water supply kml
codeforjapan · Jan 17, 2024 · 22137c6 · 22137c6
2 parents 0af129b + 0284c24
commit 22137c6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/assets/config/2024-noto-earthquake.json b/assets/config/2024-noto-earthquake.json
@@ -83,7 +83,7 @@
       "icon_class": "fas fa-plug",
       "class": "layer_charger"
     },
-    "能登半島地震 給水": {
+    "能登半島地震 給水_石川・富山": {
       "name": "給水所",
       "name_en": "Water Supply",
       "color": "#285797",

diff --git a/components/PrintableMap.vue b/components/PrintableMap.vue
@@ -114,8 +114,8 @@ div
             :class='{show: isDisplayAllCategory || activeCategory === getMarkerCategoryText(group.category, $i18n.locale)}'
           )
             h2.list-title(
-              :style="{backgroundColor:mapConfig.layer_settings[group.category]?.color}"
-            )
+              :style="{backgroundColor:mapConfig.layer_settings[group.category]?.color||group.markers[0]?.feature?.properties['marker-color']||'darkgreen'}"
+            ) 
               span.list-title-mark
                 i(
                   :class="mapConfig.layer_settings[group.category]?.icon_class"