mobisurvstd 1.2.0__tar.gz → 1.2.1__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (82) hide show
  1. {mobisurvstd-1.2.0/src/mobisurvstd.egg-info → mobisurvstd-1.2.1}/PKG-INFO +3 -1
  2. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/README.md +2 -0
  3. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/pyproject.toml +1 -1
  4. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/cerema/emc2.py +10 -17
  5. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/classes.py +9 -3
  6. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1/src/mobisurvstd.egg-info}/PKG-INFO +3 -1
  7. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/LICENSE.md +0 -0
  8. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/setup.cfg +0 -0
  9. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/__init__.py +0 -0
  10. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/__main__.py +0 -0
  11. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/cerema/__init__.py +0 -0
  12. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/cerema/common.py +0 -0
  13. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/cerema/deplacements.py +0 -0
  14. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/cerema/edgt.py +0 -0
  15. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/cerema/edvm.py +0 -0
  16. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/cerema/emd.py +0 -0
  17. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/cerema/menages.py +0 -0
  18. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/cerema/nantes_opendata.py +0 -0
  19. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/cerema/personnes.py +0 -0
  20. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/cerema/reader.py +0 -0
  21. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/cerema/survey.py +0 -0
  22. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/cerema/trajets.py +0 -0
  23. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/cerema/zones.py +0 -0
  24. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/cli.py +0 -0
  25. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/common/__init__.py +0 -0
  26. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/common/cars.py +0 -0
  27. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/common/clean.py +0 -0
  28. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/common/households.py +0 -0
  29. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/common/legs.py +0 -0
  30. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/common/motorcycles.py +0 -0
  31. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/common/persons.py +0 -0
  32. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/common/trips.py +0 -0
  33. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/common/zones.py +0 -0
  34. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/egt2010/__init__.py +0 -0
  35. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/egt2010/deplacements.py +0 -0
  36. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/egt2010/menages.py +0 -0
  37. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/egt2010/personnes.py +0 -0
  38. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/egt2010/survey.py +0 -0
  39. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/egt2010/trajets.py +0 -0
  40. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/egt2010/zones.py +0 -0
  41. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/egt2020/__init__.py +0 -0
  42. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/egt2020/deplacements.py +0 -0
  43. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/egt2020/menages.py +0 -0
  44. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/egt2020/motos.py +0 -0
  45. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/egt2020/personnes.py +0 -0
  46. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/egt2020/survey.py +0 -0
  47. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/egt2020/trajets.py +0 -0
  48. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/egt2020/voitures.py +0 -0
  49. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/emg2023/__init__.py +0 -0
  50. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/emg2023/deplacements.py +0 -0
  51. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/emg2023/menages.py +0 -0
  52. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/emg2023/personnes.py +0 -0
  53. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/emg2023/survey.py +0 -0
  54. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/emp/__init__.py +0 -0
  55. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/emp/common.py +0 -0
  56. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/emp/deplacements.py +0 -0
  57. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/emp/menages.py +0 -0
  58. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/emp/motos.py +0 -0
  59. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/emp/personnes.py +0 -0
  60. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/emp/survey.py +0 -0
  61. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/emp/voitures.py +0 -0
  62. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/logger.py +0 -0
  63. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/main.py +0 -0
  64. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/resources/__init__.py +0 -0
  65. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/resources/admin_express.py +0 -0
  66. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/resources/insee_data.py +0 -0
  67. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/resources/nuts.py +0 -0
  68. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/schema/__init__.py +0 -0
  69. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/schema/cars.py +0 -0
  70. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/schema/common.py +0 -0
  71. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/schema/guarantees.py +0 -0
  72. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/schema/households.py +0 -0
  73. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/schema/legs.py +0 -0
  74. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/schema/motorcycles.py +0 -0
  75. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/schema/persons.py +0 -0
  76. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/schema/trips.py +0 -0
  77. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/utils.py +0 -0
  78. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd/validation.py +0 -0
  79. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd.egg-info/SOURCES.txt +0 -0
  80. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd.egg-info/dependency_links.txt +0 -0
  81. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd.egg-info/requires.txt +0 -0
  82. {mobisurvstd-1.2.0 → mobisurvstd-1.2.1}/src/mobisurvstd.egg-info/top_level.txt +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: mobisurvstd
3
- Version: 1.2.0
3
+ Version: 1.2.1
4
4
  Summary: A tool to standardize French mobility survey datasets (EMC2, EGT, EMP, etc.) into a unified format.
5
5
  Author-email: Lucas Javaudin <lucas@lucasjavaudin.com>
6
6
  License-Expression: MIT
@@ -208,6 +208,8 @@ Currently, MobiSurvStd supports the following survey types:
208
208
 
