cbs - modify tables and add dictionary tables

tkalir · Sep 29, 2018 · 7a9fed7 · 7a9fed7
1 parent fb9ae40
commit 7a9fed7
Show file tree

Hide file tree

Showing 18 changed files with 1,551 additions and 418 deletions.
diff --git a/alembic/versions/1c7c31b1c31d_cbs_modify_tables_and_add_dictionaries.py b/alembic/versions/1c7c31b1c31d_cbs_modify_tables_and_add_dictionaries.py
diff --git a/anyway/accidents_around_schools.py b/anyway/accidents_around_schools.py
@@ -72,7 +72,7 @@ def acc_inv_query(longitude, latitude, distance, start_date, end_date, school):
         .filter(or_((AccidentMarker.provider_code == CONST.CBS_ACCIDENT_TYPE_1_CODE), (AccidentMarker.provider_code == CONST.CBS_ACCIDENT_TYPE_3_CODE))) \
         .filter(AccidentMarker.created >= start_date) \
         .filter(AccidentMarker.created < end_date) \
-        .filter(AccidentMarker.locationAccuracy == LOCATION_ACCURACY_PRECISE_INT) \
+        .filter(AccidentMarker.location_accuracy == LOCATION_ACCURACY_PRECISE_INT) \
         .filter(AccidentMarker.yishuv_symbol != YISHUV_SYMBOL_NOT_EXIST) \
         .filter(Involved.age_group.in_([1,2,3,4])) #ages 0-19
 

diff --git a/anyway/field_names.py b/anyway/field_names.py
@@ -27,11 +27,11 @@
 road_type="SUG_DEREH"               # part of the desciption
 day_type="SUG_YOM"                  # part of the desciption
 road_shape="ZURAT_DEREH"            # part of the desciption
-unit="YEHIDA"                       # part of the desciption
+police_unit="YEHIDA"                       # part of the desciption
 one_lane = "HAD_MASLUL"
 multi_lane = "RAV_MASLUL"
 speed_limit = "MEHIRUT_MUTERET"
-intactness = "TKINUT"
+road_intactness = "TKINUT"
 road_width = "ROHAV"
 road_sign = "SIMUN_TIMRUR"
 road_light = "TEURA"

diff --git a/anyway/localization.py b/anyway/localization.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import csv
+import pandas as pd
 import os
 from . import field_names
 from .utilities import decode_hebrew
@@ -248,9 +249,7 @@
 
 
 with _open_hebrew_textfile(os.path.join("static/data/cities.csv"), "r") as f:
-    _cities = list(csv.DictReader(f))
-
-_cities_names = {int(x[field_names.sign]): decode_hebrew(x[field_names.name]) for x in _cities}
+    _cities = pd.read_csv(f, index_col=field_names.sign)
 
 
 def get_field(field, value=None):
@@ -266,4 +265,8 @@ def get_supported_tables():
 
 
 def get_city_name(symbol_id):
-    return _cities_names.get(symbol_id, None)
+    try:
+        city = _cities_names.loc[symbol_id,field_names.name]
+        return city
+    except:
+        return None