fix an issue with unicode data from OSM

Author: crocsg

examples/bruxelles_tram_station_test.svg

@@ -41,6 +41,7 @@ def GetTransportDataLineList (self):
         # sort data
         transport_lines.sort(key=lambda x: x["name"])
         result = {"city":self.CityName, "lines":[line["name"] for line in transport_lines]} 
+        
         return result
 
 

examples/bruxelles_tram_ways_test.svg

@@ -316,7 +316,7 @@ def osm_extract_data (transport_info, transport_type):
                             # check duplicate station and ensure there is a name
                             if node["id"] not in station_doublon and station["name"] != "":
                                 print ("station:", station["id"], station["name"])
-                                print (node)
+                                #print (node)
                                 stations.append(station)
                                 station_doublon[node["id"]] = True
 
@@ -679,7 +679,7 @@ def lines_ways_extraction_from_datta(data): # => ok
     # group by relation (line id)
     dic_line_segments = {}
 
-    json.dump (data, open("data.json", "w"), indent=4)
+    #json.dump (data, open("data.json", "w"), indent=4)
     # get line list 
     df_line_list = lines_list_extraction_from_data(data) 
 

examples/londres_subway_station_test.svg

@@ -300,7 +300,7 @@ def load_file(self, dialogtitle, filterstring, filter=["(*.brp)", "(*.*)"]):
 
     def GetISO639_country_code (self):
         list = OSMutils.omsutils_get_iso639_code ()
-        print(list)
+        
         return list
 
     def ReadTransportData (self, city, transport_type, iso639_city_code, place_id):
@@ -312,9 +312,10 @@ def ReadTransportData (self, city, transport_type, iso639_city_code, place_id):
     def GetTransportLines (self):
         #ret = self.osmt.GetTransportLineList ()
         ret = self.osmt.GetTransportDataLineList ()
-        
-        print ("GetTransportLineList", ret)
-        return ret
+        print ("ret", ret, type(ret))
+        resstr = json.dumps (ret,  ensure_ascii=False)
+        print ("GetTransportLineList", resstr)
+        return resstr
 
     def GetTransportDataSvg (self, linelist, drawstation, linestrategy, polygon):
         print ("GetTransportSVG", linelist, drawstation, int(linestrategy), type(linestrategy))
@@ -324,10 +325,13 @@ def GetTransportDataSvg (self, linelist, drawstation, linestrategy, polygon):
         return svg
 
     def GetTransportData (self, linelist, drawstation, linestrategy, polygon):
-        svg = self.GetTransportDataSvg (linelist, drawstation, linestrategy, polygon)
-        liststation = self.osmt.GetTransportDataStations (linelist)
+        linearray = json.loads (linelist)
+        #print ("json decoded", linearray )
+        svg = self.GetTransportDataSvg (linearray, drawstation, linestrategy, polygon)
+        liststation = self.osmt.GetTransportDataStations (linearray)
 
-        return json.dumps({"svg": svg, "stations": liststation})
+        str = json.dumps({"svg": svg, "stations": liststation}, ensure_ascii=False)
+        return str
 
     def GetTransportSVGbase64 (self):
         svg = self.osmt.get_svg ()
@@ -389,9 +393,15 @@ def delete_splash(window):
     api = Api()
     debugihm = False
 
+    # redirect stdout to file for debug purpose
+    #f = open("output.log", 'w')
+    f = open(os.devnull, 'w')
+    sys.stdout = f
+
     #print(sys.argv)
     dir, script = os.path.splitext(sys.argv[0])
-    if len(sys.argv) > 1 and script == ".py":
+    #if len(sys.argv) > 1 and script == ".py":
+    if len(sys.argv) > 1:
         if sys.argv[1] == "--debug":
             debugihm = True