update to trunk

(bzr r11950.1.250)

14 files changed, 61 insertions, 28 deletions

diff --git a/share/extensions/draw_from_triangle.py b/share/extensions/draw_from_triangle.py
index 414363e86..42cda7035 100755
--- a/share/extensions/draw_from_triangle.py
+++ b/share/extensions/draw_from_triangle.py
@@ -148,6 +148,8 @@ def get_n_points_from_path( node, n):#returns a list of first n points (x,y) in
     if len(xi) == n and len(yi) == n:
         points = [] # returned pairs of points
         for i in range(n):
+            xi[i] = Draw_From_Triangle.unittouu(e, str(xi[i]) + 'px')
+            yi[i] = Draw_From_Triangle.unittouu(e, str(yi[i]) + 'px')
             points.append( [ xi[i], yi[i] ] )
     else:
         #inkex.errormsg(_('Error: Not enough nodes to gather coordinates.')) #fail silently and exit, rather than invoke an error console
@@ -190,17 +192,17 @@ class Style(object): #container for style information
     def __init__(self, options):
         #dot markers
         self.d_rad = 4 #dot marker radius
-        self.d_th  = 2 #stroke width
+        self.d_th  = Draw_From_Triangle.unittouu(e, '2px') #stroke width
         self.d_fill= '#aaaaaa' #fill colour
         self.d_col = '#000000' #stroke colour
 
         #lines
-        self.l_th  = 2
+        self.l_th  = Draw_From_Triangle.unittouu(e, '2px')
         self.l_fill= 'none'
         self.l_col = '#000000'
         
         #circles
-        self.c_th  = 2
+        self.c_th  = Draw_From_Triangle.unittouu(e, '2px')
         self.c_fill= 'none'
         self.c_col = '#000000'
 
@@ -314,7 +316,7 @@ class Draw_From_Triangle(inkex.Effect):
 
         if len(pts) == 3: #if we have right number of nodes, else skip and end program
             st = Style(so)#style for dots, lines and circles
-            
+
             #CREATE A GROUP TO HOLD ALL GENERATED ELEMENTS IN
             #Hold relative to point A (pt[0])
             group_translation = 'translate(' + str( pts[0][0] ) + ','+ str( pts[0][1] ) + ')'
diff --git a/share/extensions/foldablebox.py b/share/extensions/foldablebox.py
index 5d5945dd9..b504de89f 100755
--- a/share/extensions/foldablebox.py
+++ b/share/extensions/foldablebox.py
@@ -70,7 +70,7 @@ class FoldableBox(inkex.Effect):
         box_id = self.uniqueId('box')
         self.box = g = inkex.etree.SubElement(self.current_layer, 'g', {'id':box_id})
 
-        line_style = simplestyle.formatStyle({ 'stroke': '#000000', 'fill': 'none' })
+        line_style = simplestyle.formatStyle({ 'stroke': '#000000', 'fill': 'none', 'stroke-width': str(self.unittouu('1px')) })
 
         #self.createGuide( 0, docH, 0 );
 
diff --git a/share/extensions/grid_cartesian.py b/share/extensions/grid_cartesian.py
index 85716a6fd..23df0ff84 100755
--- a/share/extensions/grid_cartesian.py
+++ b/share/extensions/grid_cartesian.py
@@ -122,7 +122,17 @@ class Grid_Polar(inkex.Effect):
 
 
     def effect(self):
-        
+
+        self.options.border_th = self.unittouu(str(self.options.border_th) + 'px')
+        self.options.dx = self.unittouu(str(self.options.dx) + 'px')
+        self.options.x_divs_th = self.unittouu(str(self.options.x_divs_th) + 'px')
+        self.options.x_subdivs_th = self.unittouu(str(self.options.x_subdivs_th) + 'px')
+        self.options.x_subsubdivs_th = self.unittouu(str(self.options.x_subsubdivs_th) + 'px')
+        self.options.dy = self.unittouu(str(self.options.dy) + 'px')
+        self.options.y_divs_th = self.unittouu(str(self.options.y_divs_th) + 'px')
+        self.options.y_subdivs_th = self.unittouu(str(self.options.y_subdivs_th) + 'px')
+        self.options.y_subsubdivs_th = self.unittouu(str(self.options.y_subsubdivs_th) + 'px')
+
         #find the pixel dimensions of the overall grid
         ymax = self.options.dy * self.options.y_divs
         xmax = self.options.dx * self.options.x_divs
