goodmap 1.1.2__py3-none-any.whl → 1.1.3__py3-none-any.whl

goodmap/db.py

@@ -333,7 +333,7 @@ def json_file_db_get_location_obligatory_fields(db):
 
 
 def google_json_db_get_location_obligatory_fields(db):
-    return json.loads(db.blob.download_as_text(client=None))["map"]["location_obligatory_fields"]
+    return db.data.get("map", {}).get("location_obligatory_fields", [])
 
 
 def mongodb_db_get_location_obligatory_fields(db):
@@ -352,7 +352,7 @@ def get_location_obligatory_fields(db):
 
 
 def google_json_db_get_data(self):
-    return json.loads(self.blob.download_as_text(client=None))["map"]
+    return self.data.get("map", {})
 
 
 def json_file_db_get_data(self):
@@ -538,7 +538,7 @@ def json_file_db_get_categories(self):
 
 
 def google_json_db_get_categories(self):
-    return json.loads(self.blob.download_as_text(client=None))["map"]["categories"].keys()
+    return self.data.get("map", {}).get("categories", {}).keys()
 
 
 def mongodb_db_get_categories(self):
@@ -591,17 +591,17 @@ def json_file_db_get_category_data(self, category_type=None):
 
 
 def google_json_db_get_category_data(self, category_type=None):
-    data = json.loads(self.blob.download_as_text(client=None))["map"]
+    data = self.data.get("map", {})
     if category_type:
         return {
-            "categories": {category_type: data["categories"].get(category_type, [])},
+            "categories": {category_type: data.get("categories", {}).get(category_type, [])},
             "categories_help": data.get("categories_help", []),
             "categories_options_help": {
                 category_type: data.get("categories_options_help", {}).get(category_type, [])
             },
         }
     return {
-        "categories": data["categories"],
+        "categories": data.get("categories", {}),
         "categories_help": data.get("categories_help", []),
         "categories_options_help": data.get("categories_options_help", {}),
     }
@@ -644,9 +644,7 @@ def get_location_from_raw_data(raw_data, uuid, location_model):
 
 
 def google_json_db_get_location(self, uuid, location_model):
-    return get_location_from_raw_data(
-        json.loads(self.blob.download_as_text(client=None))["map"], uuid, location_model
-    )
+    return get_location_from_raw_data(self.data.get("map", {}), uuid, location_model)
 
 
 def json_file_db_get_location(self, uuid, location_model):
@@ -678,9 +676,7 @@ def get_locations_list_from_raw_data(map_data, query, location_model):
 
 
 def google_json_db_get_locations(self, query, location_model):
-    return get_locations_list_from_raw_data(
-        json.loads(self.blob.download_as_text(client=None))["map"], query, location_model
-    )
+    return get_locations_list_from_raw_data(self.data.get("map", {}), query, location_model)
 
 
 def json_file_db_get_locations(self, query, location_model):
@@ -710,7 +706,7 @@ def get_locations(db, location_model):
 def google_json_db_get_locations_paginated(self, query, location_model):
     """Google JSON locations with improved pagination."""
     # Get all locations from raw data
-    data = json.loads(self.blob.download_as_text(client=None))["map"]
+    data = self.data.get("map", {})
     all_locations = list(get_locations_list_from_raw_data(data, query, location_model))
     return PaginationHelper.create_paginated_response(all_locations, query)
 

{goodmap-1.1.2.dist-info → goodmap-1.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: goodmap
-Version: 1.1.2
+Version: 1.1.3
 Summary: Map engine to serve all the people :)
 License-File: LICENSE.md
 Author: Krzysztof Kolodzinski

{goodmap-1.1.2.dist-info → goodmap-1.1.3.dist-info}/RECORD

@@ -4,12 +4,12 @@ goodmap/core.py,sha256=rzMhOIYnR1jxTX6uHQJKIPLYxdUm4_v2d6LrtHtJpHU,1465
 goodmap/core_api.py,sha256=RVG4X64BSXTIzmj9mPK1DcT9p6xD00NnmX8FUaoj-uE,13277
 goodmap/data_models/location.py,sha256=H3EKozc-WZvrYm6cwajl8_gaw4rQhxdlvxR1mk4mpkA,1104
 goodmap/data_validator.py,sha256=lBmVAPxvSmEOdUGeVYSjUvVVmKfPyq4CWoHfczTtEMM,4090
-goodmap/db.py,sha256=y8yRwlp2TQnSgfmn3qHXOt1UPO71yqHwQN0LckcNk7o,47725
+goodmap/db.py,sha256=2yZIQO6KbN6y21gxwO0xmxXIcXXrk7wqd7mgSOAefJw,47491
 goodmap/formatter.py,sha256=VlUHcK1HtM_IEU0VE3S5TOkZLVheMdakvUeW2tCKdq0,783
 goodmap/goodmap.py,sha256=q6okPopWBH6jDkKJcGDegebaapHLFUVilJ3p3aKi97k,2960
 goodmap/templates/goodmap-admin.html,sha256=39PJ1drk_xdkyzXgPZZNXYq9gA9oTVeR8hsgeae6E0g,35614
 goodmap/templates/map.html,sha256=N4N0ONzEFUS4bFtOA2jgXVbMQ7cKd1cRYIVnGLUzBIE,3995
-goodmap-1.1.2.dist-info/METADATA,sha256=X2grUYh0m9TtQEceRzy5knUJT6HwWyBQihyF9KmIdjs,5619
-goodmap-1.1.2.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-goodmap-1.1.2.dist-info/licenses/LICENSE.md,sha256=nkCQOR7uheLRvHRfXmwx9LhBnMcPeBU9d4ebLojDiQU,1067
-goodmap-1.1.2.dist-info/RECORD,,
+goodmap-1.1.3.dist-info/METADATA,sha256=CstkaPb9MW6r9Pj03bVWuCfEmW-juFPr9UGe30l3Fyo,5619
+goodmap-1.1.3.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+goodmap-1.1.3.dist-info/licenses/LICENSE.md,sha256=nkCQOR7uheLRvHRfXmwx9LhBnMcPeBU9d4ebLojDiQU,1067
+goodmap-1.1.3.dist-info/RECORD,,