csv-detective 0.8.1.dev1549__py3-none-any.whl → 0.8.1.dev1578__py3-none-any.whl

csv_detective/detect_fields/__init__.py

@@ -53,6 +53,7 @@ from .geo import (
     latitude_wgs,
     longitude_wgs,
     latlon_wgs,
+    lonlat_wgs,
     json_geojson,
 )
 

csv_detective/detect_fields/geo/latlon_wgs/__init__.py

@@ -5,9 +5,12 @@ PROPORTION = 1
 
 
 def _is(val):
-    '''Renvoie True si val peut etre une latitude,longitude'''
+    """Renvoie True si val peut etre une latitude,longitude"""
 
     if not isinstance(val, str) or val.count(",") != 1:
         return False
     lat, lon = val.split(",")
+    # handling [lat,lon]
+    if lat.startswith("[") and lon.endswith("]"):
+        lat, lon = lat[1:], lon[:-1]
     return is_lat(lat) and is_lon(lon.replace(" ", ""))

csv_detective/detect_fields/geo/lonlat_wgs/__init__.py

@@ -0,0 +1,16 @@
+from ..latitude_wgs import _is as is_lat
+from ..longitude_wgs import _is as is_lon
+
+PROPORTION = 1
+
+
+def _is(val):
+    """Renvoie True si val peut etre une longitude,latitude"""
+
+    if not isinstance(val, str) or val.count(",") != 1:
+        return False
+    lon, lat = val.split(",")
+    # handling [lon,lat]
+    if lon.startswith("[") and lat.endswith("]"):
+        lon, lat = lon[1:], lat[:-1]
+    return is_lon(lon) and is_lat(lat.replace(" ", ""))

csv_detective/detect_labels/__init__.py