diff --git a/share/extensions/grid_isometric.py b/share/extensions/grid_isometric.py
index 27951a0a8..8ac407613 100755
--- a/share/extensions/grid_isometric.py
+++ b/share/extensions/grid_isometric.py
@@ -84,6 +84,12 @@ class Grid_Polar(inkex.Effect):
 
     def effect(self):
 
+        self.options.dx = self.unittouu(str(self.options.dx) + 'px')
+        self.options.divs_th = self.unittouu(str(self.options.divs_th) + 'px')
+        self.options.subdivs_th = self.unittouu(str(self.options.subdivs_th) + 'px')
+        self.options.subsubdivs_th = self.unittouu(str(self.options.subsubdivs_th) + 'px')
+        self.options.border_th = self.unittouu(str(self.options.border_th) + 'px')
+
         #Can't generate a grid too flat
         #If the Y dimension is smallest than half the X dimension, fix it.
         if self.options.y_divs<((self.options.x_divs+1)/2):
diff --git a/share/extensions/grid_polar.py b/share/extensions/grid_polar.py
index 3ae3fac34..17c3499cb 100755
--- a/share/extensions/grid_polar.py
+++ b/share/extensions/grid_polar.py
@@ -119,7 +119,16 @@ class Grid_Polar(inkex.Effect):
                         help="The radial outset of the circumferential labels")
 
     def effect(self):
-    
+
+        self.options.dr = self.unittouu(str(self.options.dr) + 'px')
+        self.options.r_divs_th = self.unittouu(str(self.options.r_divs_th) + 'px')
+        self.options.r_subdivs_th = self.unittouu(str(self.options.r_subdivs_th) + 'px')
+        self.options.a_divs_th = self.unittouu(str(self.options.a_divs_th) + 'px')
+        self.options.a_subdivs_th = self.unittouu(str(self.options.a_subdivs_th) + 'px')
+        self.options.c_dot_dia = self.unittouu(str(self.options.c_dot_dia) + 'px')
+        self.options.a_label_size = self.unittouu(str(self.options.a_label_size) + 'px')
+        self.options.a_label_outset = self.unittouu(str(self.options.a_label_outset) + 'px')
+
         # Embed grid in group
         #Put in in the centre of the current view
         t = 'translate(' + str( self.view_center[0] ) + ',' + str( self.view_center[1] ) + ')'
diff --git a/share/extensions/guides_creator.py b/share/extensions/guides_creator.py
index abd41c6fc..21df1cd50 100755
--- a/share/extensions/guides_creator.py
+++ b/share/extensions/guides_creator.py
@@ -297,8 +297,8 @@ class Guides_Creator(inkex.Effect):
                 svg = self.document.getroot()
 
                 # getting the width and height attributes of the canvas
-                width  = self.unittouu(svg.get('width'))
-                height = self.unittouu(svg.attrib['height'])
+                width  = float(svg.get('width'))
+                height = float(svg.get('height'))
 
                 # getting edges coordinates
                 h_orientation = '0,' + str(round(width,4))
diff --git a/share/extensions/lindenmayer.py b/share/extensions/lindenmayer.py
index f9abce3ec..2e058f541 100755
--- a/share/extensions/lindenmayer.py
+++ b/share/extensions/lindenmayer.py
@@ -104,7 +104,8 @@ class LSystem(inkex.Effect):
         return level_string
             
     def effect(self):
