demodata now is dict by default for now

flashgeotext/extractor.py

@@ -1,5 +1,4 @@
 import json
-from typing import Union
 
 from flashtext import KeywordProcessor
 
@@ -12,30 +11,18 @@ class Alphabets(object):
 
 
 class DemoData(object):
-    cities: Union[list, dict] = []
-    countries: Union[list, dict] = []
+    cities: dict = {}
+    countries: dict = {}
 
-    def __init__(self, with_synonyms: bool = True):
-        self.load_demo_data(with_synonyms=with_synonyms)
+    def load(self) -> None:
 
-    def load_demo_data(self, with_synonyms: bool = True) -> None:
+        self.cities = self._load_data_dict(file=DEMODATA_CITIES)
+        self.countries = self._load_data_dict(file=DEMODATA_COUNTRIES)
 
-        if with_synonyms:
-            self.cities = self._load_data_dict(file=DEMODATA_CITIES)
-            self.countries = self._load_data_dict(file=DEMODATA_COUNTRIES)
-
-        else:
-            self.cities = self._load_data_list(file=DEMODATA_CITIES)
-            self.countries = self._load_data_list(file=DEMODATA_COUNTRIES)
-
-    def _load_data_dict(self, file: str = "") -> dict:
+    def _load_data_dict(self, file: str) -> dict:
         with open(file, "r", encoding="utf-8") as f:
             return json.loads(f.read())
 
-    def _load_data_list(self, file: str = "") -> list:
-        with open(file, "r", encoding="utf-8") as f:
-            return list(json.loads(f.read()).keys())
-
 
 class Extractor:
     cities: KeywordProcessor = KeywordProcessor(case_sensitive=True)