feat: update to new onemap api

limyifan1 · Feb 20, 2024 · 978af70 · 978af70
1 parent 5480880
commit 978af70
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 15 deletions.
diff --git a/src/Components/Driver.js b/src/Components/Driver.js
@@ -333,7 +333,7 @@ export class Driver extends React.Component {
 
  callPostal = (postal) => {
  return fetch(
- "https://developers.onemap.sg/commonapi/search?searchVal=" +
+ "https://www.onemap.gov.sg/api/common/elastic/search?searchVal=" +
  postal +
  "&returnGeom=Y&getAddrDetails=Y"
  )

diff --git a/src/Components/Info.js b/src/Components/Info.js
@@ -274,7 +274,7 @@ export class Info extends React.Component {
 
  callPostal = (postal) => {
  return fetch(
- "https://developers.onemap.sg/commonapi/search?searchVal=" +
+ "https://www.onemap.gov.sg/api/common/elastic/search?searchVal=" +
  postal +
  "&returnGeom=Y&getAddrDetails=Y"
  )

diff --git a/src/Components/ListForm.js b/src/Components/ListForm.js
@@ -79,7 +79,7 @@ const createDomain = async (name, id, cover, uid) => {
  docid: id,
  logo: "",
  cover: cover,
- delivery_option: "none"
+ delivery_option: "none",
  })
  .then(async () => {
  await db
@@ -474,7 +474,7 @@ export class ListForm extends React.Component {
 
  callPostal = (postal) => {
  return fetch(
- "https://developers.onemap.sg/commonapi/search?searchVal=" +
+ "https://www.onemap.gov.sg/api/common/elastic/search?searchVal=" +
  postal +
  "&returnGeom=Y&getAddrDetails=Y"
  )

diff --git a/src/Components/Page.js b/src/Components/Page.js
@@ -453,7 +453,7 @@ export class Page extends React.Component {
 
  callPostal = (postal) => {
  return fetch(
- "https://developers.onemap.sg/commonapi/search?searchVal=" +
+ "https://www.onemap.gov.sg/api/common/elastic/search?searchVal=" +
  postal +
  "&returnGeom=Y&getAddrDetails=Y"
  )

diff --git a/src/Components/PageConfirm.js b/src/Components/PageConfirm.js
@@ -209,7 +209,7 @@ class FullScreenDialog extends Component {
 
  callPostal = (postal) => {
  return fetch(
- "https://developers.onemap.sg/commonapi/search?searchVal=" +
+ "https://www.onemap.gov.sg/api/common/elastic/search?searchVal=" +
  postal +
  "&returnGeom=Y&getAddrDetails=Y"
  )
@@ -344,7 +344,8 @@ class FullScreenDialog extends Component {
  this.context.cartProducts.length !== 0 &&
  this.context.cartProducts[i].quantity !== 0
  ) {
- number_of_items = number_of_items + this.context.cartProducts[i].quantity;
+ number_of_items =
+ number_of_items + this.context.cartProducts[i].quantity;
  let addons = "";
  let addonValue = 0;
 
@@ -518,11 +519,15 @@ class FullScreenDialog extends Component {
  this.context.cartProducts.length !== 0 &&
  this.context.cartProducts[i].quantity !== 0
  ) {
- var addonsArray = []
- this.context.cartProducts[i].addons.forEach(index => {
- var itemName = this.context.pageData.menu_combined[this.context.cartProducts[i].index].addon[index].name
- var itemPrice = this.context.pageData.menu_combined[this.context.cartProducts[i].index].addon[index].price
- addonsArray.push(itemName + " (+$" +itemPrice + ")")
+ var addonsArray = [];
+ this.context.cartProducts[i].addons.forEach((index) => {
+ var itemName = this.context.pageData.menu_combined[
+ this.context.cartProducts[i].index
+ ].addon[index].name;
+ var itemPrice = this.context.pageData.menu_combined[
+ this.context.cartProducts[i].index
+ ].addon[index].price;
+ addonsArray.push(itemName + " (+$" + itemPrice + ")");
  });
  orderItems.push({
  name: this.context.pageData.menu_combined[
@@ -535,7 +540,7 @@ class FullScreenDialog extends Component {
  this.context.cartProducts[i].index
  ].price
  ).toFixed(2),
- addon: addonsArray 
+ addon: addonsArray,
  });
  }
  }

diff --git a/src/Components/Search.js b/src/Components/Search.js
@@ -39,7 +39,7 @@ export class Search extends React.Component {
  callPostal = async () => {
  try {
  const response = await fetch(
- "https://developers.onemap.sg/commonapi/search?searchVal=" +
+ "https://www.onemap.gov.sg/api/common/elastic/search?searchVal=" +
  this.state.postal +
  "&returnGeom=Y&getAddrDetails=Y"
  );

diff --git a/src/Helpers/helpers.js b/src/Helpers/helpers.js
@@ -91,7 +91,7 @@ async function sendEmailToUpdateListing(
 
 async function getLatLng(postal) {
  return fetch(
- "https://developers.onemap.sg/commonapi/search?searchVal=" +
+ "https://www.onemap.gov.sg/api/common/elastic/search?searchVal=" +
  postal +
  "&returnGeom=Y&getAddrDetails=Y"
  )