-        s = {'stroke-linejoin': 'miter', 'stroke-width': '1.0px', 
+        self.options.step = self.unittouu(str(self.options.step) + 'px')
+        s = {'stroke-linejoin': 'miter', 'stroke-width': str(self.unittouu('1px')), 
             'stroke-opacity': '1.0', 'fill-opacity': '1.0', 
             'stroke': '#000000', 'stroke-linecap': 'butt', 
             'fill': 'none'}
diff --git a/share/extensions/render_alphabetsoup.py b/share/extensions/render_alphabetsoup.py
index ad43163e4..083f03af9 100755
--- a/share/extensions/render_alphabetsoup.py
+++ b/share/extensions/render_alphabetsoup.py
@@ -514,7 +514,7 @@ class AlphabetSoup(inkex.Effect):
 						help="Generate random (unreadable) text")
 
 	def effect(self):
-		zoom = self.options.zoom
+		zoom = self.unittouu( str(self.options.zoom) + 'px')
 
 		if self.options.randomize:
 			imagelist = generate_random_string(self.options.text, zoom)
diff --git a/share/extensions/render_gear_rack.py b/share/extensions/render_gear_rack.py
index 13eaf1017..68c5d050e 100644
--- a/share/extensions/render_gear_rack.py
+++ b/share/extensions/render_gear_rack.py
@@ -65,8 +65,8 @@ class RackGear(inkex.Effect):
             help="Contact Angle")
 
     def effect(self):
-        length = self.options.length
-        spacing = self.options.spacing
+        length = self.unittouu(str(self.options.length) + 'px')
+        spacing = self.unittouu(str(self.options.spacing) + 'px')
         angle = radians(self.options.angle)
 
         # generate points: list of (x, y) pairs
@@ -93,7 +93,7 @@ class RackGear(inkex.Effect):
         g = inkex.etree.SubElement(self.current_layer, 'g', g_attribs)
 
         # Create SVG Path for gear
-        style = {'stroke': '#000000', 'fill': 'none'}
+        style = {'stroke': '#000000', 'fill': 'none', 'stroke-width': str(self.unittouu('1px'))}
         gear_attribs = {
             'style': simplestyle.formatStyle(style),
             'd': path}
diff --git a/share/extensions/render_gears.py b/share/extensions/render_gears.py
index 5201e553b..d5c8131a8 100644
--- a/share/extensions/render_gears.py
+++ b/share/extensions/render_gears.py
@@ -164,7 +164,7 @@ class Gears(inkex.Effect):
         g = inkex.etree.SubElement(self.current_layer, 'g', g_attribs)
 
         # Create SVG Path for gear
-        style = { 'stroke': '#000000', 'fill': 'none' }
+        style = { 'stroke': '#000000', 'fill': 'none', 'stroke-width': str(self.unittouu('1px')) }
         gear_attribs = {'style':simplestyle.formatStyle(style), 'd':path}
         gear = inkex.etree.SubElement(g, inkex.addNS('path','svg'), gear_attribs )
         if(centerdiameter > 0.0):
diff --git a/share/extensions/rtree.py b/share/extensions/rtree.py
index 3231d284e..db677d0d5 100755
--- a/share/extensions/rtree.py
+++ b/share/extensions/rtree.py
@@ -44,7 +44,9 @@ class RTreeTurtle(inkex.Effect):
                         dest="minimum", default=4.0,
                         help="minimum branch size")
     def effect(self):
-        s = {'stroke-linejoin': 'miter', 'stroke-width': '1.0px', 
+        self.options.size = self.unittouu(str(self.options.size) + 'px')
+        self.options.minimum = self.unittouu(str(self.options.minimum) + 'px')
+        s = {'stroke-linejoin': 'miter', 'stroke-width': str(self.unittouu('1px')), 
             'stroke-opacity': '1.0', 'fill-opacity': '1.0', 
             'stroke': '#000000', 'stroke-linecap': 'butt', 
             'fill': 'none'}
diff --git a/share/extensions/spirograph.py b/share/extensions/spirograph.py
index cb9d1ac24..77a258d5f 100755
--- a/share/extensions/spirograph.py
+++ b/share/extensions/spirograph.py
@@ -47,6 +47,9 @@ class Spirograph(inkex.Effect):
                         help="The quality of the calculated output")
 
     def effect(self):
