@pretto/places 0.24.0 → 0.26.0

package/dist/geolocSearch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geolocSearch.d.ts","sourceRoot":"","sources":["../src/geolocSearch.ts"],"names":[],"mappings":"AAAA,oBAAY,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAC9B,CAAA;AAyCD,eAAO,MAAM,GAAG,WAAY,MAAM,kBAAiB,MAAM,KAAS,QAAQ,kBAAkB,EAAE,CAQ7F,CAAA"}
+{"version":3,"file":"geolocSearch.d.ts","sourceRoot":"","sources":["../src/geolocSearch.ts"],"names":[],"mappings":"AAAA,oBAAY,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAC9B,CAAA;AAoDD,eAAO,MAAM,GAAG,WAAY,MAAM,kBAAiB,MAAM,KAAS,QAAQ,kBAAkB,EAAE,CAQ7F,CAAA"}

package/dist/index.js

@@ -46,14 +46,15 @@ const convertFirstLetterToUpperCase = (str) => {
         return acc + curr;
     }, '');
 };
-const getUri = (search, departmentOnly) => {
+const getUri = (search, departmentOnly, withType = true) => {
     const PLACES_API = 'https://geo.api.gouv.fr';
     const QUERY_FIELDS = `boost=population&fields=departement${departmentOnly ? ',centre,contour' : ',codesPostaux,centre,contour'}`;
     const formatedSearch = encodeURIComponent(search);
+    const type = withType ? 'type=arrondissement-municipal&' : '';
     const uri = {
         departments: `${PLACES_API}/departements/${formatedSearch}/communes?${QUERY_FIELDS}`,
-        municipality: `${PLACES_API}/communes?nom=${formatedSearch}&${QUERY_FIELDS}`,
-        zipcode: `${PLACES_API}/communes?codePostal=${formatedSearch}&${QUERY_FIELDS}`,
+        municipality: `${PLACES_API}/communes?${type}&nom=${formatedSearch}&${QUERY_FIELDS}`,
+        zipcode: `${PLACES_API}/communes?${type}codePostal=${formatedSearch}&${QUERY_FIELDS}`,
     };
     if (isNaN(parseInt(search, 10)))
         return uri.municipality;
@@ -133,10 +134,17 @@ const getData$3 = (search, options) => __awaiter(void 0, void 0, void 0, functio
         return SEARCH_CACHE.filter(i => i.value.zipcode.includes(search)).slice(0, limit);
     }
     try {
+        let result = [];
         const response = yield fetch(getUri(search, departmentOnly));
         if (!response.ok)
             return Promise.reject(response);
-        const result = yield response.json();
+        result = yield response.json();
+        if (result.length === 0) {
+            const response = yield fetch(getUri(search, departmentOnly, false));
+            if (!response.ok)
+                return Promise.reject(response);
+            result = yield response.json();
+        }
         const formatedResponse = responseFormat(result, country, search, departmentOnly);
         if (isEqual__default["default"](PREVIOUS_SEARCH, formatedResponse)) {
             const cleanValue = search.replace(' ', '').replace(PREVIOUS_VALUE, '');
@@ -274,11 +282,18 @@ const getData$1 = (search) => __awaiter(void 0, void 0, void 0, function* () {
     if (!search || !/(\d){5}/.test(search))
         return [];
     try {
+        let results = [];
         const formattedSearch = encodeURIComponent(search);
-        const response = yield fetch(`https://geo.api.gouv.fr/communes?codePostal=${formattedSearch}&fields=centre`);
+        const response = yield fetch(`https://geo.api.gouv.fr/communes?codePostal=${formattedSearch}&type=arrondissement-municipal&fields=centre`);
         if (!response.ok)
             return Promise.reject(response);
-        const results = yield response.json();
+        results = yield response.json();
+        if (results.length === 0) {
+            const response = yield fetch(`https://geo.api.gouv.fr/communes?codePostal=${formattedSearch}&fields=centre`);
+            if (!response.ok)
+                return Promise.reject(response);
+            results = yield response.json();
+        }
         return formatData$1(results);
     }
     catch (error) {
@@ -1109,11 +1124,9 @@ const parisOutline = [
     },
 ];
 
-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;
+const formatData = (geoResults) => {
     const getOutline = (city, zipcode) => {
-        if (postcode === null)
+        if (!geoResults || geoResults.length === 0)
             return [];
         if (city === 'Paris') {
             const outline = parisOutline.find(outline => outline.name === zipcode);
@@ -1124,10 +1137,17 @@ const formatData = (geoResults, addressResults) => {
         return [];
     };
     return geoResults.map(result => {
-        const customOutline = getOutline(result.nom, postcode);
-        const outline = customOutline.length > 0
-            ? customOutline
-            : result.contour.coordinates[0].map(([longitude, latitude]) => ({ longitude, latitude }));
+        const customOutline = getOutline(result.nom, result.codesPostaux[0]);
+        let outline = [];
+        if (customOutline.length > 0) {
+            outline = [customOutline];
+        }
+        else if (result.contour.type === 'Polygon') {
+            outline = [result.contour.coordinates[0].map(([longitude, latitude]) => ({ longitude, latitude }))];
+        }
+        else if (result.contour.type === 'MultiPolygon') {
+            outline = result.contour.coordinates.map(([coordinates]) => coordinates.map(([longitude, latitude]) => ({ longitude, latitude })));
+        }
         return {
             center: { latitude: result.centre.coordinates[1], longitude: result.centre.coordinates[0] },
             city: result.nom,
@@ -1135,22 +1155,23 @@ const formatData = (geoResults, addressResults) => {
             coordinates: result.centre.coordinates,
             zipcode: result.codesPostaux[0],
             outline,
-            district,
-            postcode,
         };
     });
 };
 const getData = (search, signal) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        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 }),
-        ]);
+        let geoResults = [];
+        const geoResponse = yield fetch(`https://geo.api.gouv.fr/communes?lat=${search.latitude}&lon=${search.longitude}&type=arrondissement-municipal&fields=departement,codesPostaux,centre,contour`, { signal });
         if (!geoResponse.ok)
             return Promise.reject(geoResponse);
-        const geoResults = yield geoResponse.json();
-        const addressResults = yield addressResponse.json();
-        return formatData(geoResults, addressResults);
+        geoResults = yield geoResponse.json();
+        if (geoResults.length === 0) {
+            const geoResponse = yield fetch(`https://geo.api.gouv.fr/communes?lat=${search.latitude}&lon=${search.longitude}&fields=departement,codesPostaux,centre,contour`, { signal });
+            if (!geoResponse.ok)
+                return Promise.reject(geoResponse);
+            geoResults = yield geoResponse.json();
+        }
+        return formatData(geoResults);
     }
     catch (error) {
         if (typeof error === 'string')

package/dist/module.js

@@ -36,14 +36,15 @@ const convertFirstLetterToUpperCase = (str) => {
         return acc + curr;
     }, '');
 };
-const getUri = (search, departmentOnly) => {
+const getUri = (search, departmentOnly, withType = true) => {
     const PLACES_API = 'https://geo.api.gouv.fr';
     const QUERY_FIELDS = `boost=population&fields=departement${departmentOnly ? ',centre,contour' : ',codesPostaux,centre,contour'}`;
     const formatedSearch = encodeURIComponent(search);
+    const type = withType ? 'type=arrondissement-municipal&' : '';
     const uri = {
         departments: `${PLACES_API}/departements/${formatedSearch}/communes?${QUERY_FIELDS}`,
-        municipality: `${PLACES_API}/communes?nom=${formatedSearch}&${QUERY_FIELDS}`,
-        zipcode: `${PLACES_API}/communes?codePostal=${formatedSearch}&${QUERY_FIELDS}`,
+        municipality: `${PLACES_API}/communes?${type}&nom=${formatedSearch}&${QUERY_FIELDS}`,
+        zipcode: `${PLACES_API}/communes?${type}codePostal=${formatedSearch}&${QUERY_FIELDS}`,
     };
     if (isNaN(parseInt(search, 10)))
         return uri.municipality;
@@ -123,10 +124,17 @@ const getData$3 = (search, options) => __awaiter(void 0, void 0, void 0, functio
         return SEARCH_CACHE.filter(i => i.value.zipcode.includes(search)).slice(0, limit);
     }
     try {
+        let result = [];
         const response = yield fetch(getUri(search, departmentOnly));
         if (!response.ok)
             return Promise.reject(response);
-        const result = yield response.json();
+        result = yield response.json();
+        if (result.length === 0) {
+            const response = yield fetch(getUri(search, departmentOnly, false));
+            if (!response.ok)
+                return Promise.reject(response);
+            result = yield response.json();
+        }
         const formatedResponse = responseFormat(result, country, search, departmentOnly);
         if (isEqual(PREVIOUS_SEARCH, formatedResponse)) {
             const cleanValue = search.replace(' ', '').replace(PREVIOUS_VALUE, '');
@@ -264,11 +272,18 @@ const getData$1 = (search) => __awaiter(void 0, void 0, void 0, function* () {
     if (!search || !/(\d){5}/.test(search))
         return [];
     try {
+        let results = [];
         const formattedSearch = encodeURIComponent(search);
-        const response = yield fetch(`https://geo.api.gouv.fr/communes?codePostal=${formattedSearch}&fields=centre`);
+        const response = yield fetch(`https://geo.api.gouv.fr/communes?codePostal=${formattedSearch}&type=arrondissement-municipal&fields=centre`);
         if (!response.ok)
             return Promise.reject(response);
-        const results = yield response.json();
+        results = yield response.json();
+        if (results.length === 0) {
+            const response = yield fetch(`https://geo.api.gouv.fr/communes?codePostal=${formattedSearch}&fields=centre`);
+            if (!response.ok)
+                return Promise.reject(response);
+            results = yield response.json();
+        }
         return formatData$1(results);
     }
     catch (error) {
@@ -1099,11 +1114,9 @@ const parisOutline = [
     },
 ];
 
-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;
+const formatData = (geoResults) => {
     const getOutline = (city, zipcode) => {
-        if (postcode === null)
+        if (!geoResults || geoResults.length === 0)
             return [];
         if (city === 'Paris') {
             const outline = parisOutline.find(outline => outline.name === zipcode);
@@ -1114,10 +1127,17 @@ const formatData = (geoResults, addressResults) => {
         return [];
     };
     return geoResults.map(result => {
-        const customOutline = getOutline(result.nom, postcode);
-        const outline = customOutline.length > 0
-            ? customOutline
-            : result.contour.coordinates[0].map(([longitude, latitude]) => ({ longitude, latitude }));
+        const customOutline = getOutline(result.nom, result.codesPostaux[0]);
+        let outline = [];
+        if (customOutline.length > 0) {
+            outline = [customOutline];
+        }
+        else if (result.contour.type === 'Polygon') {
+            outline = [result.contour.coordinates[0].map(([longitude, latitude]) => ({ longitude, latitude }))];
+        }
+        else if (result.contour.type === 'MultiPolygon') {
+            outline = result.contour.coordinates.map(([coordinates]) => coordinates.map(([longitude, latitude]) => ({ longitude, latitude })));
+        }
         return {
             center: { latitude: result.centre.coordinates[1], longitude: result.centre.coordinates[0] },
             city: result.nom,
@@ -1125,22 +1145,23 @@ const formatData = (geoResults, addressResults) => {
             coordinates: result.centre.coordinates,
             zipcode: result.codesPostaux[0],
             outline,
-            district,
-            postcode,
         };
     });
 };
 const getData = (search, signal) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        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 }),
-        ]);
+        let geoResults = [];
+        const geoResponse = yield fetch(`https://geo.api.gouv.fr/communes?lat=${search.latitude}&lon=${search.longitude}&type=arrondissement-municipal&fields=departement,codesPostaux,centre,contour`, { signal });
         if (!geoResponse.ok)
             return Promise.reject(geoResponse);
-        const geoResults = yield geoResponse.json();
-        const addressResults = yield addressResponse.json();
-        return formatData(geoResults, addressResults);
+        geoResults = yield geoResponse.json();
+        if (geoResults.length === 0) {
+            const geoResponse = yield fetch(`https://geo.api.gouv.fr/communes?lat=${search.latitude}&lon=${search.longitude}&fields=departement,codesPostaux,centre,contour`, { signal });
+            if (!geoResponse.ok)
+                return Promise.reject(geoResponse);
+            geoResults = yield geoResponse.json();
+        }
+        return formatData(geoResults);
     }
     catch (error) {
         if (typeof error === '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,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"}
+{"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,kBA+CrB,CAAA;AAID,eAAO,MAAM,GAAG,EAAE,2BAQjB,CAAA"}

package/dist/reverseGeolocSearch.d.ts

@@ -9,10 +9,8 @@ export declare type ReverseGeolocSearchResult = {
     outline: Array<{
         latitude: number;
         longitude: number;
-    }>;
+    }>[];
     zipcode: string;
-    postcode: string | null;
-    district: string | null;
 };
 export declare const get: (search: {
     latitude: number;

package/dist/reverseGeolocSearch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reverseGeolocSearch.d.ts","sourceRoot":"","sources":["../src/reverseGeolocSearch.ts"],"names":[],"mappings":"AAEA,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;AAmGD,eAAO,MAAM,GAAG,WACN;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,kBAChC,MAAM,uCAEpB,QAAQ,yBAAyB,EAAE,CAQrC,CAAA"}
+{"version":3,"file":"reverseGeolocSearch.d.ts","sourceRoot":"","sources":["../src/reverseGeolocSearch.ts"],"names":[],"mappings":"AAEA,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,EAAE,CAAA;IACzD,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAgGD,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

@@ -1,3 +1,3 @@
 export declare const convertFirstLetterToUpperCase: (str: string) => string;
-export declare const getUri: (search: string, departmentOnly: boolean) => string;
+export declare const getUri: (search: string, departmentOnly: boolean, withType?: boolean) => string;
 //# sourceMappingURL=utils.d.ts.map

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,WAe7D,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,aAAY,OAAO,WAgBhF,CAAA"}

package/package.json

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