Skip to content

Commit

Permalink
Fixed: Zip codes starting with 0 now generate the latitude and longit…
Browse files Browse the repository at this point in the history
…ude correctly(hotwax#320)
  • Loading branch information
R-Sourabh committed Nov 5, 2024
1 parent 33cbb71 commit b0def40
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 7 deletions.
12 changes: 9 additions & 3 deletions src/components/FacilityGeoPointModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,12 @@ export default defineComponent({
},
async generateLatLong() {
this.isGeneratingLatLong = true
const postalCode = this.geoPoint.postalCode;
const query = postalCode.startsWith('0') ? `${postalCode} OR ${postalCode.substring(1)}` : `${postalCode}`;
const payload = {
json: {
params: {
q: `postcode: ${this.geoPoint.postalCode}`
q: `postcode: ${query}`
}
}
}
Expand All @@ -113,8 +115,12 @@ export default defineComponent({
if(!hasError(resp) && resp.data.response.docs.length > 0) {
const result = resp.data.response.docs[0]
this.geoPoint.latitude = result.latitude
this.geoPoint.longitude = result.longitude
if (postalCode.startsWith('0') && result.postcode !== postalCode.substring(1)) {
throw new Error();
}
this.geoPoint.latitude = result.latitude;
this.geoPoint.longitude = result.longitude;
} else {
throw resp.data
}
Expand Down
10 changes: 8 additions & 2 deletions src/components/GeoPointPopover.vue
Original file line number Diff line number Diff line change
Expand Up @@ -48,18 +48,24 @@ export default defineComponent({
emitter.emit('presentLoader')
try {
const postalCode = this.postalAddress.postalCode;
const query = postalCode.startsWith('0') ? `${postalCode} OR ${postalCode.substring(1)}` : postalCode;
resp = await UtilService.generateLatLong({
json: {
params: {
q: `postcode: ${this.postalAddress.postalCode}`
q: `postcode: ${query}`
}
}
})
if(!hasError(resp) && resp.data.response.docs.length > 0) {
generatedLatLong = resp.data.response.docs[0]
if(generatedLatLong.latitude && generatedLatLong.longitude) {
if (postalCode.startsWith('0') && generatedLatLong.postcode !== postalCode.substring(1)) {
throw new Error();
}
resp = await FacilityService.updateFacilityPostalAddress({
...this.postalAddress,
facilityId: this.facilityId,
Expand Down
9 changes: 8 additions & 1 deletion src/views/AddFacilityAddress.vue
Original file line number Diff line number Diff line change
Expand Up @@ -200,17 +200,24 @@ export default defineComponent({
if(this.contactNumber) this.saveTelecomNumber()
},
async generateLatLong() {
const postalCode = this.formData.postalCode;
const query = postalCode.startsWith('0') ? `${postalCode} OR ${postalCode.substring(1)}` : `${postalCode}`;
const payload = {
json: {
params: {
q: `postcode: ${this.formData.postalCode}`
q: `postcode: ${query}`
}
}
}
try {
const resp = await UtilService.generateLatLong(payload)
if (!hasError(resp)) {
const result = resp.data.response.docs[0]
if (postalCode.startsWith('0') && result.postcode !== postalCode.substring(1)) {
throw new Error();
}
this.formData.latitude = result.latitude
this.formData.longitude = result.longitude
} else {
Expand Down
4 changes: 3 additions & 1 deletion src/views/FacilityDetails.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1209,7 +1209,9 @@ export default defineComponent({
const resp = await UtilService.generateLatLong(payload)
if(!hasError(resp)) {
this.isRegenerationRequired = !(this.postalAddress.postalCode === resp.data.response.docs[0].postcode)
const postalCode = this.postalAddress.postalCode
const fetchedPostcode = resp.data.response.docs[0].postcode
this.isRegenerationRequired = !(postalCode.startsWith('0') ? postalCode.substring(1) === fetchedPostcode : postalCode === fetchedPostcode);
} else {
throw resp.data
}
Expand Down

0 comments on commit b0def40

Please sign in to comment.