+        self.options.primaryr = self.unittouu(str(self.options.primaryr) + 'px')
+        self.options.secondaryr = self.unittouu(str(self.options.secondaryr) + 'px')
+        self.options.penr = self.unittouu(str(self.options.penr) + 'px')
 
         if self.options.secondaryr == 0:
             return
@@ -68,7 +71,7 @@ class Spirograph(inkex.Effect):
         rotation = - math.pi * self.options.rotation / 180;
 
         new = inkex.etree.Element(inkex.addNS('path','svg'))
-        s = { 'stroke': '#000000', 'fill': 'none' }
+        s = { 'stroke': '#000000', 'fill': 'none', 'stroke-width': str(self.unittouu('1px')) }
         new.set('style', simplestyle.formatStyle(s))
 
         pathString = ''
diff --git a/share/symbols/AigaSymbols.svg b/share/symbols/AigaSymbols.svg
index 946633315..3ac907e61 100644
--- a/share/symbols/AigaSymbols.svg
+++ b/share/symbols/AigaSymbols.svg
@@ -241,7 +241,7 @@
     </symbol>
 
     <symbol id="BaggageLockers">
-      <title>Bagage Lockers</title>
+      <title>Baggage Lockers</title>
       <!-- key -->
       <path d="m 34.625,11 a 7.5,7.5 0 1 0 0,7 l 2.375,0 2.5,-2.5 2,2 2,-2 2,2 2,-2 2,2 2.5,-2.5 c 0.5,-0.5 0.5,-1 0,-1.5 L 49.5,11 z M 27,14.5 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z" style="stroke:none"/>
       <!-- locker -->
@@ -251,7 +251,7 @@
     </symbol>
 
     <symbol id="BaggageLockers_Inv">
-      <title>Bagage Lockers</title>
+      <title>Baggage Lockers</title>
       <rect x="0.5" y="0.5" width="71" height="71" ry="6" style="stroke:white"/>
       <!-- key -->
       <path d="m 34.625,11 a 7.5,7.5 0 1 0 0,7 l 2.375,0 2.5,-2.5 2,2 2,-2 2,2 2,-2 2,2 2.5,-2.5 c 0.5,-0.5 0.5,-1 0,-1.5 L 49.5,11 z M 27,14.5 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z" style="fill:white;stroke:none"/>
@@ -1241,7 +1241,7 @@
     </symbol>
 
     <symbol id="WheelChair1996">
-      <title>NPS Wheelchair Accessable - 1996</title>
+      <title>NPS Wheelchair Accessible - 1996</title>
       <g style="stroke:none">
 	<circle cx="30" cy="11.75" r="5"/>
 	<path d="M 51,36.5 C 50.48,35.61 49.5,35 48.5,35 L 36,35 35.8,31 45,31 a 2.25,2.25 0 0 0 0,-4.5 l -9.5,0 -0.2,-4.3 c -0.18,-2.6 -2.2,-4.75 -4.9,-4.6 -2.7,0.15 -5,2.5 -4.8,5.1 L 26.45,38 c 0.2,2.6 2.45,4.5 5.05,4.5 l 16.5,0 6.5,11.5 a 2.916,2.916 0 0 0 5,-3 z"/> 
@@ -1250,7 +1250,7 @@
     </symbol>
 
     <symbol id="WheelChairInv">
-      <title>NPS Wheelchair Accessable - 1996</title>
+      <title>NPS Wheelchair Accessible - 1996</title>
       <rect x="0.5" y="0.5" width="71" height="71" ry="6" style="stroke:white"/>
       <g style="fill:white;stroke:none">
 	<circle cx="30" cy="11.75" r="5"/>
@@ -1260,7 +1260,7 @@
     </symbol>
 
     <symbol id="WheelChair">
