Skip to content

Commit 02160b3

Browse files
authored
Merge pull request #46 from ciatph/feature/ciatph-45
Fix/ciatph 45
2 parents 39e8191 + e280de9 commit 02160b3

1 file changed

Lines changed: 4 additions & 12 deletions

File tree

src/components/widgets/LivelihoodZonesMap.vue

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,8 @@ export default {
132132
this.filters.ADM2_EN = null
133133
}
134134
} else {
135-
const provinceValue = (this.hardCodedNames[this.selectedProvince])
136-
? this.hardCodedNames[this.selectedProvince]
137-
: this.camelCase(this.selectedProvince)
135+
const provinceValue = (this.selectedProvince !== undefined)
136+
? this.selectedProvince : ''
138137
this.filters.ADM2_EN = ['==', 'ADM2_EN', provinceValue]
139138
}
140139
@@ -249,14 +248,7 @@ export default {
249248
return
250249
}
251250
252-
return Array.from(philippines[island][region],
253-
(x) => {
254-
if (this.hardCodedNames[x]) {
255-
return this.hardCodedNames[x]
256-
} else {
257-
return Array.from(x.split(' '), (y) => `${y[0].toUpperCase()}${y.substr(1, y.length)}`).join(' ')
258-
}
259-
})
251+
return philippines[island][region]
260252
},
261253
262254
// Build a region's province list
@@ -266,7 +258,7 @@ export default {
266258
267259
if (philippines[this.selectedIsland][this.selectedRegion]) {
268260
philippines[this.selectedIsland][this.selectedRegion].forEach((item, index) => {
269-
const provinceValue = (this.hardCodedNames[item]) ? this.hardCodedNames[item] : this.camelCase(item)
261+
const provinceValue = (item !== undefined) ? item : ''
270262
this.optionsProvince.push({ value: item, text: provinceValue })
271263
})
272264
}

0 commit comments

Comments
 (0)