diff --git a/images/Canadian_PostalCode_Parts.png b/images/Canadian_PostalCode_Parts.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff768141505ac40eb4e0223342800d77e25bd6f0
Binary files /dev/null and b/images/Canadian_PostalCode_Parts.png differ
diff --git a/images/Postalcode_Parts_Masterfile.svg b/images/Postalcode_Parts_Masterfile.svg
new file mode 100644
index 0000000000000000000000000000000000000000..5753bea4073bcfd2b64d577686c5bf4ffe406ad2
--- /dev/null
+++ b/images/Postalcode_Parts_Masterfile.svg
@@ -0,0 +1,551 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="210mm"
+ height="297mm"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="UK_Postalcode_Parts.svg">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.98994949"
+ inkscape:cx="481.2854"
+ inkscape:cy="859.29734"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1639"
+ inkscape:window-height="1054"
+ inkscape:window-x="254"
+ inkscape:window-y="-19"
+ inkscape:window-maximized="0"
+ inkscape:snap-nodes="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans Bold"
+ x="41.630981"
+ y="184.01169"
+ id="text2989"
+ sodipodi:linespacing="125%"
+ inkscape:export-filename="/home/reinhold/UK_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357"><tspan
+ sodipodi:role="line"
+ id="tspan2991"
+ x="41.630981"
+ y="184.01169">EC1A 1AA</tspan><tspan
+ sodipodi:role="line"
+ x="41.630981"
+ y="234.01169"
+ id="tspan2993" /></text>
+ <path
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 172.91028,169.45114 0,0"
+ id="path2995"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="0"
+ inkscape:connection-start="#text2989"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end="#text2989"
+ inkscape:connection-end-point="d4"
+ inkscape:export-filename="/home/reinhold/UK_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357" />
+ <text
+ xml:space="preserve"
+ style="font-size:22.89579391px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+ x="152.34012"
+ y="66.614563"
+ id="text3005"
+ sodipodi:linespacing="100%"
+ inkscape:export-filename="/home/reinhold/UK_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357"><tspan
+ sodipodi:role="line"
+ id="tspan3007"
+ x="156.32005"
+ y="66.614563">Components of a </tspan><tspan
+ sodipodi:role="line"
+ x="152.34012"
+ y="89.510361"
+ id="tspan3009">UK postal code</tspan></text>
+ <path
+ style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 38.37049,152.6514 0,-14.09163 116.06628,0 0,14.09163"
+ id="path3011"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc"
+ inkscape:export-filename="/home/reinhold/UK_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 172.50752,152.30812 0,-14.43622 87.18822,0 0,14.43622"
+ id="path3011-9"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc"
+ inkscape:export-filename="/home/reinhold/UK_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 38.93923,190.21684 0,6.86211 58.35009,0 0,-6.86211"
+ id="path3011-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc"
+ inkscape:export-filename="/home/reinhold/UK_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:2.36999083;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 102.54541,189.74057 0,7.81465 20.73121,0 0,-7.81465"
+ id="path3011-2-4"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc"
+ inkscape:export-filename="/home/reinhold/UK_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 129.6994,189.80557 0,7.68465 23.45835,0 0,-7.68465"
+ id="path3011-2-4-6"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc"
+ inkscape:export-filename="/home/reinhold/UK_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357" />
+ <text
+ xml:space="preserve"
+ style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ x="53.996399"
+ y="119.36218"
+ id="text3892"
+ sodipodi:linespacing="125%"
+ inkscape:export-filename="/home/reinhold/UK_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357"><tspan
+ sodipodi:role="line"
+ id="tspan3894"
+ x="53.996399"
+ y="119.36218">Outward</tspan></text>
+ <path
+ style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="M 96.459284,138.55977 96.57143,124.36218"
+ id="path3902"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="0"
+ inkscape:connection-start="#path3011"
+ inkscape:connection-start-point="d4"
+ inkscape:export-filename="/home/reinhold/UK_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357" />
+ <text
+ xml:space="preserve"
+ style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ x="182.12213"
+ y="120.16461"
+ id="text3892-2"
+ sodipodi:linespacing="125%"
+ inkscape:export-filename="/home/reinhold/UK_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357"><tspan
+ sodipodi:role="line"
+ id="tspan3928"
+ x="182.12213"
+ y="120.16461">Inward</tspan></text>
+ <path
+ style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 216.04555,138.35205 0.11215,-14.19759"
+ id="path3902-9"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="0"
+ inkscape:export-filename="/home/reinhold/UK_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357" />
+ <text
+ xml:space="preserve"
+ style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ x="37.92189"
+ y="226.96109"
+ id="text3892-0"
+ sodipodi:linespacing="125%"
+ inkscape:export-filename="/home/reinhold/UK_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357"><tspan
+ sodipodi:role="line"
+ id="tspan3029"
+ x="37.92189"
+ y="226.96109">Area</tspan></text>
+ <path
+ style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 68.114276,197.07895 4e-6,13.7118"
+ id="path3031"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="0"
+ inkscape:connection-start="#path3011-2"
+ inkscape:connection-start-point="d4"
+ sodipodi:nodetypes="cc"
+ inkscape:export-filename="/home/reinhold/UK_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 112.90789,197.55522 -0.026,32.52125"
+ id="path3803"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="0"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-start="#path3011-2-4"
+ sodipodi:nodetypes="cc"
+ inkscape:export-filename="/home/reinhold/UK_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357" />
+ <text
+ xml:space="preserve"
+ style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ x="76.236214"
+ y="247.79634"
+ id="text3892-0-6"
+ sodipodi:linespacing="125%"
+ inkscape:export-filename="/home/reinhold/UK_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357"><tspan
+ sodipodi:role="line"
+ id="tspan3830"
+ x="76.236214"
+ y="247.79634">District</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ x="160.39664"
+ y="214.96109"
+ id="text3892-0-6-0"
+ sodipodi:linespacing="125%"
+ inkscape:export-filename="/home/reinhold/UK_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357"><tspan
+ sodipodi:role="line"
+ id="tspan3893"
+ x="160.39664"
+ y="214.96109">Subdistrict</tspan></text>
+ <path
+ style="fill:none;stroke:#000000;stroke-width:2.20751834;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 141.42858,198.30234 0,10.69111"
+ id="path3031-5"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc"
+ inkscape:export-filename="/home/reinhold/UK_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 156.04132,209.03183 -14.24335,0"
+ id="path3031-5-3"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc"
+ inkscape:export-filename="/home/reinhold/UK_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357" />
+ <text
+ xml:space="preserve"
+ style="font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ x="267.31268"
+ y="228.68095"
+ id="text3892-0-6-0-4"
+ sodipodi:linespacing="125%"
+ inkscape:export-filename="/home/reinhold/UK_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357"><tspan
+ sodipodi:role="line"
+ id="tspan3916"
+ x="267.31268"
+ y="228.68095">(London only)</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:44px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans Bold"
+ x="467.57516"
+ y="232.15063"
+ id="text2989-4"
+ sodipodi:linespacing="125%"
+ inkscape:export-filename="/home/reinhold/Canadian_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357"><tspan
+ sodipodi:role="line"
+ id="tspan4041"
+ x="467.57516"
+ y="232.15063">K1A 0B1</tspan><tspan
+ sodipodi:role="line"
+ id="tspan4043"
+ x="467.57516"
+ y="287.15063"></tspan></text>
+ <path
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 570.46188,216.13403 0,0"
+ id="path2995-3"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="0"
+ inkscape:connection-start="#text2989-4"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end="#text2989-4"
+ inkscape:connection-end-point="d4"
+ inkscape:export-filename="/home/reinhold/Canadian_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357" />
+ <text
+ xml:space="preserve"
+ style="font-size:22.89579391px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+ x="568.2843"
+ y="70.75351"
+ id="text3005-0"
+ sodipodi:linespacing="100%"
+ inkscape:export-filename="/home/reinhold/Canadian_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357"><tspan
+ sodipodi:role="line"
+ id="tspan4023"
+ x="572.26422"
+ y="70.75351">Components of a </tspan><tspan
+ sodipodi:role="line"
+ id="tspan4025"
+ x="568.2843"
+ y="93.649307">Canadian postal code</tspan></text>
+ <path
+ style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 461.93331,200.79035 0,-14.09163 106.06629,0 0,14.09163"
+ id="path3011-6"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc"
+ inkscape:export-filename="/home/reinhold/Canadian_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 583.45063,200.44707 0,-14.43622 95.18822,0 0,14.43622"
+ id="path3011-9-0"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc"
+ inkscape:export-filename="/home/reinhold/Canadian_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 467.27093,238.12027 0,7.33315 35.96399,0 0,-7.33315"
+ id="path3011-2-1"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc"
+ inkscape:export-filename="/home/reinhold/Canadian_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:2.36999083;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 508.4896,237.87952 0,7.81465 20.73121,0 0,-7.81465"
+ id="path3011-2-4-7"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc"
+ inkscape:export-filename="/home/reinhold/Canadian_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 533.82671,238.12764 0,7.31841 32.37783,0 0,-7.31841"
+ id="path3011-2-4-6-0"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc"
+ inkscape:export-filename="/home/reinhold/Canadian_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357" />
+ <text
+ xml:space="preserve"
+ style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ x="515.75256"
+ y="129.50113"
+ id="text3892-5"
+ sodipodi:linespacing="100%"
+ inkscape:export-filename="/home/reinhold/Canadian_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357"><tspan
+ sodipodi:role="line"
+ id="tspan4029"
+ x="515.75256"
+ y="129.50113">Forward</tspan><tspan
+ sodipodi:role="line"
+ id="tspan4031"
+ x="515.75256"
+ y="147.50113">Sortation</tspan><tspan
+ sodipodi:role="line"
+ id="tspan4033"
+ x="515.75256"
+ y="165.50113">Area (FSA)</tspan></text>
+ <path
+ style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 514.97267,186.69872 0.0125,-14.19759"
+ id="path3902-6"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="0"
+ inkscape:connection-start="#path3011-6"
+ inkscape:connection-start-point="d4"
+ inkscape:export-filename="/home/reinhold/Canadian_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357"
+ sodipodi:nodetypes="cc" />
+ <text
+ xml:space="preserve"
+ style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ x="631.03986"
+ y="130.58929"
+ id="text3892-2-2"
+ sodipodi:linespacing="100%"
+ inkscape:export-filename="/home/reinhold/Canadian_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357"><tspan
+ sodipodi:role="line"
+ id="tspan4035"
+ x="631.03986"
+ y="130.58929">Local</tspan><tspan
+ sodipodi:role="line"
+ id="tspan4037"
+ x="631.03986"
+ y="148.58929">Delivery</tspan><tspan
+ sodipodi:role="line"
+ id="tspan4039"
+ x="631.03986"
+ y="166.58929">Unit (LDU)</tspan></text>
+ <path
+ style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 630.98867,185.35829 0.11215,-14.19759"
+ id="path3902-9-2"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="0"
+ inkscape:export-filename="/home/reinhold/Canadian_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357" />
+ <text
+ xml:space="preserve"
+ style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ x="471.06055"
+ y="277.10004"
+ id="text3892-0-3"
+ sodipodi:linespacing="125%"
+ inkscape:export-filename="/home/reinhold/Canadian_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357"><tspan
+ sodipodi:role="line"
+ id="tspan4057">Province</tspan></text>
+ <path
+ style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+ d="m 485.25971,245.45342 0.026,14.05162"
+ id="path3031-8"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="0"
+ inkscape:connection-start="#path3011-2-1"
+ inkscape:connection-start-point="d4"
+ sodipodi:nodetypes="cc"
+ inkscape:export-filename="/home/reinhold/Canadian_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 518.84891,245.69734 -0.0197,43.22919"
+ id="path3803-3"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc"
+ inkscape:export-filename="/home/reinhold/Canadian_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357" />
+ <text
+ xml:space="preserve"
+ style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ x="554.18042"
+ y="305.9353"
+ id="text3892-0-6-2"
+ sodipodi:linespacing="125%"
+ inkscape:export-filename="/home/reinhold/Canadian_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357"><tspan
+ sodipodi:role="line"
+ id="tspan4047"
+ x="554.18042"
+ y="305.9353">Urban or Rural area</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ x="568.34082"
+ y="263.10004"
+ id="text3892-0-6-0-3"
+ sodipodi:linespacing="125%"
+ inkscape:export-filename="/home/reinhold/Canadian_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357"><tspan
+ sodipodi:role="line"
+ id="tspan4049"
+ x="568.34082"
+ y="263.10004">Subdivision</tspan></text>
+ <path
+ style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 549.37277,246.44129 0,10.69111"
+ id="path3031-5-4"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc"
+ inkscape:export-filename="/home/reinhold/Canadian_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 563.98551,257.17078 -14.24335,0"
+ id="path3031-5-3-8"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc"
+ inkscape:export-filename="/home/reinhold/Canadian_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357" />
+ <text
+ xml:space="preserve"
+ style="font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ x="707.25684"
+ y="276.81989"
+ id="text3892-0-6-0-4-8"
+ sodipodi:linespacing="125%"
+ inkscape:export-filename="/home/reinhold/Canadian_PostalCode_Parts.png"
+ inkscape:export-xdpi="149.80357"
+ inkscape:export-ydpi="149.80357"><tspan
+ sodipodi:role="line"
+ id="tspan4055">(districts, smaller cities)</tspan></text>
+ </g>
+</svg>
diff --git a/images/UK_PostalCode_Parts.png b/images/UK_PostalCode_Parts.png
new file mode 100644
index 0000000000000000000000000000000000000000..91c22442d44d4e829358bbab42e39285a2bd3574
Binary files /dev/null and b/images/UK_PostalCode_Parts.png differ
diff --git a/releases/plg_opentools_vm2_rules_shipping_advanced_v4.3.zip b/releases/plg_opentools_vm2_rules_shipping_advanced_v4.3.zip
index 7ad29490064980040f8f996953f9b7503b71ab62..ce2e025c9492e843d4eca0613c0071b5c2482e49 100644
Binary files a/releases/plg_opentools_vm2_rules_shipping_advanced_v4.3.zip and b/releases/plg_opentools_vm2_rules_shipping_advanced_v4.3.zip differ
diff --git a/releases/plg_opentools_vm2_rules_shipping_v4.3.zip b/releases/plg_opentools_vm2_rules_shipping_v4.3.zip
index e3f92a9ba2a27ba92f77c540b3009c0fb2a10dd8..88b16b599c6fd7f400de323224d95dada8399b7d 100644
Binary files a/releases/plg_opentools_vm2_rules_shipping_v4.3.zip and b/releases/plg_opentools_vm2_rules_shipping_v4.3.zip differ
diff --git a/rules_shipping.xml b/rules_shipping.xml
index 04a934246547a2a00ff928b9535541768794e2ce..8a3adeb3b0f81bf7f89e544b821388f59d3c9438 100644
--- a/rules_shipping.xml
+++ b/rules_shipping.xml
@@ -22,7 +22,7 @@
<scriptfile>rules_shipping.script.php</scriptfile>
<!-- VM 3.x support (fields rather than params): -->
- <config>
+ <vmconfig>
<fields name="params" addfieldpath="/plugins/vmshipment/rules_shipping/fields">
<fieldset name="shipment" label="VMSHIPMENT_RULES_PLUGIN" addfieldpath="/administrator/components/com_virtuemart/fields">
<field type="vmcurl"/>
@@ -86,7 +86,7 @@
</fieldset>
</fields>
- </config>
+ </vmconfig>
<!-- VM 2.0 support (params rather than fields): -->
diff --git a/rules_shipping_advanced.php b/rules_shipping_advanced.php
index f01285f11049cc938d2d68d79e6c7ff3f5e8ce77..246602d5d1265a1dc375263482ba6fece87e8cab 100644
--- a/rules_shipping_advanced.php
+++ b/rules_shipping_advanced.php
@@ -68,7 +68,7 @@ class plgVmShipmentRules_Shipping_Advanced extends plgVmShipmentRules_Shipping_B
// Postal code Check for UK postal codes: Use regexp to determine if ZIP structure matches and also to extract the parts.
// Also handle UK overseas areas/islands that use four-letter outward codes rather than "A{1,2}0{1,2}A{0,1} 0AA"
- if (isset($zip) and preg_match('/^\s*(([A-Za-z]{1,2})(\d{1,2})([A-Za-z]?)|[A-Za-z]{4})\s*(\d[A-Za-z]{2})\s*$/', $zip, $match)) {
+ if (isset($zip) and preg_match('/^\s*(([A-Z]{1,2})(\d{1,2})([A-Z]?)|[A-Z]{4}|GIR)\s*(\d[A-Z]{2})\s*$/', $zip, $match)) {
$values['uk_outward'] = $match[1];
$values['uk_area'] = $match[2];
$values['uk_district'] = $match[3];
diff --git a/rules_shipping_advanced.xml b/rules_shipping_advanced.xml
index 7f73cc78d06a406754be4a0194457d37e6c51c6b..79819107a4d4bda54ae98a015fb733dd17322d9a 100644
--- a/rules_shipping_advanced.xml
+++ b/rules_shipping_advanced.xml
@@ -22,7 +22,7 @@
<scriptfile>rules_shipping_advanced.script.php</scriptfile>
<!-- VM 3.0 support (fields rather than params): -->
- <config>
+ <vmconfig>
<fields name="params" addfieldpath="/plugins/vmshipment/rules_shipping/fields">
<fieldset name="shipment" label="VMSHIPMENT_RULES_PLUGIN_ADV" addfieldpath="/administrator/components/com_virtuemart/fields">
<field type="vmcurl"/>
@@ -86,7 +86,7 @@
</fieldset>
</fields>
- </config>
+ </vmconfig>
<!-- VM 2.0 support (params rather than fields): -->