@pretto/places 0.21.0 → 0.23.0

package/dist/index.js

@@ -48,7 +48,7 @@ const convertFirstLetterToUpperCase = (str) => {
 };
 const getUri = (search, departmentOnly) => {
     const PLACES_API = 'https://geo.api.gouv.fr';
-    const QUERY_FIELDS = `boost=population&fields=departement${departmentOnly ? ',centre' : ',codesPostaux,centre'}`;
+    const QUERY_FIELDS = `boost=population&fields=departement${departmentOnly ? ',centre,contour' : ',codesPostaux,centre,contour'}`;
     const formatedSearch = encodeURIComponent(search);
     const uri = {
         departments: `${PLACES_API}/departements/${formatedSearch}/communes?${QUERY_FIELDS}`,
@@ -79,6 +79,7 @@ const responseFormat = (places, country, search, departmentOnly) => {
                     center,
                     city: place.nom,
                     country,
+                    outline: place.contour.coordinates[0].map(([longitude, latitude]) => ({ longitude, latitude })),
                     zipcode: ((_b = place.departement) === null || _b === void 0 ? void 0 : _b.code) || '',
                 },
             };
@@ -91,7 +92,13 @@ const responseFormat = (places, country, search, departmentOnly) => {
         return [
             {
                 label: `${places[0].nom} (${search})`,
-                value: { center, city: places[0].nom, country, zipcode: search },
+                value: {
+                    center,
+                    city: places[0].nom,
+                    country,
+                    outline: places[0].contour.coordinates[0].map(([longitude, latitude]) => ({ longitude, latitude })),
+                    zipcode: search,
+                },
             },
         ];
     }
@@ -104,7 +111,13 @@ const responseFormat = (places, country, search, departmentOnly) => {
                 ...acc,
                 {
                     label: `${place.nom} (${curr})`,
-                    value: { center, city: place.nom, country, zipcode: curr },
+                    value: {
+                        center,
+                        city: place.nom,
+                        country,
+                        outline: place.contour.coordinates[0].map(([longitude, latitude]) => ({ longitude, latitude })),
+                        zipcode: curr,
+                    },
                 },
             ];
         }, []);
@@ -289,22 +302,31 @@ var geolocSearch = /*#__PURE__*/Object.freeze({
     get: get$1
 });
 