-      <title>NPS Wheelchair Accessable</title>
+      <title>NPS Wheelchair Accessible</title>
       <g style="stroke:none">
 	<circle cx="30" cy="11.75" r="5"/>
 	<path d="m 63.5,55.5 a 2.25,2.25 0 0 0 0,-4.5 l -4,0 L 51,36.5 C 50.48,35.61 49.5,35 48.5,35 L 36,35 35.8,31 45,31 a 2.25,2.25 0 0 0 0,-4.5 l -9.5,0 -0.2,-4.3 c -0.18,-2.6 -2.2,-4.75 -4.9,-4.6 -2.7,0.15 -5,2.5 -4.8,5.1 L 26.45,38 c 0.2,2.6 2.45,4.5 5.05,4.5 l 16.5,0 6.5,11.5 c 0.25,0.5 1.3,1.5 2.5,1.5 z"/> 
@@ -1269,7 +1269,7 @@
     </symbol>
 
     <symbol id="WheelChair_Inv">
-      <title>NPS Wheelchair Accessable</title>
+      <title>NPS Wheelchair Accessible</title>
       <rect x="0.5" y="0.5" width="71" height="71" ry="6" style="stroke:white"/>
       <g style="fill:white;stroke:none">
 	<circle cx="30" cy="11.75" r="5"/>
@@ -1279,7 +1279,7 @@
     </symbol>
 
     <symbol id="WheelChairNew">
-      <title>New Wheelchair Accessable</title>
+      <title>New Wheelchair Accessible</title>
       <g style="stroke:none">
 	<circle cx="37" cy="12.5" r="5"/>
 	<path d="m 15.9,31.3 5.3,-7.7 c 0.3,-0.4 0.9,-0.8 1.3,-1 L 32,18.5 c 4,-1.8 7,2 6.5,4.7 l -2,9.8 9.5,2 c 1.3,0.3 2.1,0.9 2.8,2 l 7.3,12.3 2.8,-1.9 c 2.2,-1.5 4.5,1.7 2.2,3.3 l -5.6,3.8 c -1,0.7 -2.5,0.4 -3,-0.5 l -7,-12 -15,-3 c -2,-0.4 -3.8,-3 -3.5,-5 l 2,-10 -4.5,2 -5.4,7.6 c -1.5,2.2 -4.8,0 -3.2,-2.4 z"/> 
@@ -1288,7 +1288,7 @@
     </symbol>
 
     <symbol id="WheelChairNew_Inv">
-      <title>New Wheelchair Accessable</title>
+      <title>New Wheelchair Accessible</title>
       <rect x="0.5" y="0.5" width="71" height="71" ry="6" style="stroke:white"/>
       <g style="fill:white;stroke:none">
 	<circle cx="37" cy="12.5" r="5"/>
