Uses the citiesJSON service to get geoname

Author: eireland

src/models/data-manager.ts

@@ -145,7 +145,7 @@ export class DataManager {
 
       pluginState.pins.forEach(pin => {
         const extractedColor = geoImage.extractColor(pin.lat, pin.long);
-        const label = pinLabel(pin);
+        const label = pin.label || pinLabel(pin);
         const paletteIndex = this.reversePalette?.[GeoImage.rgbToNumber(extractedColor)] ?? -1;
         const paletteValue = neoDataset.paletteToValue(paletteIndex);
         const color = paletteValue === null ? {r: 148, g: 148, b: 148} : extractedColor;
@@ -264,7 +264,9 @@ export class DataManager {
         if (!image?.pins) {
           return;
         }
+        console.log("image.pins", image.pins);
         Object.values(image.pins).forEach(pin => {
+          console.log("pin", pin);
           items.push({
             date: image.date,
             color: pin.color,
@@ -281,7 +283,8 @@ export class DataManager {
       // FIXME: Change pin lat lon to geoname
       const pinColorMap: Record<string, string> = {};
       pluginState.pins.forEach(pin => {
-        pinColorMap[`${parseFloat(pin.lat.toFixed(2))}, ${parseFloat(pin.long.toFixed(2))}`] = pin.color;
+        pinColorMap[`${pin.label}`] = pin.color;
+        // pinColorMap[`${parseFloat(pin.lat.toFixed(2))}, ${parseFloat(pin.long.toFixed(2))}`] = pin.color;
       });
 
       await updateDataContextTitle(neoDataset.label);

src/models/plugin-state.ts

@@ -9,9 +9,9 @@ import {
   kPluginName,
   kVersion
 } from "../data/constants";
-import { createOrUpdateMap, createSelectionList, deleteSelectionList, updateSelectionList } from "../utils/codap-utils";
+import { createOrUpdateMap, createSelectionList, deleteSelectionList, updateSelectionList,
+  getMapComponentInfo } from "../utils/codap-utils";
 import { NeoDataset } from "./neo-types";
-import { getMapComponentInfo } from "../utils/codap-utils";
 import { geoLocSearch, MapComponentInfo } from "../utils/location-utils";
 
 export interface IMapPin {
@@ -84,12 +84,14 @@ class PluginState {
         const lat = pin.values[kPinLatAttributeName];
         const long = pin.values[kPinLongAttributeName];
         const locationResult = yield geoLocSearch(lat, long, bounds);
+        console.log("locationResult", locationResult);
         const label = locationResult.values.location;
         labels.push(label);
       }
 
       this.pins = pinData.map((pin: any, index: number) => {
         const values = pin.values;
+        console.log("labels", labels);
         return {
           color: values[kPinColorAttributeName],
           id: pin.id,

src/utils/location-utils.ts

@@ -64,9 +64,9 @@ export const geoLocSearch = async (lat: number, long: number, bounds: IBounds) =
   const populationLimitClause = "city15000";
   // boundsClause is used if using citiesJSON service
   const boundsClause = `north=${bounds.north}&south=${bounds.south}&east=${bounds.east}&west=${bounds.west}`;
-  // const url = `${kGeolocCitiesService}?${[locClause, userClause, boundsClause, maxRowsClause].join("&")}`;
-  const url = `${kGeolocService}?${[locClause, userClause, maxRowsClause, radiusClause, populationLimitClause ]
-                  .join("&")}`;
+  const url = `${kGeolocCitiesService}?${[locClause, userClause, boundsClause, maxRowsClause].join("&")}`;
+  // const url = `${kGeolocService}?${[locClause, userClause, maxRowsClause, radiusClause, populationLimitClause ]
+  //                 .join("&")}`;
   try {
     const response = await fetch(url);
     if (response.ok) {
@@ -87,14 +87,14 @@ export const geoLocSearch = async (lat: number, long: number, bounds: IBounds) =
       console.log("sorted geonames", JSON.parse(JSON.stringify(sortedGeonamesByPopulation)));
 
       // find the nearest location nearest the lat/long. We use the commented out code if using the citiesJSON service
-      // const nearest = findNearestCity(lat, long, data.geonames);
-      const nearest = sortedGeonamesByPopulation[0];
+      const nearest = findNearestCity(lat, long, data.geonames);
+      // const nearest = sortedGeonamesByPopulation[0];
       console.log("nearest location", JSON.parse(JSON.stringify(nearest)));
       return nearest
-        ? {success: true, values: {location:`${nearest.name}, ${nearest.adminCode1}`}}
+        // ? {success: true, values: {location:`${nearest.name}, ${nearest.adminCode1}`}}
         // Return this value if using the citiesJSON service.
         // citiesJSON service does not have adminCode1 (state name), se we use countrycode
-        // ? {success: true, values: {location:`${nearest.name}, ${nearest.countrycode}`}}
+        ? {success: true, values: {location:`${nearest.name}, ${nearest.countrycode}`}}
         : {success: false, values: {location: "Unknown Location"}};
     } else {
       return Promise.reject(response.statusText);