From 56c71c5b6b081316b07059b5d60f44b7eab289a3 Mon Sep 17 00:00:00 2001
From: roelderickx <roel.derickx@gmail.com>
Date: Fri, 2 Dec 2022 18:54:59 +0100
Subject: [PATCH] #28 Use ; as value separator in tags

---
 ogr2osm/osm_geometries.py      | 2 +-
 ogr2osm/pbf_datawriter.py      | 2 +-
 test/mergetags.pbf.xml         | 2 +-
 test/mergetags.xml             | 2 +-
 test/mergetagsnonempty.pbf.xml | 2 +-
 test/mergetagsnonempty.xml     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ogr2osm/osm_geometries.py b/ogr2osm/osm_geometries.py
index 64401a7..33b4c1b 100644
--- a/ogr2osm/osm_geometries.py
+++ b/ogr2osm/osm_geometries.py
@@ -104,7 +104,7 @@ def get_parents(self):
 
     def _add_tags_to_xml(self, xmlobject, suppress_empty_tags):
         for (key, value_list) in self.tags.items():
-            value = ','.join([ v for v in value_list if v ])
+            value = ';'.join([ v for v in value_list if v ])
             if value or not suppress_empty_tags:
                 tag = etree.Element('tag', { 'k':key, 'v':value })
                 xmlobject.append(tag)
diff --git a/ogr2osm/pbf_datawriter.py b/ogr2osm/pbf_datawriter.py
index dcf1c38..edd5bce 100644
--- a/ogr2osm/pbf_datawriter.py
+++ b/ogr2osm/pbf_datawriter.py
@@ -74,7 +74,7 @@ def _get_tag_iterator(self, tags):
             based on suppress_empty_tags.
             '''
             for (key, value_list) in tags.items():
-                value = ','.join([ v for v in value_list if v ])
+                value = ';'.join([ v for v in value_list if v ])
                 if value or not self.suppress_empty_tags:
                     yield (self._add_string(key), self._add_string(value))
 
diff --git a/test/mergetags.pbf.xml b/test/mergetags.pbf.xml
index fdf7c5f..131263c 100644
--- a/test/mergetags.pbf.xml
+++ b/test/mergetags.pbf.xml
@@ -2,7 +2,7 @@
 <osm version="0.6" generator="osmconvert 0.8.10">
   <node id="-1" lat="33.4838" lon="-23.094721">
     <tag k="name" v="the_point"/>
-    <tag k="description" v="Description of the_point,Alternative description of the_point"/>
+    <tag k="description" v="Description of the_point;Alternative description of the_point"/>
     <tag k="longitude" v="-23.094721"/>
     <tag k="latitude" v="33.4838"/>
     <tag k="extra_empty" v=""/>
diff --git a/test/mergetags.xml b/test/mergetags.xml
index 8b0e2d1..91dd879 100644
--- a/test/mergetags.xml
+++ b/test/mergetags.xml
@@ -2,7 +2,7 @@
 <osm version="0.6" generator="ogr2osm 1.1.2" upload="false">
   <node visible="true" id="-1" lat="33.4838" lon="-23.094721">
     <tag k="name" v="the_point"/>
-    <tag k="description" v="Description of the_point,Alternative description of the_point"/>
+    <tag k="description" v="Description of the_point;Alternative description of the_point"/>
     <tag k="longitude" v="-23.094721"/>
     <tag k="latitude" v="33.4838"/>
     <tag k="extra_empty" v=""/>
diff --git a/test/mergetagsnonempty.pbf.xml b/test/mergetagsnonempty.pbf.xml
index e013442..5373123 100644
--- a/test/mergetagsnonempty.pbf.xml
+++ b/test/mergetagsnonempty.pbf.xml
@@ -2,7 +2,7 @@
 <osm version="0.6" generator="osmconvert 0.8.10">
   <node id="-1" lat="33.4838" lon="-23.094721">
     <tag k="name" v="the_point"/>
-    <tag k="description" v="Description of the_point,Alternative description of the_point"/>
+    <tag k="description" v="Description of the_point;Alternative description of the_point"/>
     <tag k="longitude" v="-23.094721"/>
     <tag k="latitude" v="33.4838"/>
   </node>
diff --git a/test/mergetagsnonempty.xml b/test/mergetagsnonempty.xml
index 24f8bce..e73a1e5 100644
--- a/test/mergetagsnonempty.xml
+++ b/test/mergetagsnonempty.xml
@@ -2,7 +2,7 @@
 <osm version="0.6" generator="ogr2osm 1.1.2" upload="false">
   <node visible="true" id="-1" lat="33.4838" lon="-23.094721">
     <tag k="name" v="the_point"/>
-    <tag k="description" v="Description of the_point,Alternative description of the_point"/>
+    <tag k="description" v="Description of the_point;Alternative description of the_point"/>
     <tag k="longitude" v="-23.094721"/>
     <tag k="latitude" v="33.4838"/>
   </node>