@@ -14,7 +14,7 @@ from .FR.geo import (
     longitude_l93,
     longitude_wgs_fr_metropole,
     pays,
-    region
+    region,
 )
 from .FR.other import (
     code_csp_insee,
@@ -27,7 +27,7 @@ from .FR.other import (
     siren,
     siret,
     tel_fr,
-    uai
+    uai,
 )
 from .FR.temp import jour_de_la_semaine, mois_de_annee
 from .geo import (
@@ -37,7 +37,8 @@ from .geo import (
     json_geojson,
     latitude_wgs,
     latlon_wgs,
-    longitude_wgs
+    longitude_wgs,
+    lonlat_wgs,
 )
 from .other import booleen, email, float, int, money, mongo_object_id, twitter, url, uuid
 from .temp import date, datetime_rfc822, year

csv_detective/detect_labels/geo/latlon_wgs/__init__.py

@@ -2,42 +2,45 @@ from csv_detective.parsing.text import header_score
 
 PROPORTION = 0.5
 
+COMMON_COORDS_LABELS = [
+    "c geo",
+    "code geo",
+    "coord gps",
+    "coordonnees",
+    "coordonnees ban",
+    "coordonnees finales",
+    "coordonnees geo",
+    "coordonnees geographiques",
+    "coordonnees geoloc",
+    "coordonnees geoloc",
+    "coordonnees gps",
+    "coordonnees insee",
+    "coordonnees xy",
+    "geo",
+    "geo coordinates",
+    "geo cp",
+    "geo localisation",
+    "geo point",
+    "geo point 2d",
+    "geolocalisation",
+    "geom x y",
+    "geometry x y",
+    "geopoint",
+    "point geo",
+    "point geo insee",
+    "position",
+    "position geographique",
+    "wgs84",
+    "x y",
+    "xy",
+]
+
 
 def _is(header: str) -> float:
     words_combinations_list = [
         "latlon wgs",
         "latlon",
-        "geo point",
-        "geo point 2d",
-        "wgs84",
-        "geolocalisation",
-        "geo",
-        "coordonnees finales",
-        "coordonnees",
-        "coordonnees ban",
-        "xy",
-        "geometry x y",
-        "coordonnees insee",
-        "coordonnees geographiques",
-        "position",
-        "coordonnes gps",
-        "geopoint",
-        "geom x y",
-        "coord gps",
         "latlong",
-        "position geographique",
-        "c geo",
-        "coordonnes geoloc",
         "lat lon",
-        "code geo",
-        "geo localisation",
-        "coordonnes geo",
-        "geo cp",
-        "x y",
-        "geo coordinates",
-        "point geo",
-        "point geo insee",
-        "coordonnees geoloc",
-        "coordonnees xy",
-    ]
+    ] + COMMON_COORDS_LABELS
     return header_score(header, words_combinations_list)

csv_detective/detect_labels/geo/lonlat_wgs/__init__.py

@@ -0,0 +1,14 @@
+from csv_detective.parsing.text import header_score
+from ..latlon_wgs import COMMON_COORDS_LABELS
+
+PROPORTION = 0.5
+
+
+def _is(header: str) -> float:
+    words_combinations_list = [
+        "lonlat wgs",
+        "lonlat",
+        "longlat",
+        "lon lat",
+    ] + COMMON_COORDS_LABELS
+    return header_score(header, words_combinations_list)

csv_detective/output/schema.py

@@ -51,6 +51,7 @@ def get_description(format: str) -> str:
         "latitude_wgs": "La latitude au format WGS",
         "longitude_wgs": "La longitude au format WGS",
         "latlon_wgs": "Les coordonnées XY (latitude et longitude)",
+        "lonlat_wgs": "Les coordonnées XY (longitude et latitude)",
         "booleen": "Booléen",
         "email": "L'adresse couriel (email)",
         "float": "Nombre flottant (à virgule)",
@@ -116,6 +117,7 @@ def get_validata_type(format: str) -> str:
         "latitude_wgs": "number",
         "latitude_wgs_fr_metropole": "number",
         "latlon_wgs": "geo_point",
+        "lonlat_wgs": "geo_point",
         "longitude": "number",
         "longitude_l93": "number",
         "longitude_wgs": "number",
@@ -162,6 +164,7 @@ def get_example(format: str) -> str:
         "latitude_wgs": 42.42,
         "latitude_wgs_fr_metropole": 41.3,
         "latlon_wgs": "42.42, 0.0",
+        "lonlat_wgs": "0.0, 42.42",
         "longitude": 0.0,
         "longitude_l93": -357823,
         "longitude_wgs": 0.0,

csv_detective/output/utils.py

@@ -36,6 +36,9 @@ def prepare_output_dict(return_table: pd.DataFrame, limited_output: bool):
             formats_to_remove.add("code_departement")
         if "datetime_rfc822" in formats_detected:
             formats_to_remove.add("datetime_aware")
+        # if there is no way to discriminate the case, default to latlon
+        if "latlon_wgs" in formats_detected:
+            formats_to_remove.add("lonlat_wgs")
 
         formats_to_keep = formats_detected - formats_to_remove
 

{csv_detective-0.8.1.dev1549.data → csv_detective-0.8.1.dev1578.data}/data/share/csv_detective/CHANGELOG.md

@@ -10,6 +10,7 @@
 - Split aware and naive datetimes for hydra to cast them separately [#130](https://github.com/datagouv/csv-detective/pull/130)
 - Validate using the testing function, to consider PROPORTIONS [#131](https://github.com/datagouv/csv-detective/pull/131)
 - Remove `datetime_iso` format due to ambiguous cast in db (can be naive or aware) [#132](https://github.com/datagouv/csv-detective/pull/132)
+- Add `lonlat_wgs` format and handle optional brackets for `latlon_wgs` [#133](https://github.com/datagouv/csv-detective/pull/133)
 
 ## 0.8.0 (2025-05-20)
 

{csv_detective-0.8.1.dev1549.dist-info → csv_detective-0.8.1.dev1578.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csv_detective
-Version: 0.8.1.dev1549
+Version: 0.8.1.dev1578
 Summary: Detect tabular files column content
 Home-page: https://github.com/datagouv/csv_detective
 Author: Etalab

{csv_detective-0.8.1.dev1549.dist-info → csv_detective-0.8.1.dev1578.dist-info}/RECORD

@@ -5,7 +5,7 @@ csv_detective/load_tests.py,sha256=GILvfkd4OVI-72mA4nzbPlZqgcXZ4wznOhGfZ1ucWkM,2
 csv_detective/s3_utils.py,sha256=1cIVdQUYY2ovErbMwp72Gqtqx2bkB8nfVhn-QaOFTT0,1451
 csv_detective/utils.py,sha256=-tIs9yV7RJPGj65lQ7LjRGch6Iws9UeuIPQsd2uUUJM,1025
 csv_detective/validate.py,sha256=5Li_vfvU9wdfoZjNjef-MBUoKcKoJ-c7381QoX9aDXY,2818
-csv_detective/detect_fields/__init__.py,sha256=jThGn0_HO8U0mMoSbf38x8l46ABRQcmHcNLvjZqQQdc,984
+csv_detective/detect_fields/__init__.py,sha256=0A5SZTp_IhhJ9z7lWeH4K5_0uwMK_VdMudjPm7oggVg,1000
 csv_detective/detect_fields/FR/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 csv_detective/detect_fields/FR/geo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 csv_detective/detect_fields/FR/geo/adresse/__init__.py,sha256=NqV8ULf9gY9iFnA1deKR-1Yobr96WwCsn5JfbP_MjiY,1675
@@ -51,8 +51,9 @@ csv_detective/detect_fields/geo/iso_country_code_numeric/__init__.py,sha256=wJAy
 csv_detective/detect_fields/geo/iso_country_code_numeric/iso_country_code_numeric.txt,sha256=2GtEhuporsHYV-pU4q9kfXU5iOtfW5C0GYBTTKQtnnA,1004
 csv_detective/detect_fields/geo/json_geojson/__init__.py,sha256=FPHOfTrfXJs62-NgeOcNGOvwPd7I1fEVp8lTdMNfj3w,433
 csv_detective/detect_fields/geo/latitude_wgs/__init__.py,sha256=ArS6PuYEd0atZwSqNDZhXZz1TwzdiwdV8ovRYTOacpg,327
-csv_detective/detect_fields/geo/latlon_wgs/__init__.py,sha256=7_mnO9uC_kI7e2WR8xIer7Kqw8zi-v-JKaAD4zcoGbE,342
+csv_detective/detect_fields/geo/latlon_wgs/__init__.py,sha256=IXDTqD4YFUJYI1FYZ5ZfkqXY6KvNY7sgBVFRAvgTHtI,454
 csv_detective/detect_fields/geo/longitude_wgs/__init__.py,sha256=G7afWOKiGh_Tv7gwDNGt1a4B_A8hkCBkIxn3THDCUFk,330
+csv_detective/detect_fields/geo/lonlat_wgs/__init__.py,sha256=CnBMYevfGdhBvureF3oc_zqT-RZjG419iAuUlugQFLc,454
 csv_detective/detect_fields/other/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 csv_detective/detect_fields/other/booleen/__init__.py,sha256=wn_yyTAmGxqo0l0b7JRpGb0da_E27iGxES9zWCrnsqc,497
 csv_detective/detect_fields/other/email/__init__.py,sha256=O9tgJmq0O8Q-8iin63NqEEDhlsUJjxFZNaNFM4GZaws,178
@@ -71,7 +72,7 @@ csv_detective/detect_fields/temp/datetime_aware/__init__.py,sha256=bEfWvXx_GNCRU
 csv_detective/detect_fields/temp/datetime_naive/__init__.py,sha256=GtQo55SrrXfoT-L7ZXW63jrlAYvNT5m56wMfhuY3pyI,836
 csv_detective/detect_fields/temp/datetime_rfc822/__init__.py,sha256=JtUzg3BXYd-XJMLGxQ0P1OAJGOQ7DlYMD4fCU9yndg0,511
 csv_detective/detect_fields/temp/year/__init__.py,sha256=RjsiIHoplnI4Odi5587TzRhKTDT-FTqGOBpdartuShA,194
-csv_detective/detect_labels/__init__.py,sha256=oVq2fiO6QkaWB0wZImL8YVW7oiwPky8ivmLZAFmK55Q,864
+csv_detective/detect_labels/__init__.py,sha256=8vrFUrMc8a_VOC5gvYNMKL-Do_q9eMTrghJRI9Xotvk,883
 csv_detective/detect_labels/FR/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 csv_detective/detect_labels/FR/geo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 csv_detective/detect_labels/FR/geo/adresse/__init__.py,sha256=fNWFW-Wo3n6azDBfmi0J0qnzP-p2StLxCc9eNiE9NNE,346
@@ -110,8 +111,9 @@ csv_detective/detect_labels/geo/iso_country_code_alpha3/__init__.py,sha256=biUZP
 csv_detective/detect_labels/geo/iso_country_code_numeric/__init__.py,sha256=biUZP8gAsVpjXLTx1WeS19qR4ia0pzpi6R69wJgu4B0,348
 csv_detective/detect_labels/geo/json_geojson/__init__.py,sha256=On8VOCDD0EspZra6fTQCXH4MYao2xmRu-o7xWcab7Jg,355
 csv_detective/detect_labels/geo/latitude_wgs/__init__.py,sha256=ME_KjniqDSdAwXP7XnKXyr5IA75KrGSLIhvPNfsux6E,664
-csv_detective/detect_labels/geo/latlon_wgs/__init__.py,sha256=dbWX1LKpoev7zwWthw9vlwGQp6CSlgYrTBnPpvyNC-A,989
+csv_detective/detect_labels/geo/latlon_wgs/__init__.py,sha256=tDndlFyEM7qKS3ATxp0Xs0FsPsOPpRWhDe1ockbWw8s,923
 csv_detective/detect_labels/geo/longitude_wgs/__init__.py,sha256=_8IV2FLtrOjzhQNsk-fsgc9-jbAgzKDVMr4tXu2P-s4,429
+csv_detective/detect_labels/geo/lonlat_wgs/__init__.py,sha256=NNKlFcMsKVqnUKEm_4flGxcNUGS2-iS3m6ihQf2AVTk,345
 csv_detective/detect_labels/other/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 csv_detective/detect_labels/other/booleen/__init__.py,sha256=BZwnfR-Zcv8dqscLrBKhttgwm4Dqq16M0PaGirxYWio,214
 csv_detective/detect_labels/other/email/__init__.py,sha256=Poagn45-eC2a_Wdk5Qs6d2BgYdncCQKZp2yEB50IuNw,431
@@ -139,8 +141,8 @@ csv_detective/output/__init__.py,sha256=5KTevPfp_4MRxByJyOntQjToNfeG7dPQn-_13wSq
 csv_detective/output/dataframe.py,sha256=89iQRE59cHQyQQEsujQVIKP2YAUYpPklWkdDOqZE-wE,2183
 csv_detective/output/example.py,sha256=EdPX1iqHhIG4DsiHuYdy-J7JxOkjgUh_o2D5nrfM5fA,8649
 csv_detective/output/profile.py,sha256=B8YU541T_YPDezJGh4dkHckOShiwHSrZd9GS8jbmz7A,2919
-csv_detective/output/schema.py,sha256=Hpav3RgIP7gOb93h154s1wNSlEZtHNJVzFDDwp54UcQ,13669
-csv_detective/output/utils.py,sha256=RcOkFQihwfmEIOD-gwrUKi2r5CwBbs17vkuAf8n7-Wo,2405
+csv_detective/output/schema.py,sha256=yC9K1vw6NUTULNv9a7CaMGns9iXmbzFLbtHI4wegqEc,13812
+csv_detective/output/utils.py,sha256=sAFc-oviDn3iR3kr8MdXQa14nCMWgAITsRYBW-f3WM0,2574
 csv_detective/parsing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 csv_detective/parsing/columns.py,sha256=rLzAU36cHMpVynEPhj8uMdr3IRO3_Yq58Yw7Z6oLPiQ,5693
 csv_detective/parsing/compression.py,sha256=Fnw5tj-PpBNI8NYsWj5gD-DUoWcVLnsVpiKm9MpxmIA,350
@@ -148,19 +150,19 @@ csv_detective/parsing/csv.py,sha256=11mibDnJhIjykXLGZvA5ZEU5U7KgxIrbyO6BNv6jlro,
 csv_detective/parsing/excel.py,sha256=AslE2S1e67o8yTIAIhp-lAnJ6-XqeBBRz1-VMFqhZBM,7055
 csv_detective/parsing/load.py,sha256=u6fbGFZsL2GwPQRzhAXgt32JpUur7vbQdErREHxNJ-w,3661
 csv_detective/parsing/text.py,sha256=_TprGi0gHZlRsafizI3dqQhBehZW4BazqxmypMcAZ-o,1824
-csv_detective-0.8.1.dev1549.data/data/share/csv_detective/CHANGELOG.md,sha256=1jO_wJx_-DK1TqmdmIu2bmbnvg2iJ2iX78MEb29MZYY,9425
-csv_detective-0.8.1.dev1549.data/data/share/csv_detective/LICENSE,sha256=A1dQrzxyxRHRih02KwibWj1khQyF7GeA6SqdOU87Gk4,1088
-csv_detective-0.8.1.dev1549.data/data/share/csv_detective/README.md,sha256=gKLFmC8kuCCywS9eAhMak_JNriUWWNOsBKleAu5TIEY,8501
-csv_detective-0.8.1.dev1549.dist-info/licenses/LICENSE,sha256=A1dQrzxyxRHRih02KwibWj1khQyF7GeA6SqdOU87Gk4,1088
+csv_detective-0.8.1.dev1578.data/data/share/csv_detective/CHANGELOG.md,sha256=arQzNTnW3gZp5MyTCoDkb4fMBM7BaMhGnxVF_AhYPp4,9556
+csv_detective-0.8.1.dev1578.data/data/share/csv_detective/LICENSE,sha256=A1dQrzxyxRHRih02KwibWj1khQyF7GeA6SqdOU87Gk4,1088
+csv_detective-0.8.1.dev1578.data/data/share/csv_detective/README.md,sha256=gKLFmC8kuCCywS9eAhMak_JNriUWWNOsBKleAu5TIEY,8501
+csv_detective-0.8.1.dev1578.dist-info/licenses/LICENSE,sha256=A1dQrzxyxRHRih02KwibWj1khQyF7GeA6SqdOU87Gk4,1088
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_example.py,sha256=JeHxSK0IVDcSrOhSZlNGSQv4JAc_r6mzvJM8PfmLTMw,2018
-tests/test_fields.py,sha256=tTFOmlb9gewtCwcZV7B6Gc3aH6xXK5kMUFSEBi7iIy4,10638
+tests/test_fields.py,sha256=DzDtYXZDj2YJXNuKROHmoqA__PkE39sqETmnS3a01qQ,10887
 tests/test_file.py,sha256=0bHV9wx9mSRoav_DVF19g694yohb1p0bw7rtcBeKG-8,8451
 tests/test_labels.py,sha256=Nkr645bUewrj8hjNDKr67FQ6Sy_TID6f3E5Kfkl231M,464
 tests/test_structure.py,sha256=bv-tjgXohvQAxwmxzH0BynFpK2TyPjcxvtIAmIRlZmA,1393
 tests/test_validation.py,sha256=CTGonR6htxcWF9WH8MxumDD8cF45Y-G4hm94SM4lFjU,3246
-csv_detective-0.8.1.dev1549.dist-info/METADATA,sha256=LQkj1jrN7dsdUjGOV3Z8BRKANccZTxdXdoRWtAvOa6w,10443
-csv_detective-0.8.1.dev1549.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-csv_detective-0.8.1.dev1549.dist-info/entry_points.txt,sha256=JjweTReFqKJmuvkegzlew2j3D5pZzfxvbEGOtGVGmaY,56
-csv_detective-0.8.1.dev1549.dist-info/top_level.txt,sha256=M0Nv646VHo-49zWjPkwo2C48UmtfddV8_9mEZeIxy8Q,20
-csv_detective-0.8.1.dev1549.dist-info/RECORD,,
+csv_detective-0.8.1.dev1578.dist-info/METADATA,sha256=EcvSGV_PUHKAxG2HlebEXE05CuYh9ZND4erSbWCoIqo,10443
+csv_detective-0.8.1.dev1578.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+csv_detective-0.8.1.dev1578.dist-info/entry_points.txt,sha256=JjweTReFqKJmuvkegzlew2j3D5pZzfxvbEGOtGVGmaY,56
+csv_detective-0.8.1.dev1578.dist-info/top_level.txt,sha256=M0Nv646VHo-49zWjPkwo2C48UmtfddV8_9mEZeIxy8Q,20
+csv_detective-0.8.1.dev1578.dist-info/RECORD,,

tests/test_fields.py

@@ -44,6 +44,7 @@ from csv_detective.detect_fields.geo import (
     latitude_wgs,
     latlon_wgs,
     longitude_wgs,
+    lonlat_wgs,
 )
 from csv_detective.detect_fields.other import (
     booleen,
@@ -263,13 +264,17 @@ fields = {
         False: ["100"],
     },
     latlon_wgs: {
-        True: ["43.2,-22.6", "-10.7,140", "-40.7, 10.8"],
-        False: ["0.1,192", "-102, 92"],
+        True: ["43.2,-22.6", "-10.7,140", "-40.7, 10.8", "[12,-0.28]"],
+        False: ["0.1,192", "-102, 92", "[23.02,4.1", "23.02,4.1]", "160.1,-27"],
     },
     longitude_wgs: {
         True: ["120", "-20.2"],
         False: ["-200"],
     },
+    lonlat_wgs: {
+        True: ["-22.6,43.2", "140,-10.7", "10.8, -40.7", "[-0.28,12]"],
+        False: ["192,0.1", "92, -102", "[4.1,23.02", "4.1,23.02]", "-27,160.1"],
+    },
     booleen: {
         True: ["oui", "0", "1", "yes", "false", "True"],
         False: ["nein", "ja", "2", "-0"],