diff --git a/share/symbols/MapSymbols.svg b/share/symbols/MapSymbols.svg
index 0d3e1b0fa..4fccc0492 100644
--- a/share/symbols/MapSymbols.svg
+++ b/share/symbols/MapSymbols.svg
@@ -1911,7 +1911,7 @@
 <path inkscape:connector-curvature="0" transform="matrix(14.68584,0,0,14.68584,569.7658,1146.064)" style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:NPSPICT3;-inkscape-font-specification:NPSPICT3" d="m -7.062988,-45.30859 c -0.479361,0 -1.139151,0.14668 -1.97937,0.44006 -0.84028,0.29337 -1.500472,0.44006 -1.980592,0.44006 -0.47936,0 -1.14586,-0.14669 -1.99951,-0.44006 -0.85371,-0.29338 -1.50719,-0.44006 -1.96045,-0.44006 -0.47935,0 -1.14586,0.14668 -1.99951,0.44006 -0.8537,0.29337 -1.5202,0.44006 -1.99951,0.44006 -0.45413,0 -1.10781,-0.14669 -1.96106,-0.44006 -0.85329,-0.29338 -1.51959,-0.44006 -1.99891,-0.44006 -0.48015,0 -1.14035,0.14668 -1.98059,0.44006 -0.84026,0.29337 -1.50046,0.44006 -1.98059,0.44006 -0.47934,0 -1.13913,-0.14669 -1.97937,-0.44006 -0.84026,-0.29338 -1.50045,-0.44006 -1.98059,-0.44006 -0.47933,0 -1.14584,0.14668 -1.99951,0.44006 -0.85368,0.29337 -1.50717,0.44006 -1.96045,0.44006 l 0,2.91993 c 0.45328,-10e-6 1.10677,-0.1467 1.96045,-0.44007 0.85367,-0.29338 1.52018,-0.44007 1.99951,-0.44006 0.48014,-1e-5 1.14033,0.14668 1.98059,0.44006 0.84024,0.29337 1.50003,0.44006 1.97937,0.44007 0.48013,-10e-6 1.14033,-0.1467 1.98059,-0.44007 0.84024,-0.29338 1.50044,-0.44007 1.98059,-0.44006 0.47932,-1e-5 1.14562,0.14668 1.99891,0.44006 0.85325,0.29337 1.50693,0.44006 1.96106,0.44007 0.47931,-10e-6 1.14581,-0.1467 1.99951,-0.44007 0.85365,-0.29338 1.52016,-0.44007 1.99951,-0.44006 0.45326,-1e-5 1.10674,0.14668 1.96045,0.44006 0.85365,0.29337 1.52015,0.44006 1.99951,0.44007 0.48012,-10e-6 1.140312,-0.1467 1.980592,-0.44007 0.840219,-0.29338 1.500009,-0.44007 1.97937,-0.44006 0.48011,-1e-5 1.140307,0.14668 1.980591,0.44006 0.840215,0.29337 1.500005,0.44006 1.97937,0.44007 l 0,-2.91993 c -0.479365,0 -1.139155,-0.14669 -1.97937,-0.44006 -0.840284,-0.29338 -1.500481,-0.44006 -1.980591,-0.44006 L -7.062988,-45.30859 z m -8.759762,-30.52002 -18.07984,22.08008 18.07984,0 L -15.82275,-75.82861 z m 1.67968,5.08056 0,16.99952 10.841068,0 c 0.05286,-0.48014 0.07931,-0.94686 0.07935,-1.40015 -3.6e-5,-3.38622 -1.199986,-6.59951 -3.599854,-9.63989 -2.053253,-2.63996 -4.493444,-4.62645 -7.320564,-5.95948 L -14.14307,-70.74805 z m -15.47973,18.59986 0,4.36035 c 0.42723,0.13265 0.8675,0.27913 1.3208,0.43945 0.45327,0.16032 0.91958,0.24048 1.39892,0.24048 0.48013,0 1.14684,-0.14669 2.00013,-0.44006 0.85325,-0.29338 1.50694,-0.44007 1.96105,-0.44007 0.47932,0 1.14562,0.14669 1.99891,0.44007 0.85325,0.29337 1.50693,0.44006 1.96106,0.44006 0.47931,0 1.14581,-0.14669 1.99951,-0.44006 0.85365,-0.29338 1.52016,-0.44007 1.99951,-0.44007 0.45326,0 1.10674,0.14669 1.96045,0.44007 0.85365,0.29337 1.52015,0.44006 1.99951,0.44006 -3e-5,0 0.13344,-0.0134 0.40039,-0.0403 -3e-5,0 -3e-5,0 0,0 -3e-5,0 0.007,0 0.0201,0 0.0134,0 0.0466,0 0.0995,0 0.0537,-0.0269 0.1139,-0.0403 0.18066,-0.0403 0.0667,0 0.20668,-0.0269 0.419926,-0.0806 0.639619,-0.29297 1.41273,-0.75928 2.319336,-1.39893 L -4.782715,-52.14819 -29.6228,-52.14819 Z" id="path17239" />
 </symbol>
 <symbol transform="matrix(0.1103728,0,0,0.1103728,454.4565,1345.265)" id="g70357">