209
209
  See [Survey Types](https://mobisurvstd.github.io/MobiSurvStd/surveys.html) for more.
210
210
 
211
+ ![Map of all local surveys tested with MobiSurvStd](https://raw.githubusercontent.com/MobiSurvStd/MobiSurvStd/main/docs/src/images/survey_map.jpg)
212
+
211
213
  Other survey types that are planned to be integrated are: `entd`.
212
214
  If you know another survey format that could be integrated, feel free to open an issue on GitHub.
213
215
 
@@ -176,6 +176,8 @@ Currently, MobiSurvStd supports the following survey types:
176
176
 
177
177
  See [Survey Types](https://mobisurvstd.github.io/MobiSurvStd/surveys.html) for more.
178
178
 
179
+ ![Map of all local surveys tested with MobiSurvStd](https://raw.githubusercontent.com/MobiSurvStd/MobiSurvStd/main/docs/src/images/survey_map.jpg)
180
+
179
181
  Other survey types that are planned to be integrated are: `entd`.
180
182
  If you know another survey format that could be integrated, feel free to open an issue on GitHub.
181
183
 
@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
6
6
 
7
7
  [project]
8
8
  name = "mobisurvstd"
9
- version = "1.2.0"
9
+ version = "1.2.1"
10
10
  description = "A tool to standardize French mobility survey datasets (EMC2, EGT, EMP, etc.) into a unified format."
11
11
  readme = "README.md"
12
12
  authors = [{ name = "Lucas Javaudin", email = "lucas@lucasjavaudin.com" }]
@@ -26,25 +26,18 @@ class EMC2Reader(CeremaStandardizer):
26
26
  return [find_file(self.source, ".*_std_traj.csv")]
27
27
 
28
28
  def detailed_zones_filenames(self):
29
- return [
30
- find_file_path(
31
- self.source, r".*_ZF(_.*)?\.(TAB|shp)", subdir=os.path.join("Doc", "SIG")
32
- )
33
- ]
29
+ return [find_file_path(self.source, r".*_ZF(_.*)?\.(TAB|shp)", subdir="SIG")]
34
30
 
35
31
  def special_locations_filenames(self):
36
- return [
37
- find_file_path(
38
- self.source, r".*_GT(_.*)?\.(TAB|shp)", subdir=os.path.join("Doc", "SIG")
39
- )
40
- ]
32
+ base = find_file_path(self.source, r".*_GT(?!_ext)(_.*)?\.(TAB|shp)", subdir="SIG")
33
+ ext = find_file_path(self.source, r".*_GT_externes(_.*)?\.(TAB|shp)", subdir="SIG")
34
+ if base and ext:
35
+ return [base, ext]
36
+ else:
37
+ return [base]
41
38
 
42
39
  def draw_zones_filenames(self):
43
- return [
44
- find_file_path(
45
- self.source, r".*_DTIR(_.*)?\.(TAB|shp)", subdir=os.path.join("Doc", "SIG")
46
- )
47
- ]
40
+ return [find_file_path(self.source, r".*_DTIR(_.*)?\.(TAB|shp)", subdir="SIG")]
48
41
 
49
42
  def survey_name(self):
50
43
  filename = find_file_path(self.source, ".*_std_men.csv")
@@ -65,8 +58,8 @@ class EMC2Reader(CeremaStandardizer):
65
58
 
66
59
  def gt_type_columns(self):
67
60
  # Note that Bouzonville 2019 has some GT type data in MACRO but the MACRO column represents
68
- # something else in the other surveys so it is not never.
69
- return ["nature", "nom_typo", "theme_gt", "type"]
61
+ # something else in the other surveys so it is not used.
62
+ return ["nature", "nom_typo", "theme_gt", "famille_g", "type"]
70
63
 
71
64
  def zf_id_columns(self):
72
65
  return ["zf_fusion", "zf_160", "zf", "num_zf"]
@@ -264,12 +264,18 @@ class SurveyDataReader:
264
264
  self._draw_zones = gpd.read_parquet(filename)
265
265
  return self._draw_zones
266
266
 
267
- def mean_date(self) -> date:
267
+ def mean_date(self) -> date | None:
268
268
  """Returns the mean date at which the survey was conducted (the middle date between the
269
269
  survey's start and end date).
270
270
  """
271
- start_date = date.fromisoformat(self.metadata["start_date"])
272
- end_date = date.fromisoformat(self.metadata["end_date"])
271
+ if self.metadata["start_date"]:
272
+ start_date = date.fromisoformat(self.metadata["start_date"])
273
+ else:
274
+ return None
275
+ if self.metadata["end_date"]:
276
+ end_date = date.fromisoformat(self.metadata["end_date"])
277
+ else:
278
+ return None
273
279
  return start_date + (end_date - start_date) / 2
274
280
 
275
281
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: mobisurvstd
3
- Version: 1.2.0
3
+ Version: 1.2.1
4
4
  Summary: A tool to standardize French mobility survey datasets (EMC2, EGT, EMP, etc.) into a unified format.
5
5
  Author-email: Lucas Javaudin <lucas@lucasjavaudin.com>
6
6
  License-Expression: MIT
@@ -208,6 +208,8 @@ Currently, MobiSurvStd supports the following survey types:
208
208
 
209
209
  See [Survey Types](https://mobisurvstd.github.io/MobiSurvStd/surveys.html) for more.
210
210
 
211
+ ![Map of all local surveys tested with MobiSurvStd](https://raw.githubusercontent.com/MobiSurvStd/MobiSurvStd/main/docs/src/images/survey_map.jpg)
212
+
211
213
  Other survey types that are planned to be integrated are: `entd`.
212
214
  If you know another survey format that could be integrated, feel free to open an issue on GitHub.
213
215
 
File without changes
File without changes