-const formatData = (results) => {
-    return results.map(result => ({
+const formatData = (geoResults, addressResults) => {
+    const district = addressResults.features.length > 0 ? addressResults.features[0].properties.district : null;
+    const postcode = addressResults.features.length > 0 ? addressResults.features[0].properties.postcode : null;
+    return geoResults.map(result => ({
         center: { latitude: result.centre.coordinates[1], longitude: result.centre.coordinates[0] },
         city: result.nom,
         code: result.code,
         coordinates: result.centre.coordinates,
         zipcode: result.codesPostaux[0],
+        outline: result.contour.coordinates[0].map(([longitude, latitude]) => ({ longitude, latitude })),
+        district,
+        postcode,
     }));
 };
-const getData = (search) => __awaiter(void 0, void 0, void 0, function* () {
+const getData = (search, signal) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const response = yield fetch(`https://geo.api.gouv.fr/communes?lat=${search.latitude}&lon=${search.longitude}&fields=departement,codesPostaux,centre`);
-        if (!response.ok)
-            return Promise.reject(response);
-        const results = yield response.json();
-        return formatData(results);
+        const [geoResponse, addressResponse] = yield Promise.all([
+            fetch(`https://geo.api.gouv.fr/communes?lat=${search.latitude}&lon=${search.longitude}&fields=departement,codesPostaux,centre,contour`, { signal }),
+            fetch(`https://api-adresse.data.gouv.fr/reverse/?lat=${search.latitude}&lon=${search.longitude}&limit=1&&autocomplete=0`, { signal }),
+        ]);
+        if (!geoResponse.ok)
+            return Promise.reject(geoResponse);
+        const geoResults = yield geoResponse.json();
+        const addressResults = yield addressResponse.json();
+        return formatData(geoResults, addressResults);
     }
     catch (error) {
         if (typeof error === 'string')
@@ -313,11 +335,11 @@ const getData = (search) => __awaiter(void 0, void 0, void 0, function* () {
     }
 });
 let getDelayedData;
-const get = (search, debounceValue = 300) => {
+const get = (search, debounceValue = 300, signal) => {
     clearTimeout(getDelayedData);
     return new Promise((resolve, reject) => {
         getDelayedData = setTimeout(() => {
-            resolve(getData(search));
+            resolve(getData(search, signal));
         }, debounceValue);
     });
 };

package/dist/module.js

@@ -38,7 +38,7 @@ const convertFirstLetterToUpperCase = (str) => {
 };
 const getUri = (search, departmentOnly) => {
     const PLACES_API = 'https://geo.api.gouv.fr';
-    const QUERY_FIELDS = `boost=population&fields=departement${departmentOnly ? ',centre' : ',codesPostaux,centre'}`;
+    const QUERY_FIELDS = `boost=population&fields=departement${departmentOnly ? ',centre,contour' : ',codesPostaux,centre,contour'}`;
     const formatedSearch = encodeURIComponent(search);
     const uri = {
         departments: `${PLACES_API}/departements/${formatedSearch}/communes?${QUERY_FIELDS}`,
@@ -69,6 +69,7 @@ const responseFormat = (places, country, search, departmentOnly) => {
                     center,
                     city: place.nom,
                     country,
+                    outline: place.contour.coordinates[0].map(([longitude, latitude]) => ({ longitude, latitude })),
                     zipcode: ((_b = place.departement) === null || _b === void 0 ? void 0 : _b.code) || '',
                 },
             };
@@ -81,7 +82,13 @@ const responseFormat = (places, country, search, departmentOnly) => {
         return [
             {
                 label: `${places[0].nom} (${search})`,
-                value: { center, city: places[0].nom, country, zipcode: search },
+                value: {
+                    center,
+                    city: places[0].nom,
+                    country,
+                    outline: places[0].contour.coordinates[0].map(([longitude, latitude]) => ({ longitude, latitude })),
+                    zipcode: search,
+                },
             },
         ];
     }
@@ -94,7 +101,13 @@ const responseFormat = (places, country, search, departmentOnly) => {
                 ...acc,
                 {
                     label: `${place.nom} (${curr})`,
-                    value: { center, city: place.nom, country, zipcode: curr },
+                    value: {
+                        center,
+                        city: place.nom,
+                        country,
+                        outline: place.contour.coordinates[0].map(([longitude, latitude]) => ({ longitude, latitude })),
+                        zipcode: curr,
+                    },
                 },
             ];
         }, []);
@@ -279,22 +292,31 @@ var geolocSearch = /*#__PURE__*/Object.freeze({
     get: get$1
 });
 
-const formatData = (results) => {
-    return results.map(result => ({
+const formatData = (geoResults, addressResults) => {
+    const district = addressResults.features.length > 0 ? addressResults.features[0].properties.district : null;
+    const postcode = addressResults.features.length > 0 ? addressResults.features[0].properties.postcode : null;
+    return geoResults.map(result => ({
         center: { latitude: result.centre.coordinates[1], longitude: result.centre.coordinates[0] },
         city: result.nom,
         code: result.code,
         coordinates: result.centre.coordinates,
         zipcode: result.codesPostaux[0],
+        outline: result.contour.coordinates[0].map(([longitude, latitude]) => ({ longitude, latitude })),
+        district,
+        postcode,
     }));
 };
-const getData = (search) => __awaiter(void 0, void 0, void 0, function* () {
+const getData = (search, signal) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const response = yield fetch(`https://geo.api.gouv.fr/communes?lat=${search.latitude}&lon=${search.longitude}&fields=departement,codesPostaux,centre`);
-        if (!response.ok)
-            return Promise.reject(response);
-        const results = yield response.json();
-        return formatData(results);
+        const [geoResponse, addressResponse] = yield Promise.all([
+            fetch(`https://geo.api.gouv.fr/communes?lat=${search.latitude}&lon=${search.longitude}&fields=departement,codesPostaux,centre,contour`, { signal }),
+            fetch(`https://api-adresse.data.gouv.fr/reverse/?lat=${search.latitude}&lon=${search.longitude}&limit=1&&autocomplete=0`, { signal }),
+        ]);
+        if (!geoResponse.ok)
+            return Promise.reject(geoResponse);
+        const geoResults = yield geoResponse.json();
+        const addressResults = yield addressResponse.json();
+        return formatData(geoResults, addressResults);
     }
     catch (error) {
         if (typeof error === 'string')
@@ -303,11 +325,11 @@ const getData = (search) => __awaiter(void 0, void 0, void 0, function* () {
     }
 });
 let getDelayedData;
-const get = (search, debounceValue = 300) => {
+const get = (search, debounceValue = 300, signal) => {
     clearTimeout(getDelayedData);
     return new Promise((resolve, reject) => {
         getDelayedData = setTimeout(() => {
-            resolve(getData(search));
+            resolve(getData(search, signal));
         }, debounceValue);
     });
 };

package/dist/municipalitySearch.d.ts

@@ -7,6 +7,10 @@ export interface MunicipalitySearchResult {
         } | null;
         city: string;
         country: string;
+        outline: Array<{
+            latitude: number;
+            longitude: number;
+        }>;
         zipcode: string;
     };
 }
@@ -21,6 +25,9 @@ export interface MunicipalityApiResult {
         nom: string;
     };
     codesPostaux: string[];
+    contour: {
+        coordinates: Array<Array<Array<number>>>;
+    };
 }
 interface Options {
     country?: string;

package/dist/municipalitySearch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"municipalitySearch.d.ts","sourceRoot":"","sources":["../src/municipalitySearch.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,wBAAwB;IACvC,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE;QACL,MAAM,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAC;YAAC,SAAS,EAAE,MAAM,CAAA;SAAE,GAAG,IAAI,CAAA;QACtD,IAAI,EAAE,MAAM,CAAA;QACZ,OAAO,EAAE,MAAM,CAAA;QACf,OAAO,EAAE,MAAM,CAAA;KAChB,CAAA;CACF;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,CAAC,EAAE;QAAE,WAAW,EAAE,MAAM,EAAE,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAA;IACvD,GAAG,EAAE,MAAM,CAAA;IACX,WAAW,CAAC,EAAE;QACZ,IAAI,EAAE,MAAM,CAAA;QACZ,GAAG,EAAE,MAAM,CAAA;KACZ,CAAA;IACD,YAAY,EAAE,MAAM,EAAE,CAAA;CACvB;AAED,UAAU,OAAO;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB;AAED,aAAK,2BAA2B,GAAG,CACjC,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,OAAO,EACjB,aAAa,CAAC,EAAE,MAAM,KACnB,OAAO,CAAC,wBAAwB,EAAE,GAAG,MAAM,CAAC,CAAA;AAEjD,aAAK,kBAAkB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,wBAAwB,EAAE,GAAG,MAAM,CAAC,CAAA;AAgE7G,eAAO,MAAM,OAAO,EAAE,kBAoCrB,CAAA;AAID,eAAO,MAAM,GAAG,EAAE,2BAQjB,CAAA"}
+{"version":3,"file":"municipalitySearch.d.ts","sourceRoot":"","sources":["../src/municipalitySearch.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,wBAAwB;IACvC,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE;QACL,MAAM,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAC;YAAC,SAAS,EAAE,MAAM,CAAA;SAAE,GAAG,IAAI,CAAA;QACtD,IAAI,EAAE,MAAM,CAAA;QACZ,OAAO,EAAE,MAAM,CAAA;QACf,OAAO,EAAE,KAAK,CAAC;YAAE,QAAQ,EAAE,MAAM,CAAC;YAAC,SAAS,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;QACvD,OAAO,EAAE,MAAM,CAAA;KAChB,CAAA;CACF;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,CAAC,EAAE;QAAE,WAAW,EAAE,MAAM,EAAE,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAA;IACvD,GAAG,EAAE,MAAM,CAAA;IACX,WAAW,CAAC,EAAE;QACZ,IAAI,EAAE,MAAM,CAAA;QACZ,GAAG,EAAE,MAAM,CAAA;KACZ,CAAA;IACD,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,OAAO,EAAE;QAAE,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;KAAE,CAAA;CACtD;AAED,UAAU,OAAO;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB;AAED,aAAK,2BAA2B,GAAG,CACjC,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,OAAO,EACjB,aAAa,CAAC,EAAE,MAAM,KACnB,OAAO,CAAC,wBAAwB,EAAE,GAAG,MAAM,CAAC,CAAA;AAEjD,aAAK,kBAAkB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,wBAAwB,EAAE,GAAG,MAAM,CAAC,CAAA;AA6E7G,eAAO,MAAM,OAAO,EAAE,kBAoCrB,CAAA;AAID,eAAO,MAAM,GAAG,EAAE,2BAQjB,CAAA"}

package/dist/reverseGeolocSearch.d.ts

@@ -6,10 +6,16 @@ export declare type ReverseGeolocSearchResult = {
     city: string;
     code: string;
     coordinates: [number, number];
+    outline: Array<{
+        latitude: number;
+        longitude: number;
+    }>;
     zipcode: string;
+    postcode: string | null;
+    district: string | null;
 };
 export declare const get: (search: {
     latitude: number;
     longitude: number;
-}, debounceValue?: number) => Promise<ReverseGeolocSearchResult[]>;
+}, debounceValue?: number, signal?: AbortSignal | undefined) => Promise<ReverseGeolocSearchResult[]>;
 //# sourceMappingURL=reverseGeolocSearch.d.ts.map

package/dist/reverseGeolocSearch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reverseGeolocSearch.d.ts","sourceRoot":"","sources":["../src/reverseGeolocSearch.ts"],"names":[],"mappings":"AAAA,oBAAY,yBAAyB,GAAG;IACtC,MAAM,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAA;IAC/C,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC7B,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAyCD,eAAO,MAAM,GAAG,WACN;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,kBAChC,MAAM,KACpB,QAAQ,yBAAyB,EAAE,CAQrC,CAAA"}
+{"version":3,"file":"reverseGeolocSearch.d.ts","sourceRoot":"","sources":["../src/reverseGeolocSearch.ts"],"names":[],"mappings":"AAAA,oBAAY,yBAAyB,GAAG;IACtC,MAAM,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAA;IAC/C,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC7B,OAAO,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IACvD,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;CACxB,CAAA;AAuED,eAAO,MAAM,GAAG,WACN;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,kBAChC,MAAM,uCAEpB,QAAQ,yBAAyB,EAAE,CAQrC,CAAA"}

package/dist/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,6BAA6B,QAAS,MAAM,WAMxD,CAAA;AAED,eAAO,MAAM,MAAM,WAAY,MAAM,kBAAkB,OAAO,WAa7D,CAAA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,6BAA6B,QAAS,MAAM,WAMxD,CAAA;AAED,eAAO,MAAM,MAAM,WAAY,MAAM,kBAAkB,OAAO,WAe7D,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pretto/places",
-  "version": "0.21.0",
+  "version": "0.23.0",
   "description": "",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",