-<title id="title17247">Leasure Center</title>
+<title id="title17247">Leisure Center</title>
 <g id="g17249">
 <path d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,86.804 l 0,450.123 c 0,20.844 20.896,42.229 62.192,42.229 l 452.024,0 c 41.307,0 62.229,-20.313 62.229,-62.229 l 0,-450.123 C 578.149,24.203 557.227,1.768 514.628,1.768 514.624,1.768 66.133,1.625 66.275,1.768 Z" style="fill:#111111;stroke:#eeeeee;stroke-width:3.408" id="path17251" inkscape:connector-curvature="0" />
 </g>
@@ -2098,7 +2098,7 @@
 <path inkscape:connector-curvature="0" style="fill:#ffffff;fill-opacity:1" d="m 186.1224,419.2769 c -15.5875,-2.1652 -30.477,-11.4087 -37.973,-25.4518 8.3008,-9.2226 20.1547,0.1201 29.846,1.0014 22.6039,2.8578 43.7286,-12.0049 54.7396,-30.8782 7.138,-6.8412 8.0681,-25.4986 20.4823,-22.7628 8.9533,4.9551 7.2662,16.3566 5.0791,24.6398 -1.4157,11.0444 -6.7831,20.9741 -13.878,29.3942 -5.5893,7.486 -11.1394,16.0521 -20.8063,18.5313 C 211.2499,416.0508 198.9486,421.8935 186.1224,419.2769 z m -55.2276,-120.843 c -11.9155,-7.0335 -26.2781,-11.3583 -34.72464,-23.0337 -1.88388,-13.2833 14.87324,-21.9448 26.01984,-16.757 13.1263,4.1069 25.5393,11.6235 33.8461,22.7568 5.5137,10.0174 -4.0566,25.8353 -15.9644,20.6756 C 136.9139,301.1213 133.9712,299.6034 130.8948,298.4339 z m 75.9973,-24.5921 c -8.3339,-10.9448 -8.412,-29.9962 4.5392,-37.5055 8.506,-5.6193 20.7127,-9.4814 29.7536,-2.8491 4.7457,9.7797 -3.6123,18.7431 -7.3837,27.2043 -2.2786,8.5463 -7.8821,18.1434 -17.6474,18.9946 C 212.222,279.7835 208.731,277.1721 206.8921,273.8418 Z" id="path20423" />
 </symbol>
 <symbol transform="matrix(0.1103727,0,0,0.1103727,-15.22728,1604.204)" id="g81881">
-<title id="title20431">Park / Picnick Area</title>
+<title id="title20431">Park / Picnic Area</title>
 <g id="g20433">
 <path inkscape:connector-curvature="0" d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.895,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.315 62.229,-62.229 l 0,-450.123 C 578.149,24.203 557.227,1.768 514.628,1.768 514.624,1.768 66.133,1.625 66.275,1.768 Z" style="fill:#111111;stroke:#eeeeee;stroke-width:3.408" id="path20435" />
 </g>
@@ -2134,7 +2134,7 @@
 <path inkscape:connector-curvature="0" d="m 71.97432,176.8669 0,-32.9636 214.18778,-90.82787 216.4043,88.83257 0,32.9649 L 284.1904,90.53986 71.97432,176.8669 Z M 130.5485,175.3484 287.8228,112.4378 440.7941,177.038 378.835,176.7565 287.3056,144.3501 196.0368,174.7018 130.5485,175.3484 Z" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" id="path20491" />
 </symbol>
 <symbol transform="matrix(0.1103727,0,0,0.1103727,60.52537,1606.476)" id="g78634">
-<title id="title20499">Intormation</title>
+<title id="title20499">Information</title>
 <g id="g20501">
 <path inkscape:connector-curvature="0" d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.894,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.316 62.229,-62.229 l 0,-450.123 C 578.149,24.203 557.227,1.768 514.627,1.768 514.624,1.768 66.133,1.625 66.275,1.768 Z" style="fill:#111111;stroke:#eeeeee;stroke-width:3.408" id="path20503" />
 </g>