Merge pull request #1047 from DataUSA/geoservice-update

Geo Service update
DataUSA · Sep 13, 2023 · e21adbb · e21adbb
2 parents 0d20315 + 842fc6d
commit e21adbb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/api/crosswalks.js b/api/crosswalks.js
@@ -10,7 +10,7 @@ const naics2io = loadJSON("/static/data/pums_naics_to_iocode.json");
 const naics2bls = loadJSON("/static/data/pums_bls_industry_crosswalk.json");
 const soc2bls = loadJSON("/static/data/pums_bls_occupation_crosswalk.json");
 
-const {CANON_API, CANON_LOGICLAYER_CUBE} = process.env;
+const {CANON_API, CANON_GEOSERVICE_API} = process.env;
 const geoOrder = ["Nation", "State", "County", "MSA", "Place", "PUMA"];
 
 module.exports = function(app) {
@@ -43,7 +43,7 @@ module.exports = function(app) {
         drilldown = "MSA-Tract";
       }
       else {
-        const url = `${CANON_LOGICLAYER_CUBE}/geoservice-api/relations/intersects/${id}?targetLevels=state&overlapSize=true`;
+        const url = `${CANON_GEOSERVICE_API}/api/relations/intersects/${id}?targetLevels=state&overlapSize=true`;
         const cuts = await axios.get(url)
           .then(resp => resp.data)
           .then(resp => {
@@ -101,7 +101,7 @@ module.exports = function(app) {
       level = "State";
     }
     else if (prefix === "310") {
-      const url = `${CANON_LOGICLAYER_CUBE}/geoservice-api/relations/intersects/${id}?targetLevels=state&overlapSize=true`;
+      const url = `${CANON_GEOSERVICE_API}/api/relations/intersects/${id}?targetLevels=state&overlapSize=true`;
       const parents = await axios.get(url)
         .then(resp => resp.data)
         .then(resp => {
@@ -199,8 +199,8 @@ module.exports = function(app) {
                         : false;
 
             const url = targetLevels
-              ? `${CANON_LOGICLAYER_CUBE}/geoservice-api/relations/intersects/${id}?targetLevels=${targetLevels}`
-              : `${CANON_LOGICLAYER_CUBE}/geoservice-api/relations/intersects/${id}`;
+              ? `${CANON_GEOSERVICE_API}/api/relations/intersects/${id}?targetLevels=${targetLevels}`
+              : `${CANON_GEOSERVICE_API}/api/relations/intersects/${id}`;
 
             let ids = await axios.get(url)
               .then(resp => resp.data)
@@ -487,8 +487,8 @@ module.exports = function(app) {
                       : false;
 
           const url = targetLevels
-            ? `${CANON_LOGICLAYER_CUBE}/geoservice-api/relations/intersects/${attr.id}?targetLevels=${targetLevels}&overlapSize=true`
-            : `${CANON_LOGICLAYER_CUBE}/geoservice-api/relations/intersects/${attr.id}&overlapSize=true`;
+            ? `${CANON_GEOSERVICE_API}/api/relations/intersects/${attr.id}?targetLevels=${targetLevels}&overlapSize=true`
+            : `${CANON_GEOSERVICE_API}/api/relations/intersects/${attr.id}&overlapSize=true`;
 
           const parents = await axios.get(url)
             .then(resp => resp.data)
@@ -562,7 +562,7 @@ module.exports = function(app) {
 
     if (dimension === "Geography") {
 
-      const url = `${CANON_LOGICLAYER_CUBE}/geoservice-api/neighbors/${id}`;
+      const url = `${CANON_GEOSERVICE_API}/api/neighbors/${id}`;
       const neighbors = await axios.get(url)
         .then(resp => resp.data)
         .then(resp => {

diff --git a/api/election.js b/api/election.js
@@ -6,7 +6,7 @@ const candidates = {
   representative: loadJSON("/static/data/representatives.json")
 };
 
-const {CANON_LOGICLAYER_CUBE} = process.env;
+const {CANON_GEOSERVICE_API} = process.env;
 
 module.exports = function(app) {
 
@@ -24,7 +24,7 @@ module.exports = function(app) {
 
       if (!geo.startsWith("040")) {
         const targetLevels = type === "senator" ? "state" : "state,congressionaldistrict";
-        const url = `${CANON_LOGICLAYER_CUBE}/geoservice-api/relations/intersects/${geo}?targetLevels=${targetLevels}&overlapSize=true`;
+        const url = `${CANON_GEOSERVICE_API}/api/relations/intersects/${geo}?targetLevels=${targetLevels}&overlapSize=true`;
         const parents = await axios.get(url)
           .then(resp => resp.data)
           .then(resp => {

diff --git a/canon.js b/canon.js
@@ -1,6 +1,6 @@
 const d3Array = require("d3-array");
 
-const {CANON_API, CANON_LOGICLAYER_CUBE} = process ? process.env : {};
+const {CANON_API, CANON_GEOSERVICE_API} = process ? process.env : {};
 
 const geoRelations = {
   children: {
@@ -19,7 +19,7 @@ const geoRelations = {
     url: id => `${CANON_API}/api/geo/childrenCounty/${id}/`
   },
   neighbors: {
-    url: id => `${CANON_LOGICLAYER_CUBE}/geoservice-api/neighbors/${id}`,
+    url: id => `${CANON_GEOSERVICE_API}/api/neighbors/${id}`,
     callback: resp => {
       if (resp.error) {
         console.error("[geoservice error]");
@@ -148,7 +148,7 @@ module.exports = {
         },
         url: (id, level) => {
           const targetLevel = level.toLowerCase();
-          return `${CANON_LOGICLAYER_CUBE}/geoservice-api/relations/intersects/${id}?targetLevels=${targetLevel}&overlapSize=true`;
+          return `${CANON_GEOSERVICE_API}/api/relations/intersects/${id}?targetLevels=${targetLevel}&overlapSize=true`;
         },
         callback: resp => {
           let arr = [];