Skip to content

quote/escape xml attributes #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

quote/escape xml attributes #11

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
625f3e9
quote xml attributes
AntonKhorev Jan 13, 2018
79f8b12
removed some unused variables
AntonKhorev Jan 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 31 additions & 30 deletions OsmData.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,12 @@
# MA 02110-1301, USA.

import xml.sax
import xml.sax.saxutils
import copy

def quoteattr(attr):
return xml.sax.saxutils.quoteattr(str(attr))

LON = 1
LAT = 2
REF = 3
Expand Down Expand Up @@ -138,90 +142,87 @@ def write(self, targetStream):
targetStream.write("<!--" + text + "-->\n")
targetStream.write("</osm>")
def xmlnode(self, node):
string = ("<node id='" + str(node[0]) + "' ");
tags = {}
string = ("<node id=" + quoteattr(node[0]) + " ");
for attr in node[1].items():
if attr[0] == ACTION:
if attr[1] == MODIFY:
string += ("action='modify' ");
elif attr[1] == DELETE:
string += ("action='delete' ");
elif attr[0] == VERSION:
string += ("version='" + str(attr[1]) + "' ")
string += ("version=" + quoteattr(attr[1]) + " ")
elif attr[0] == CHANGESET:
string += ("changeset='" + str(attr[1]) + "' ")
string += ("changeset=" + quoteattr(attr[1]) + " ")
elif attr[0] == UID:
string += ("uid='" + str(attr[1]) + "' ")
string += ("uid=" + quoteattr(attr[1]) + " ")
elif attr[0] == LAT:
string += ("lat='" + str(attr[1]) + "' ")
string += ("lat=" + quoteattr(attr[1]) + " ")
elif attr[0] == LON:
string += ("lon='" + str(attr[1]) + "' ")
string += ("lon=" + quoteattr(attr[1]) + " ")
elif attr[0] == USER:
string += ("user='" + str(attr[1]) + "' ")
string += ("user=" + quoteattr(attr[1]) + " ")
elif attr[0] == "timestamp" or attr[0] == "visible":
string += (attr[0] + "='" + str(attr[1]) + "' ")
string += (attr[0] + "=" + quoteattr(attr[1]) + " ")
if len(node[1][TAG]) > 0:
string += (">\n")
for tag in node[1][TAG].items():
string += ("<tag k='" + str(tag[0]) + "' v='" + str(tag[1]) + "' />\n")
string += ("<tag k=" + quoteattr(tag[0]) + " v=" + quoteattr(tag[1]) + " />\n")
string += ("</node>\n")
else:
string += ("/>\n")
return string
def xmlway(self, way):
string = ("<way id='" + str(way[0]) + "' ");
tags = {}
string = ("<way id=" + quoteattr(way[0]) + " ");
for attr in way[1].items():
if attr[0] == ACTION:
if attr[1] == MODIFY:
string += ("action='modify' ");
elif attr[1] == DELETE:
string += ("action='delete' ");
elif attr[0] == VERSION:
string += ("version='" + str(attr[1]) + "' ")
string += ("version=" + quoteattr(attr[1]) + " ")
elif attr[0] == CHANGESET:
string += ("changeset='" + str(attr[1]) + "' ")
string += ("changeset=" + quoteattr(attr[1]) + " ")
elif attr[0] == UID:
string += ("uid='" + str(attr[1]) + "' ")
string += ("uid=" + quoteattr(attr[1]) + " ")
elif attr[0] == USER:
string += ("user='" + str(attr[1]) + "' ")
string += ("user=" + quoteattr(attr[1]) + " ")
elif attr[0] == "timestamp" or attr[0] == "visible":
string += (attr[0] + "='" + str(attr[1]) + "' ")
string += (attr[0] + "=" + quoteattr(attr[1]) + " ")
string += (">\n")
for ref in way[1][REF]:
string += ("<nd ref='" + str(ref) + "' />\n")
string += ("<nd ref=" + quoteattr(ref) + " />\n")
for tag in way[1][TAG].items():
string += ("<tag k='" + str(tag[0]) + "' v='" + str(tag[1]) + "' />\n")
string += ("<tag k=" + quoteattr(tag[0]) + " v=" + quoteattr(tag[1]) + " />\n")
string += ("</way>\n")
return string
def xmlrelation(self, relation):
string = ("<relation id='" + str(relation[0]) + "' ");
tags = {}
string = ("<relation id=" + quoteattr(relation[0]) + " ");
for attr in relation[1].items():
if attr[0] == ACTION:
if attr[1] == MODIFY:
string += ("action='modify' ");
elif attr[1] == DELETE:
string += ("action='delete' ");
elif attr[0] == VERSION:
string += ("version='" + str(attr[1]) + "' ")
string += ("version=" + quoteattr(attr[1]) + " ")
elif attr[0] == CHANGESET:
string += ("changeset='" + str(attr[1]) + "' ")
string += ("changeset=" + quoteattr(attr[1]) + " ")
elif attr[0] == UID:
string += ("uid='" + str(attr[1]) + "' ")
string += ("uid=" + quoteattr(attr[1]) + " ")
elif attr[0] == USER:
string += ("user='" + str(attr[1]) + "' ")
string += ("user=" + quoteattr(attr[1]) + " ")
elif attr[0] == "timestamp" or attr[0] == "visible":
string += (attr[0] + "='" + str(attr[1]) + "' ")
string += (attr[0] + "=" + quoteattr(attr[1]) + " ")
string += (">\n")
for ref in relation[1][REF][NODES]:
string += ("<member type='node' ref='" + str(ref[0]) + "' role='" + str(ref[1]) + "' />\n")
string += ("<member type='node' ref=" + quoteattr(ref[0]) + " role=" + quoteattr(ref[1]) + " />\n")
for ref in relation[1][REF][WAYS]:
string += ("<member type='way' ref='" + str(ref[0]) + "' role='" + str(ref[1]) + "' />\n")
string += ("<member type='way' ref=" + quoteattr(ref[0]) + " role=" + quoteattr(ref[1]) + " />\n")
for ref in relation[1][REF][RELATIONS]:
string += ("<member type='relation' ref='" + str(ref[0]) + "' role='" + str(ref[1]) + "' />\n")
string += ("<member type='relation' ref=" + quoteattr(ref[0]) + " role=" + quoteattr(ref[1]) + " />\n")
for tag in relation[1][TAG].items():
string += ("<tag k='" + str(tag[0]) + "' v='" + str(tag[1]) + "' />\n")
string += ("<tag k=" + quoteattr(tag[0]) + " v=" + quoteattr(tag[1]) + " />\n")
string += ("</relation>\n")
return string
def startElement(self, tag, attributes):
Expand Down