【examples】疫情地图处理数据暂缺的情况 review by xiongjj

songyumeng · songyumeng · commit 32ce7a9887a9 · 2020-03-27T09:51:15.000+08:00
diff --git a/examples/component/components_ncp_china_vue.html b/examples/component/components_ncp_china_vue.html
@@ -127,24 +127,32 @@
                 },
                 'china-incrementConfirmed': {
                     tooltip: function(properties) {
+                        if (isNaN(properties['confirmedAdd'])) {
+                            return resources.text_ncp_nodata_tooltip.replace('{name}', properties['省份']);
+                        }
                         return resources.text_ncp_incrementConfirmed_tooltip
                             .replace('{name}', properties['省份'])
                             .replace('{confirmedAdd}', properties['confirmedAdd']);
                     },
                     title: resources.text_ncp_incrementConfirmed_title,
                     'fill-color': [
                         'case',
-                        ['>=', ['get', 'confirmedAdd'], 200],
-                        '#d7301f',
-                        ['>=', ['get', 'confirmedAdd'], 100],
-                        '#ef6548',
-                        ['>=', ['get', 'confirmedAdd'], 50],
-                        '#fc8d59',
-                        ['>=', ['get', 'confirmedAdd'], 10],
-                        '#fdbb84',
-                        ['>=', ['get', 'confirmedAdd'], 1],
-                        '#fdd49e',
-                        '#F4F4F4'
+                        ['has', 'confirmedAdd'],
+                        [
+                            'case',
+                            ['>=', ['get', 'confirmedAdd'], 200],
+                            '#d7301f',
+                            ['>=', ['get', 'confirmedAdd'], 100],
+                            '#ef6548',
+                            ['>=', ['get', 'confirmedAdd'], 50],
+                            '#fc8d59',
+                            ['>=', ['get', 'confirmedAdd'], 10],
+                            '#fdbb84',
+                            ['>=', ['get', 'confirmedAdd'], 1],
+                            '#fdd49e',
+                            '#F4F4F4'
+                        ],
+                        '#D9D9D9'
                     ],
                     'text-field': [
                         'concat',
@@ -155,24 +163,32 @@
                 },
                 'china-nowConfirmed': {
                     tooltip: function(properties) {
+                        if (isNaN(properties['nowConfirmed'])) {
+                            return resources.text_ncp_nodata_tooltip.replace('{name}', properties['省份']);
+                        }
                         return resources.text_ncp_nowConfirmed_tooltip
                             .replace('{name}', properties['省份'])
                             .replace('{nowConfirmed}', properties['nowConfirmed']);
                     },
                     title: resources.text_ncp_nowConfirmed_title,
                     'fill-color': [
                         'case',
-                        ['>=', ['get', 'nowConfirmed'], 200],
-                        '#d7301f',
-                        ['>=', ['get', 'nowConfirmed'], 100],
-                        '#ef6548',
-                        ['>=', ['get', 'nowConfirmed'], 50],
-                        '#fc8d59',
-                        ['>=', ['get', 'nowConfirmed'], 10],
-                        '#fdbb84',
-                        ['>=', ['get', 'nowConfirmed'], 1],
-                        '#fdd49e',
-                        '#F4F4F4'
+                        ['has', 'nowConfirmed'],
+                        [
+                            'case',
+                            ['>=', ['get', 'nowConfirmed'], 200],
+                            '#d7301f',
+                            ['>=', ['get', 'nowConfirmed'], 100],
+                            '#ef6548',
+                            ['>=', ['get', 'nowConfirmed'], 50],
+                            '#fc8d59',
+                            ['>=', ['get', 'nowConfirmed'], 10],
+                            '#fdbb84',
+                            ['>=', ['get', 'nowConfirmed'], 1],
+                            '#fdd49e',
+                            '#F4F4F4'
+                        ],
+                        '#D9D9D9'
                     ],
                     'text-field': ['get', '省份'],
                     'line-color': '#83838D'
diff --git a/examples/locales/en-US/resources.js b/examples/locales/en-US/resources.js
@@ -1378,6 +1378,7 @@ window.examplesResources = {
         'text_ncp_nowConfirmed':"Current Confirmed",
         'text_ncp_incrementConfirmed':"New Confirmed",
         'text_ncp_incidence':"Reported Incidence",
+        'text_ncp_nodata_tooltip':"{name}: No Data",
         'text_ncp_riskLevel_tooltip':"{name}: No new confirmed for {daysNoConfirmedAdd} consecutive days",
         'text_ncp_riskLevel_tooltip1':"{name}: The highest newly diagnosed in the past 3 days {daysMaxConfirmedAdd}<br>New confirmed {confirmedAdd} yesterday",
         'text_ncp_riskLevel_title':"Epidemic Risk Level Map",
diff --git a/examples/locales/zh-CN/resources.js b/examples/locales/zh-CN/resources.js
@@ -1324,6 +1324,7 @@ window.examplesResources = {
         'text_ncp_nowConfirmed':"现有确诊",
         'text_ncp_incrementConfirmed':"新增确诊",
         'text_ncp_incidence':"报告发病率",
+        'text_ncp_nodata_tooltip':"{name}：数据暂缺",
         'text_ncp_riskLevel_tooltip':"{name}：连续 {daysNoConfirmedAdd} 天无新增确诊",
         'text_ncp_riskLevel_tooltip1':"{name}：近3天最高新增确诊 {daysMaxConfirmedAdd}<br>昨新增确诊 {confirmedAdd}",
         'text_ncp_riskLevel_title':"疫情风险等级图",
