Merge pull request #2832 from the-deep/fix/analysis-schema

Fix analysis geo schema
the-deep · Mar 15, 2024 · f34b790 · f34b790
2 parents 1e8a6be + e7ebda3
commit f34b790
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 21 deletions.
diff --git a/app/views/PillarAnalysis/AnalyticalStatementInput/StoryAnalysisModal/Map/index.tsx b/app/views/PillarAnalysis/AnalyticalStatementInput/StoryAnalysisModal/Map/index.tsx
@@ -16,27 +16,25 @@ import HeatMap from '#components/HeatMap';
 import styles from './styles.css';
 
 const NLP_MAP = gql`
-query NlpMap($projectId: ID!, $nlpMapId: ID!) {
-    project(id: $projectId) {
-        id
-        analysisGeoTask(id: $nlpMapId) {
+    query NlpMap($projectId: ID!, $nlpMapId: ID!) {
+        project(id: $projectId) {
             id
-            status
-            entryGeo {
-                data {
-                    geoids {
-                        countrycode
-                        featurecode
-                        geonameid
-                        latitude
-                        longitude
-                        match
+            analysisGeoTask(id: $nlpMapId) {
+                id
+                status
+                entryGeo {
+                    data {
+                        meta {
+                            latitude
+                            longitude
+                            offsetEnd
+                            offsetStart
+                        }
                     }
                 }
             }
         }
     }
-}
 `;
 
 interface Props {
@@ -91,7 +89,7 @@ function NlpMap(props: Props) {
     const points = useMemo(() => {
         const latLongs = data?.project?.analysisGeoTask?.entryGeo
             ?.flatMap((geoData) => geoData?.data)
-            .flatMap((mapData) => mapData?.geoids)
+            .flatMap((mapData) => mapData?.meta)
             .filter(isDefined)
             .map((latLong) => ((latLong.latitude && latLong.longitude) ? {
                 count: 1,

diff --git a/app/views/PillarAnalysis/AnalyticalStatementInput/index.tsx b/app/views/PillarAnalysis/AnalyticalStatementInput/index.tsx
@@ -73,13 +73,11 @@ const AUTOMATIC_STORY_ANALYSIS = gql`
                     status
                     entryGeo {
                         data {
-                            geoids {
-                                countrycode
-                                featurecode
-                                geonameid
+                            meta {
                                 latitude
                                 longitude
-                                match
+                                offsetEnd
+                                offsetStart
                             }
                         }
                     }