commit-gnue
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

r6319 - trunk/gnue-packages/base/location


From: kilo
Subject: r6319 - trunk/gnue-packages/base/location
Date: Thu, 16 Sep 2004 18:04:29 -0500 (CDT)

Author: kilo
Date: 2004-09-16 18:04:27 -0500 (Thu, 16 Sep 2004)
New Revision: 6319

Added:
   trunk/gnue-packages/base/location/LOC_Address.gfd
   trunk/gnue-packages/base/location/LOC_Country.gfd
   trunk/gnue-packages/base/location/LOC_Region.gfd
   trunk/gnue-packages/base/location/LOC_Street.gfd
   trunk/gnue-packages/base/location/LOC_Zip.gfd
   trunk/gnue-packages/base/location/README
Removed:
   trunk/gnue-packages/base/location/address.gfd
   trunk/gnue-packages/base/location/country.gfd
   trunk/gnue-packages/base/location/loc.gpd
   trunk/gnue-packages/base/location/place.gfd
   trunk/gnue-packages/base/location/region.gfd
   trunk/gnue-packages/base/location/zip.gfd
Modified:
   trunk/gnue-packages/base/location/loc.dia
   trunk/gnue-packages/base/location/loc.gcd
   trunk/gnue-packages/base/location/loc.png
Log:
Basic LOCATION module

Added: trunk/gnue-packages/base/location/LOC_Address.gfd
===================================================================
--- trunk/gnue-packages/base/location/LOC_Address.gfd   2004-09-16 18:29:35 UTC 
(rev 6318)
+++ trunk/gnue-packages/base/location/LOC_Address.gfd   2004-09-16 23:04:27 UTC 
(rev 6319)
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="iso8859-1"?>
+
+<!-- LOC_Address Form
+
+     Copyright 2004 Free Software Foundation
+
+     This file is part of GNU Enterprise.
+
+     GNU Enterprise is free software; you can redistribute it and/or
+     modify it under the terms of the GNU General Public License as
+     published by the Free Software Foundation; either version 2 of
+     the License, or (at your option) any later version.
+
+     GNU Enterprise is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNU Enterprise; see the file COPYING.  If not, write to
+     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+
+     $Id$ -->
+
+<form title="Address">
+  <options/>
+  <datasource name="dtsLOC_Address" connection="appserver" 
table="LOC_Address"/>
+  <datasource name="dts_LOC_Zip" connection="appserver" prequery="Y"
+              table="LOC_Zip"/>
+  <datasource name="dts_LOC_Street" connection="appserver" prequery="Y"
+              table="LOC_Street"/>
+  <datasource name="dts_LOC_Country" connection="appserver" prequery="Y"
+              table="LOC_Country"/>
+  <logic>
+    <block name="blkLOC_Address" datasource="dtsloc_address">
+      <field name="fldLocBuilding" field="LOC_building" maxLength="4"/>
+      <field name="fldLocCountry" field="LOC_country" 
fk_description="LOC_formatted"
+             fk_key="gnue_id" fk_source="dts_LOC_Country" maxLength="32"/>
+      <field name="fldLocDoor" field="LOC_door" maxLength="4"/>
+      <field name="fldLocFloor" field="LOC_floor" maxLength="2"/>
+      <field name="fldLocNumber" field="LOC_number" maxLength="11"/>
+      <field name="fldLocStreet" field="LOC_street"
+             fk_description="LOC_formatted" fk_key="gnue_id" 
fk_source="dts_LOC_Street" maxLength="32"/>
+      <field name="fldLocStaircase" field="LOC_staircase" maxLength="4"/>
+      <field name="fldLocZip" field="LOC_zip" fk_description="LOC_formatted"
+             fk_key="gnue_id" fk_source="dts_LOC_Zip" maxLength="32"/>
+    </block>
+  </logic>
+  <layout xmlns:Char="GNUe:Layout:Char" Char:height="9" Char:width="43">
+    <page name="Page1">
+      <label name="lblLoc Country:" Char:height="1" Char:width="12" Char:x="1"
+             Char:y="1" text="Country:"/>
+      <entry name="entLocCountry" Char:height="1" Char:width="30" Char:x="12"
+             Char:y="1" block="blkLOC_Address" field="fldLocCountry" 
focusorder="1"
+             label="" style="dropdown"/>
+      <button name="btnEditCountry" Char:height="1" Char:width="6" Char:x="42"
+              Char:y="1" label="Edit...">
+        <trigger type="ON-ACTION" name="btnEditCountryTrigger"><![CDATA[##
+          location = "LOC_Country.gfd"
+          form.runForm(location)
+        ]]></trigger>
+      </button>
+      <button name="btnRefreshCountry" Char:height="1" Char:width="3"
+              Char:x="48" Char:y="1" label="@">
+        <trigger type="ON-ACTION" name="btnRefreshCountryTrigger"><![CDATA[##
+          blkLOC_Address.fldLocCountry.resetForeignKey()
+        ]]></trigger>
+      </button>
+      <label name="lblLoc Zip:" Char:height="1" Char:width="8" Char:x="1"
+             Char:y="2" text="Zip:"/>
+      <entry name="entLocZip" Char:height="1" Char:width="30" Char:x="12"
+             Char:y="2" block="blkLOC_Address" field="fldLocZip" 
focusorder="2" label=""
+             style="dropdown"/>
+      <button name="btnEditZip" Char:height="1" Char:width="6" Char:x="42"
+              Char:y="2" label="Edit...">
+        <trigger type="ON-ACTION" name="btnEditZipTrigger"><![CDATA[##
+          location = "LOC_Zip.gfd"
+          form.runForm(location)
+        ]]></trigger>
+      </button>
+      <button name="btnRefreshZip" Char:height="1" Char:width="3"
+              Char:x="48" Char:y="2" label="@">
+        <trigger type="ON-ACTION" name="btnRefreshZipTrigger"><![CDATA[##
+          blkLOC_Address.fldLocZip.resetForeignKey()
+        ]]></trigger>
+      </button>
+      <label name="lblLoc Street:" Char:height="1" Char:width="10" Char:x="1"
+             Char:y="3" text="Street:"/>
+      <entry name="entLocStreet" Char:height="1" Char:width="30" Char:x="12"
+             Char:y="3" block="blkLOC_Address" field="fldLocStreet" 
focusorder="3"
+             label="" style="dropdown"/>
+      <button name="btnEditStreet" Char:height="1" Char:width="6" Char:x="42"
+              Char:y="3" label="Edit...">
+        <trigger type="ON-ACTION" name="btnEditStreetTrigger"><![CDATA[##
+          location = "LOC_Street.gfd"
+          form.runForm(location)
+        ]]></trigger>
+      </button>
+      <button name="btnRefreshStreet" Char:height="1" Char:width="3"
+              Char:x="48" Char:y="3" label="@">
+        <trigger type="ON-ACTION" name="btnRefreshStreetTrigger"><![CDATA[##
+          blkLOC_Address.fldLocStreet.resetForeignKey()
+        ]]></trigger>
+      </button>
+      <label name="lblLoc Number:" Char:height="1" Char:width="11" Char:x="1"
+             Char:y="4" text="Number:"/>
+      <entry name="entLocNumber" Char:height="1" Char:width="11" Char:x="12"
+             Char:y="4" block="blkLOC_Address" field="fldLocNumber" 
focusorder="4"
+             label=""/>
+      <label name="lblLoc Building:" Char:height="1" Char:width="13"
+             Char:x="1" Char:y="5" text="Building:"/>
+      <entry name="entLocBuilding" Char:height="1" Char:width="4" Char:x="12"
+             Char:y="5" block="blkLOC_Address" field="fldLocBuilding" 
focusorder="5"
+             label=""/>
+      <label name="lblLoc Staircase:" Char:height="1" Char:width="14"
+             Char:x="1" Char:y="6" text="Staircase:"/>
+      <entry name="entLocStaircase" Char:height="1" Char:width="4" Char:x="12"
+             Char:y="6" block="blkLOC_Address" field="fldLocStaircase" 
focusorder="6"
+             label=""/>
+      <label name="lblLoc Floor:" Char:height="1" Char:width="10" Char:x="1"
+             Char:y="7" text="Floor:"/>
+      <entry name="entLocFloor" Char:height="1" Char:width="2" Char:x="12"
+             Char:y="7" block="blkLOC_Address" field="fldLocFloor" 
focusorder="7"
+             label=""/>
+      <label name="lblLoc Door:" Char:height="1" Char:width="9" Char:x="1"
+             Char:y="8" text="Door:"/>
+      <entry name="entLocDoor" Char:height="1" Char:width="4" Char:x="12"
+             Char:y="8" block="blkLOC_Address" field="fldLocDoor" 
focusorder="8" label=""/>
+    </page>
+  </layout>
+</form>

Added: trunk/gnue-packages/base/location/LOC_Country.gfd
===================================================================
--- trunk/gnue-packages/base/location/LOC_Country.gfd   2004-09-16 18:29:35 UTC 
(rev 6318)
+++ trunk/gnue-packages/base/location/LOC_Country.gfd   2004-09-16 23:04:27 UTC 
(rev 6319)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="iso8859-1"?>
+
+<!-- LOC_Country Form
+
+     Copyright 2004 Free Software Foundation
+
+     This file is part of GNU Enterprise.
+
+     GNU Enterprise is free software; you can redistribute it and/or
+     modify it under the terms of the GNU General Public License as
+     published by the Free Software Foundation; either version 2 of
+     the License, or (at your option) any later version.
+
+     GNU Enterprise is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNU Enterprise; see the file COPYING.  If not, write to
+     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+
+     $Id$ -->
+
+<form title="Country">
+  <options/>
+  <datasource name="dtsLOC_Country" connection="appserver" 
table="LOC_Country"/>
+  <logic>
+    <block name="blkLOC_Country" datasource="dtsloc_country">
+      <field name="fldLocCode" field="LOC_code" maxLength="3"/>
+      <field name="fldLocName" field="LOC_name" maxLength="70"/>
+    </block>
+  </logic>
+  <layout xmlns:Char="GNUe:Layout:Char" Char:height="3" Char:width="46">
+    <page name="Page1">
+      <label name="lblLoc Code:" Char:height="1" Char:width="4" Char:x="1"
+             Char:y="1" text="Code:"/>
+      <entry name="entLocCode" Char:height="1" Char:width="3" Char:x="9"
+             Char:y="1" block="blkLOC_Country" field="fldLocCode" 
focusorder="1" label=""/>
+      <label name="lblLoc Name:" Char:height="1" Char:width="4" Char:x="1"
+             Char:y="2" text="Name:"/>
+      <entry name="entLocName" Char:height="1" Char:width="30" Char:x="9"
+             Char:y="2" block="blkLOC_Country" field="fldLocName" 
focusorder="2" label=""/>
+    </page>
+  </layout>
+</form>

Added: trunk/gnue-packages/base/location/LOC_Region.gfd
===================================================================
--- trunk/gnue-packages/base/location/LOC_Region.gfd    2004-09-16 18:29:35 UTC 
(rev 6318)
+++ trunk/gnue-packages/base/location/LOC_Region.gfd    2004-09-16 23:04:27 UTC 
(rev 6319)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="iso8859-1"?>
+
+<!-- LOC_Region Form
+
+     Copyright 2004 Free Software Foundation
+
+     This file is part of GNU Enterprise.
+
+     GNU Enterprise is free software; you can redistribute it and/or
+     modify it under the terms of the GNU General Public License as
+     published by the Free Software Foundation; either version 2 of
+     the License, or (at your option) any later version.
+
+     GNU Enterprise is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNU Enterprise; see the file COPYING.  If not, write to
+     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+
+     $Id$ -->
+
+<form title="Region">
+  <options/>
+  <datasource name="dtsLOC_Region" connection="appserver" table="LOC_Region"/>
+  <datasource name="dts_LOC_Country" connection="appserver" prequery="Y"
+              table="LOC_Country"/>
+  <logic>
+    <block name="blkLOC_Region" datasource="dtsloc_region">
+      <field name="fldLocCode" field="LOC_code" maxLength="8"/>
+      <field name="fldLocCountry" field="LOC_country" fk_description="name"
+             fk_key="gnue_id" fk_source="dts_LOC_Country" maxLength="32"/>
+      <field name="fldLocName" field="LOC_name" maxLength="70"/>
+    </block>
+  </logic>
+  <layout xmlns:Char="GNUe:Layout:Char" Char:height="4" Char:width="42">
+    <page name="Page1">
+      <label name="lblLoc Code:" Char:height="1" Char:width="4" Char:x="1"
+             Char:y="1" text="Code:"/>
+      <entry name="entLocCode" Char:height="1" Char:width="8" Char:x="10"
+             Char:y="1" block="blkLOC_Region" field="fldLocCode" 
focusorder="1" label=""/>
+      <label name="lblLoc Name:" Char:height="1" Char:width="4" Char:x="1"
+             Char:y="2" text="Name:"/>
+      <entry name="entLocName" Char:height="1" Char:width="30" Char:x="10"
+             Char:y="2" block="blkLOC_Region" field="fldLocName" 
focusorder="2" label=""/>
+      <label name="lblLoc Country:" Char:height="1" Char:width="7" Char:x="1"
+             Char:y="3" text="Country:"/>
+      <entry name="entLocCountry" Char:height="1" Char:width="30" Char:x="10"
+             Char:y="3" block="blkLOC_Region" field="fldLocCountry" 
focusorder="3"
+             label="" style="dropdown"/>
+      <button name="btnEditCountry" Char:height="1" Char:width="6" Char:x="40"
+              Char:y="3" label="Edit...">
+        <trigger type="ON-ACTION" name="btnEditCountryTrigger"><![CDATA[##
+          location = "LOC_Country.gfd"
+          form.runForm(location)
+        ]]></trigger>
+      </button>
+      <button name="btnRefreshCountry" Char:height="1" Char:width="3"
+              Char:x="46" Char:y="3" label="@">
+        <trigger type="ON-ACTION" name="btnRefreshCountryTrigger"><![CDATA[##
+          blkLOC_Region.fldLocCountry.resetForeignKey()
+        ]]></trigger>
+      </button>
+    </page>
+  </layout>
+</form>

Added: trunk/gnue-packages/base/location/LOC_Street.gfd
===================================================================
--- trunk/gnue-packages/base/location/LOC_Street.gfd    2004-09-16 18:29:35 UTC 
(rev 6318)
+++ trunk/gnue-packages/base/location/LOC_Street.gfd    2004-09-16 23:04:27 UTC 
(rev 6319)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="iso8859-1"?>
+
+<!-- LOC_Street Form
+
+     Copyright 2004 Free Software Foundation
+
+     This file is part of GNU Enterprise.
+
+     GNU Enterprise is free software; you can redistribute it and/or
+     modify it under the terms of the GNU General Public License as
+     published by the Free Software Foundation; either version 2 of
+     the License, or (at your option) any later version.
+
+     GNU Enterprise is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNU Enterprise; see the file COPYING.  If not, write to
+     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+
+     $Id$ -->
+
+<form title="Street names">
+  <options/>
+  <datasource name="dtsLOC_Street" connection="appserver" table="LOC_Street"/>
+  <logic>
+    <block name="blkLOC_Street" datasource="dtsloc_street">
+      <field name="fldLocName" field="LOC_name" maxLength="35"/>
+      <field name="fldLocType" field="LOC_type" maxLength="35"/>
+    </block>
+  </logic>
+  <layout xmlns:Char="GNUe:Layout:Char" Char:height="3" Char:width="38">
+    <page name="Page1">
+      <label name="lblLoc Name:" Char:height="1" Char:width="4" Char:x="1"
+             Char:y="1" text="Name:"/>
+      <entry name="entLocName" Char:height="1" Char:width="30" Char:x="7"
+             Char:y="1" block="blkLOC_Street" field="fldLocName" 
focusorder="1" label=""/>
+      <label name="lblLoc Type:" Char:height="1" Char:width="6" Char:x="1"
+             Char:y="2" text="Type:"/>
+      <entry name="entLocType" Char:height="1" Char:width="30" Char:x="7"
+             Char:y="2" block="blkLOC_Street" field="fldLocType" 
focusorder="2" label=""/>
+    </page>
+  </layout>
+</form>

Added: trunk/gnue-packages/base/location/LOC_Zip.gfd
===================================================================
--- trunk/gnue-packages/base/location/LOC_Zip.gfd       2004-09-16 18:29:35 UTC 
(rev 6318)
+++ trunk/gnue-packages/base/location/LOC_Zip.gfd       2004-09-16 23:04:27 UTC 
(rev 6319)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="iso8859-1"?>
+
+<!-- LOC_ZIP Form
+
+     Copyright 2004 Free Software Foundation
+
+     This file is part of GNU Enterprise.
+
+     GNU Enterprise is free software; you can redistribute it and/or
+     modify it under the terms of the GNU General Public License as
+     published by the Free Software Foundation; either version 2 of
+     the License, or (at your option) any later version.
+
+     GNU Enterprise is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNU Enterprise; see the file COPYING.  If not, write to
+     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+
+     $Id$ -->
+
+<form title="Postal Code">
+  <options/>
+  <datasource name="dtsLOC_Zip" connection="appserver" table="LOC_Zip"/>
+  <datasource name="dts_LOC_Region" connection="appserver" prequery="Y"
+              table="LOC_Region"/>
+  <logic>
+    <block name="blkLOC_Zip" datasource="dtsloc_zip">
+      <field name="fldLocCode" field="LOC_code" maxLength="8"/>
+      <field name="fldLocCity" field="LOC_city" maxLength="60"/>
+      <field name="fldLocRegion" field="LOC_region" fk_description="name"
+             fk_key="gnue_id" fk_source="dts_LOC_Region" maxLength="32"/>
+    </block>
+  </logic>
+  <layout xmlns:Char="GNUe:Layout:Char" Char:height="4" Char:width="43">
+    <page name="Page1">
+      <label name="lblLoc Code:" Char:height="1" Char:width="4" Char:x="1"
+             Char:y="1" text="Code:"/>
+      <entry name="entLocCode" Char:height="1" Char:width="8" Char:x="12"
+             Char:y="1" block="blkLOC_Zip" field="fldLocCode" focusorder="1" 
label=""/>
+      <label name="lblLoc City:" Char:height="1" Char:width="8" Char:x="1"
+             Char:y="2" text="City:"/>
+      <entry name="entLocCity" Char:height="1" Char:width="30" Char:x="12"
+             Char:y="2" block="blkLOC_Zip" field="fldLocCity" focusorder="2" 
label=""/>
+      <label name="lblLoc Region:" Char:height="1" Char:width="6" Char:x="1"
+             Char:y="3" text="Region:"/>
+      <entry name="entLocRegion" Char:height="1" Char:width="30" Char:x="12"
+             Char:y="3" block="blkLOC_Zip" field="fldLocRegion" focusorder="3" 
label=""
+             style="dropdown"/>
+      <button name="btnEditRegion" Char:height="1" Char:width="6" Char:x="42"
+              Char:y="3" label="Edit...">
+        <trigger type="ON-ACTION" name="btnEditRegionTrigger"><![CDATA[##
+          location = "LOC_Region.gfd"
+          form.runForm(location)
+        ]]></trigger>
+      </button>
+      <button name="btnRefreshRegion" Char:height="1" Char:width="3"
+              Char:x="48" Char:y="3" label="@">
+        <trigger type="ON-ACTION" name="btnRefreshRegionTrigger"><![CDATA[##
+          blkLOC_Zip.fldLocRegion.resetForeignKey()
+        ]]></trigger>
+      </button>
+    </page>
+  </layout>
+</form>

Added: trunk/gnue-packages/base/location/README
===================================================================
--- trunk/gnue-packages/base/location/README    2004-09-16 18:29:35 UTC (rev 
6318)
+++ trunk/gnue-packages/base/location/README    2004-09-16 23:04:27 UTC (rev 
6319)
@@ -0,0 +1,14 @@
+LOC module
+
+Provides a basis for address/location management.
+
+Forms are provided to ease initial use.
+Central form is LOC_Address.gfd, however all other forms are useable
+on their own, too.
+On the forms next to dropdowns are 2 buttons: 'Edit...' and '@'.
+  'Edit...' opens up another form, allowing the editing of the values
+       that are used to fill the given dropdown.
+  '@' refreshes the contents of the given dropdown. (Note: you need to
+        click away and back into the dropdown to see the updated list.)
+
+Please sea loc.dia or loc.png for the UML representation of this module.

Deleted: trunk/gnue-packages/base/location/address.gfd
===================================================================
--- trunk/gnue-packages/base/location/address.gfd       2004-09-16 18:29:35 UTC 
(rev 6318)
+++ trunk/gnue-packages/base/location/address.gfd       2004-09-16 23:04:27 UTC 
(rev 6319)
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="iso8859-1"?>
-
-<!--  GNUe-Designer (0.5.4.99)
-      Saved on: 2004-06-17 14:02:36  -->
-
-<form title="Address">
-  <options/>
-  <datasource name="dtsLOC_Address" connection="appserver" 
table="LOC_Address"/>
-  <datasource name="dts_LOC_Zip" connection="appserver" prequery="Y"
-              table="LOC_Zip"/>
-  <datasource name="dts_LOC_Place" connection="appserver" prequery="Y"
-              table="LOC_Place"/>
-  <datasource name="dts_LOC_Country" connection="appserver" prequery="Y"
-              table="LOC_Country"/>
-  <logic>
-    <block name="blkLOC_Address" datasource="dtsloc_address">
-      <field name="fldGnueId" field="gnue_id" maxLength="32"/>
-      <field name="fldLocBuilding" field="LOC_building" maxLength="4"/>
-      <field name="fldLocCountry" field="LOC_country" fk_description="name"
-             fk_key="gnue_id" fk_source="dts_LOC_Country" maxLength="32"/>
-      <field name="fldLocDescr" field="LOC_descr" maxLength="2"/>
-      <field name="fldLocDoor" field="LOC_door" maxLength="4"/>
-      <field name="fldLocFloor" field="LOC_floor" maxLength="2"/>
-      <field name="fldLocLatitude" field="LOC_latitude" maxLength="12"
-             typecast="number"/>
-      <field name="fldLocLongitude" field="LOC_longitude" maxLength="12"
-             typecast="number"/>
-      <field name="fldLocLotnumber" field="LOC_lotNumber" maxLength="30"/>
-      <field name="fldLocNumber" field="LOC_number" maxLength="11"/>
-      <field name="fldLocPlace" field="LOC_place"
-             fk_description="LOC_formatted" fk_key="gnue_id" 
fk_source="dts_LOC_Place" maxLength="32"/>
-      <field name="fldLocPobox" field="LOC_pobox" maxLength="10"/>
-      <field name="fldLocStaircase" field="LOC_staircase" maxLength="4"/>
-      <field name="fldLocZip" field="LOC_zip" fk_description="code"
-             fk_key="gnue_id" fk_source="dts_LOC_Zip" maxLength="32"/>
-    </block>
-  </logic>
-  <layout xmlns:Char="GNUe:Layout:Char" Char:height="14" Char:width="43">
-    <page name="Page1">
-      <label name="lblLoc Descr:" Char:height="1" Char:width="10" Char:x="1"
-             Char:y="1" text="Descr:"/>
-      <entry name="entLocDescr" Char:height="1" Char:width="2" Char:x="12"
-             Char:y="1" block="blkLOC_Address" field="fldLocDescr" 
focusorder="1"
-             label=""/>
-      <label name="lblLoc Country:" Char:height="1" Char:width="12" Char:x="1"
-             Char:y="2" text="Country:"/>
-      <entry name="entLocCountry" Char:height="1" Char:width="30" Char:x="12"
-             Char:y="2" block="blkLOC_Address" field="fldLocCountry" 
focusorder="2"
-             label="" style="dropdown"/>
-      <label name="lblLoc Zip:" Char:height="1" Char:width="8" Char:x="1"
-             Char:y="3" text="Zip:"/>
-      <entry name="entLocZip" Char:height="1" Char:width="30" Char:x="12"
-             Char:y="3" block="blkLOC_Address" field="fldLocZip" 
focusorder="3" label=""
-             style="dropdown"/>
-      <label name="lblLoc Place:" Char:height="1" Char:width="10" Char:x="1"
-             Char:y="4" text="Place:"/>
-      <entry name="entLocPlace" Char:height="1" Char:width="30" Char:x="12"
-             Char:y="4" block="blkLOC_Address" field="fldLocPlace" 
focusorder="4"
-             label="" style="dropdown"/>
-      <label name="lblLoc Number:" Char:height="1" Char:width="11" Char:x="1"
-             Char:y="5" text="Number:"/>
-      <entry name="entLocNumber" Char:height="1" Char:width="11" Char:x="12"
-             Char:y="5" block="blkLOC_Address" field="fldLocNumber" 
focusorder="5"
-             label=""/>
-      <label name="lblLoc Building:" Char:height="1" Char:width="13"
-             Char:x="1" Char:y="6" text="Building:"/>
-      <entry name="entLocBuilding" Char:height="1" Char:width="4" Char:x="12"
-             Char:y="6" block="blkLOC_Address" field="fldLocBuilding" 
focusorder="6"
-             label=""/>
-      <label name="lblLoc Staircase:" Char:height="1" Char:width="14"
-             Char:x="1" Char:y="7" text="Staircase:"/>
-      <entry name="entLocStaircase" Char:height="1" Char:width="4" Char:x="12"
-             Char:y="7" block="blkLOC_Address" field="fldLocStaircase" 
focusorder="7"
-             label=""/>
-      <label name="lblLoc Floor:" Char:height="1" Char:width="10" Char:x="1"
-             Char:y="8" text="Floor:"/>
-      <entry name="entLocFloor" Char:height="1" Char:width="2" Char:x="12"
-             Char:y="8" block="blkLOC_Address" field="fldLocFloor" 
focusorder="8"
-             label=""/>
-      <label name="lblLoc Door:" Char:height="1" Char:width="9" Char:x="1"
-             Char:y="9" text="Door:"/>
-      <entry name="entLocDoor" Char:height="1" Char:width="4" Char:x="12"
-             Char:y="9" block="blkLOC_Address" field="fldLocDoor" 
focusorder="9" label=""/>
-      <label name="lblLoc Pobox:" Char:height="1" Char:width="10" Char:x="1"
-             Char:y="10" text="Pobox:"/>
-      <entry name="entLocPobox" Char:height="1" Char:width="10" Char:x="12"
-             Char:y="10" block="blkLOC_Address" field="fldLocPobox" 
focusorder="10"
-             label=""/>
-      <label name="lblLoc Lotnumber:" Char:height="1" Char:width="6"
-             Char:x="1" Char:y="11" text="Lot #:"/>
-      <entry name="entLocLotnumber" Char:height="1" Char:width="30"
-             Char:x="12" Char:y="11" block="blkLOC_Address" 
field="fldLocLotnumber"
-             focusorder="11" label=""/>
-      <label name="lblLoc Latitude:" Char:height="1" Char:width="13"
-             Char:x="1" Char:y="12" text="Latitude:"/>
-      <entry name="entLocLatitude" Char:height="1" Char:width="12" Char:x="12"
-             Char:y="12" block="blkLOC_Address" field="fldLocLatitude" 
focusorder="12"
-             label=""/>
-      <label name="lblLoc Longitude:" Char:height="1" Char:width="14"
-             Char:x="1" Char:y="13" text="Longitude:"/>
-      <entry name="entLocLongitude" Char:height="1" Char:width="12"
-             Char:x="12" Char:y="13" block="blkLOC_Address" 
field="fldLocLongitude"
-             focusorder="13" label=""/>
-      <entry name="entGnueId" Char:height="1" Char:width="12" Char:x="22"
-             Char:y="8" block="blkLOC_Address" field="fldGnueId" 
focusorder="14"
-             hidden="Y" label=""/>
-    </page>
-  </layout>
-</form>

Deleted: trunk/gnue-packages/base/location/country.gfd
===================================================================
--- trunk/gnue-packages/base/location/country.gfd       2004-09-16 18:29:35 UTC 
(rev 6318)
+++ trunk/gnue-packages/base/location/country.gfd       2004-09-16 23:04:27 UTC 
(rev 6319)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="iso8859-1"?>
-
-<!--  GNUe-Designer (0.5.4.99)
-      Saved on: 2004-06-11 11:13:49  -->
-
-<form title="Country">
-  <options/>
-  <datasource name="dtsLOC_Country" connection="appserver" 
table="LOC_Country"/>
-  <logic>
-    <block name="blkLOC_Country" datasource="dtsloc_country">
-      <field name="fldGnueId" field="gnue_id" maxLength="32"/>
-      <field name="fldLocCode" field="LOC_code" maxLength="3"/>
-      <field name="fldLocName" field="LOC_name" maxLength="60"/>
-      <field name="fldLocPhone" field="LOC_phone" maxLength="4"/>
-    </block>
-  </logic>
-  <layout xmlns:Char="GNUe:Layout:Char" Char:height="4" Char:width="46">
-    <page name="Page1">
-      <label name="lblLoc Code:" Char:height="1" Char:width="9" Char:x="1"
-             Char:y="1" text="Code:"/>
-      <entry name="entLocCode" Char:height="1" Char:width="3" Char:x="9"
-             Char:y="1" block="blkLOC_Country" field="fldLocCode" 
focusorder="1" label=""/>
-      <label name="lblLoc Name:" Char:height="1" Char:width="9" Char:x="1"
-             Char:y="2" text="Name:"/>
-      <entry name="entLocName" Char:height="1" Char:width="30" Char:x="9"
-             Char:y="2" block="blkLOC_Country" field="fldLocName" 
focusorder="2" label=""/>
-      <label name="lblLoc Phone:" Char:height="1" Char:width="10" Char:x="1"
-             Char:y="3" text="Phone:"/>
-      <entry name="entLocPhone" Char:height="1" Char:width="4" Char:x="9"
-             Char:y="3" block="blkLOC_Country" field="fldLocPhone" 
focusorder="3"
-             label=""/>
-      <entry name="entGnueId" Char:height="1" Char:width="32" Char:x="9"
-             Char:y="4" block="blkLOC_Country" field="fldGnueId"
-             hidden="Y" label=""/>
-    </page>
-  </layout>
-</form>

Modified: trunk/gnue-packages/base/location/loc.dia
===================================================================
--- trunk/gnue-packages/base/location/loc.dia   2004-09-16 18:29:35 UTC (rev 
6318)
+++ trunk/gnue-packages/base/location/loc.dia   2004-09-16 23:04:27 UTC (rev 
6319)
@@ -62,1524 +62,1425 @@
       </dia:composite>
     </dia:attribute>
   </dia:diagramdata>
-  <dia:layer name="Háttér" visible="true">
-    <dia:group>
-      <dia:object type="UML - LargePackage" version="0" id="O0">
-        <dia:attribute name="obj_pos">
-          <dia:point val="1,26"/>
-        </dia:attribute>
-        <dia:attribute name="obj_bb">
-          <dia:rectangle val="0.95,24.95;38.05,45.05"/>
-        </dia:attribute>
-        <dia:attribute name="elem_corner">
-          <dia:point val="1,26"/>
-        </dia:attribute>
-        <dia:attribute name="elem_width">
-          <dia:real val="37"/>
-        </dia:attribute>
-        <dia:attribute name="elem_height">
-          <dia:real val="19"/>
-        </dia:attribute>
-        <dia:attribute name="line_colour">
-          <dia:color val="#000000"/>
-        </dia:attribute>
-        <dia:attribute name="fill_colour">
-          <dia:color val="#ffffff"/>
-        </dia:attribute>
-        <dia:attribute name="stereotype">
-          <dia:string>##</dia:string>
-        </dia:attribute>
-        <dia:attribute name="name">
-          <dia:string>#LOC#</dia:string>
-        </dia:attribute>
-      </dia:object>
-      <dia:object type="UML - Class" version="0" id="O1">
-        <dia:attribute name="obj_pos">
-          <dia:point val="2,27"/>
-        </dia:attribute>
-        <dia:attribute name="obj_bb">
-          <dia:rectangle val="1.95,26.95;11.75,40.25"/>
-        </dia:attribute>
-        <dia:attribute name="elem_corner">
-          <dia:point val="2,27"/>
-        </dia:attribute>
-        <dia:attribute name="elem_width">
-          <dia:real val="9.7"/>
-        </dia:attribute>
-        <dia:attribute name="elem_height">
-          <dia:real val="13.2"/>
-        </dia:attribute>
-        <dia:attribute name="name">
-          <dia:string>#Address#</dia:string>
-        </dia:attribute>
-        <dia:attribute name="stereotype">
-          <dia:string>##</dia:string>
-        </dia:attribute>
-        <dia:attribute name="comment">
-          <dia:string>##</dia:string>
-        </dia:attribute>
-        <dia:attribute name="abstract">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="suppress_attributes">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="suppress_operations">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="visible_attributes">
-          <dia:boolean val="true"/>
-        </dia:attribute>
-        <dia:attribute name="visible_operations">
-          <dia:boolean val="true"/>
-        </dia:attribute>
-        <dia:attribute name="visible_comments">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="line_color">
-          <dia:color val="#000000"/>
-        </dia:attribute>
-        <dia:attribute name="fill_color">
-          <dia:color val="#ffffff"/>
-        </dia:attribute>
-        <dia:attribute name="text_color">
-          <dia:color val="#000000"/>
-        </dia:attribute>
-        <dia:attribute name="normal_font">
-          <dia:font family="monospace" style="0" name="Courier"/>
-        </dia:attribute>
-        <dia:attribute name="abstract_font">
-          <dia:font family="monospace" style="88" name="Courier"/>
-        </dia:attribute>
-        <dia:attribute name="polymorphic_font">
-          <dia:font family="monospace" style="8" name="Courier"/>
-        </dia:attribute>
-        <dia:attribute name="classname_font">
-          <dia:font family="sans" style="80" name="Helvetica"/>
-        </dia:attribute>
-        <dia:attribute name="abstract_classname_font">
-          <dia:font family="sans" style="88" name="Helvetica"/>
-        </dia:attribute>
-        <dia:attribute name="comment_font">
-          <dia:font family="sans" style="8" name="Helvetica"/>
-        </dia:attribute>
-        <dia:attribute name="font_height">
-          <dia:real val="0.8"/>
-        </dia:attribute>
-        <dia:attribute name="polymorphic_font_height">
-          <dia:real val="0.8"/>
-        </dia:attribute>
-        <dia:attribute name="abstract_font_height">
-          <dia:real val="0.8"/>
-        </dia:attribute>
-        <dia:attribute name="classname_font_height">
-          <dia:real val="1"/>
-        </dia:attribute>
-        <dia:attribute name="abstract_classname_font_height">
-          <dia:real val="1"/>
-        </dia:attribute>
-        <dia:attribute name="comment_font_height">
-          <dia:real val="1"/>
-        </dia:attribute>
-        <dia:attribute name="attributes">
-          <dia:composite type="umlattribute">
-            <dia:attribute name="name">
-              <dia:string>#descr#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="type">
-              <dia:string>#CDICT_Code#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="value">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="comment">
-              <dia:string>#Type of addess (home/work/business/etc) from 
CodeDict#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="visibility">
-              <dia:enum val="0"/>
-            </dia:attribute>
-            <dia:attribute name="abstract">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="class_scope">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-          </dia:composite>
-          <dia:composite type="umlattribute">
-            <dia:attribute name="name">
-              <dia:string>#country#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="type">
-              <dia:string>#LOC_Country#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="value">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="comment">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="visibility">
-              <dia:enum val="0"/>
-            </dia:attribute>
-            <dia:attribute name="abstract">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="class_scope">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-          </dia:composite>
-          <dia:composite type="umlattribute">
-            <dia:attribute name="name">
-              <dia:string>#zip#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="type">
-              <dia:string>#LOC_Zip#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="value">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="comment">
-              <dia:string>#Also designates city, region#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="visibility">
-              <dia:enum val="0"/>
-            </dia:attribute>
-            <dia:attribute name="abstract">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="class_scope">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-          </dia:composite>
-          <dia:composite type="umlattribute">
-            <dia:attribute name="name">
-              <dia:string>#place#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="type">
-              <dia:string>#LOC_Place#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="value">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="comment">
-              <dia:string>#Name and type of place#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="visibility">
-              <dia:enum val="0"/>
-            </dia:attribute>
-            <dia:attribute name="abstract">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="class_scope">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-          </dia:composite>
-          <dia:composite type="umlattribute">
-            <dia:attribute name="name">
-              <dia:string>#number#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="type">
-              <dia:string>#string(11)#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="value">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="comment">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="visibility">
-              <dia:enum val="0"/>
-            </dia:attribute>
-            <dia:attribute name="abstract">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="class_scope">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-          </dia:composite>
-          <dia:composite type="umlattribute">
-            <dia:attribute name="name">
-              <dia:string>#building#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="type">
-              <dia:string>#string(4)#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="value">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="comment">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="visibility">
-              <dia:enum val="0"/>
-            </dia:attribute>
-            <dia:attribute name="abstract">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="class_scope">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-          </dia:composite>
-          <dia:composite type="umlattribute">
-            <dia:attribute name="name">
-              <dia:string>#staircase#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="type">
-              <dia:string>#string(4)#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="value">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="comment">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="visibility">
-              <dia:enum val="0"/>
-            </dia:attribute>
-            <dia:attribute name="abstract">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="class_scope">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-          </dia:composite>
-          <dia:composite type="umlattribute">
-            <dia:attribute name="name">
-              <dia:string>#floor#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="type">
-              <dia:string>#string(2)#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="value">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="comment">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="visibility">
-              <dia:enum val="0"/>
-            </dia:attribute>
-            <dia:attribute name="abstract">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="class_scope">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-          </dia:composite>
-          <dia:composite type="umlattribute">
-            <dia:attribute name="name">
-              <dia:string>#door#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="type">
-              <dia:string>#string(4)#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="value">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="comment">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="visibility">
-              <dia:enum val="0"/>
-            </dia:attribute>
-            <dia:attribute name="abstract">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="class_scope">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-          </dia:composite>
-          <dia:composite type="umlattribute">
-            <dia:attribute name="name">
-              <dia:string>#pobox#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="type">
-              <dia:string>#string(10)#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="value">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="comment">
-              <dia:string>#PO Box#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="visibility">
-              <dia:enum val="0"/>
-            </dia:attribute>
-            <dia:attribute name="abstract">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="class_scope">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-          </dia:composite>
-          <dia:composite type="umlattribute">
-            <dia:attribute name="name">
-              <dia:string>#lotNumber#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="type">
-              <dia:string>#CORE_TextShort#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="value">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="comment">
-              <dia:string>#Topographical number if any#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="visibility">
-              <dia:enum val="0"/>
-            </dia:attribute>
-            <dia:attribute name="abstract">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="class_scope">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-          </dia:composite>
-          <dia:composite type="umlattribute">
-            <dia:attribute name="name">
-              <dia:string>#latitude#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="type">
-              <dia:string>#number(12,9)#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="value">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="comment">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="visibility">
-              <dia:enum val="0"/>
-            </dia:attribute>
-            <dia:attribute name="abstract">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="class_scope">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-          </dia:composite>
-          <dia:composite type="umlattribute">
-            <dia:attribute name="name">
-              <dia:string>#longitude#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="type">
-              <dia:string>#number(12,9)#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="value">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="comment">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="visibility">
-              <dia:enum val="0"/>
-            </dia:attribute>
-            <dia:attribute name="abstract">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="class_scope">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-          </dia:composite>
-          <dia:composite type="umlattribute">
-            <dia:attribute name="name">
-              <dia:string>#formatted#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="type">
-              <dia:string>#string#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="value">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="comment">
-              <dia:string>#Calculated: Returns the full address per local 
requirements#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="visibility">
-              <dia:enum val="0"/>
-            </dia:attribute>
-            <dia:attribute name="abstract">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="class_scope">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-          </dia:composite>
-        </dia:attribute>
-        <dia:attribute name="operations"/>
-        <dia:attribute name="template">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="templates"/>
-        <dia:childnode parent="O0"/>
-      </dia:object>
-      <dia:object type="UML - Class" version="0" id="O2">
-        <dia:attribute name="obj_pos">
-          <dia:point val="19,27"/>
-        </dia:attribute>
-        <dia:attribute name="obj_bb">
-          <dia:rectangle val="18.95,26.95;27.7,31.45"/>
-        </dia:attribute>
-        <dia:attribute name="elem_corner">
-          <dia:point val="19,27"/>
-        </dia:attribute>
-        <dia:attribute name="elem_width">
-          <dia:real val="8.65"/>
-        </dia:attribute>
-        <dia:attribute name="elem_height">
-          <dia:real val="4.4"/>
-        </dia:attribute>
-        <dia:attribute name="name">
-          <dia:string>#Country#</dia:string>
-        </dia:attribute>
-        <dia:attribute name="stereotype">
-          <dia:string>##</dia:string>
-        </dia:attribute>
-        <dia:attribute name="comment">
-          <dia:string>##</dia:string>
-        </dia:attribute>
-        <dia:attribute name="abstract">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="suppress_attributes">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="suppress_operations">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="visible_attributes">
-          <dia:boolean val="true"/>
-        </dia:attribute>
-        <dia:attribute name="visible_operations">
-          <dia:boolean val="true"/>
-        </dia:attribute>
-        <dia:attribute name="visible_comments">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="line_color">
-          <dia:color val="#000000"/>
-        </dia:attribute>
-        <dia:attribute name="fill_color">
-          <dia:color val="#ffffff"/>
-        </dia:attribute>
-        <dia:attribute name="text_color">
-          <dia:color val="#000000"/>
-        </dia:attribute>
-        <dia:attribute name="normal_font">
-          <dia:font family="monospace" style="0" name="Courier"/>
-        </dia:attribute>
-        <dia:attribute name="abstract_font">
-          <dia:font family="monospace" style="88" name="Courier"/>
-        </dia:attribute>
-        <dia:attribute name="polymorphic_font">
-          <dia:font family="monospace" style="8" name="Courier"/>
-        </dia:attribute>
-        <dia:attribute name="classname_font">
-          <dia:font family="sans" style="80" name="Helvetica"/>
-        </dia:attribute>
-        <dia:attribute name="abstract_classname_font">
-          <dia:font family="sans" style="88" name="Helvetica"/>
-        </dia:attribute>
-        <dia:attribute name="comment_font">
-          <dia:font family="sans" style="8" name="Helvetica"/>
-        </dia:attribute>
-        <dia:attribute name="font_height">
-          <dia:real val="0.8"/>
-        </dia:attribute>
-        <dia:attribute name="polymorphic_font_height">
-          <dia:real val="0.8"/>
-        </dia:attribute>
-        <dia:attribute name="abstract_font_height">
-          <dia:real val="0.8"/>
-        </dia:attribute>
-        <dia:attribute name="classname_font_height">
-          <dia:real val="1"/>
-        </dia:attribute>
-        <dia:attribute name="abstract_classname_font_height">
-          <dia:real val="1"/>
-        </dia:attribute>
-        <dia:attribute name="comment_font_height">
-          <dia:real val="1"/>
-        </dia:attribute>
-        <dia:attribute name="attributes">
-          <dia:composite type="umlattribute">
-            <dia:attribute name="name">
-              <dia:string>#code#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="type">
-              <dia:string>#CORE_CountryCode#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="value">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="comment">
-              <dia:string>#ISO 3166-1 country code/name#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="visibility">
-              <dia:enum val="0"/>
-            </dia:attribute>
-            <dia:attribute name="abstract">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="class_scope">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-          </dia:composite>
-          <dia:composite type="umlattribute">
-            <dia:attribute name="name">
-              <dia:string>#phone#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="type">
-              <dia:string>#string(4)#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="value">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="comment">
-              <dia:string>#Phone country prefix#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="visibility">
-              <dia:enum val="0"/>
-            </dia:attribute>
-            <dia:attribute name="abstract">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="class_scope">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-          </dia:composite>
-          <dia:composite type="umlattribute">
-            <dia:attribute name="name">
-              <dia:string>#formatted#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="type">
-              <dia:string>#string#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="value">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="comment">
-              <dia:string>#Calculated: Returns country formatted per local 
requirements#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="visibility">
-              <dia:enum val="0"/>
-            </dia:attribute>
-            <dia:attribute name="abstract">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="class_scope">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-          </dia:composite>
-        </dia:attribute>
-        <dia:attribute name="operations"/>
-        <dia:attribute name="template">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="templates"/>
-        <dia:childnode parent="O0"/>
-      </dia:object>
-      <dia:object type="UML - Association" version="0" id="O3">
-        <dia:attribute name="obj_pos">
-          <dia:point val="11.7,29.7"/>
-        </dia:attribute>
-        <dia:attribute name="obj_bb">
-          <dia:rectangle val="11.65,27.65;20.4,31.3"/>
-        </dia:attribute>
-        <dia:attribute name="orth_points">
-          <dia:point val="11.7,29.7"/>
-          <dia:point val="15,29.7"/>
-          <dia:point val="15,27.7"/>
-          <dia:point val="19,27.7"/>
-        </dia:attribute>
-        <dia:attribute name="orth_orient">
-          <dia:enum val="0"/>
-          <dia:enum val="1"/>
-          <dia:enum val="0"/>
-        </dia:attribute>
-        <dia:attribute name="autorouting">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="name">
-          <dia:string>#country#</dia:string>
-        </dia:attribute>
-        <dia:attribute name="direction">
-          <dia:enum val="0"/>
-        </dia:attribute>
-        <dia:attribute name="ends">
-          <dia:composite>
-            <dia:attribute name="role">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="multiplicity">
-              <dia:string>#0..*#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="arrow">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="aggregate">
-              <dia:enum val="0"/>
-            </dia:attribute>
-          </dia:composite>
-          <dia:composite>
-            <dia:attribute name="role">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="multiplicity">
-              <dia:string>#0..*#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="arrow">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="aggregate">
-              <dia:enum val="0"/>
-            </dia:attribute>
-          </dia:composite>
-        </dia:attribute>
-        <dia:connections>
-          <dia:connection handle="0" to="O1" connection="11"/>
-          <dia:connection handle="1" to="O2" connection="3"/>
-        </dia:connections>
-        <dia:childnode parent="O0"/>
-      </dia:object>
-      <dia:object type="UML - Class" version="0" id="O4">
-        <dia:attribute name="obj_pos">
-          <dia:point val="14,40"/>
-        </dia:attribute>
-        <dia:attribute name="obj_bb">
-          <dia:rectangle val="13.95,39.95;22,44.45"/>
-        </dia:attribute>
-        <dia:attribute name="elem_corner">
-          <dia:point val="14,40"/>
-        </dia:attribute>
-        <dia:attribute name="elem_width">
-          <dia:real val="7.95"/>
-        </dia:attribute>
-        <dia:attribute name="elem_height">
-          <dia:real val="4.4"/>
-        </dia:attribute>
-        <dia:attribute name="name">
-          <dia:string>#Place#</dia:string>
-        </dia:attribute>
-        <dia:attribute name="stereotype">
-          <dia:string>##</dia:string>
-        </dia:attribute>
-        <dia:attribute name="comment">
-          <dia:string>##</dia:string>
-        </dia:attribute>
-        <dia:attribute name="abstract">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="suppress_attributes">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="suppress_operations">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="visible_attributes">
-          <dia:boolean val="true"/>
-        </dia:attribute>
-        <dia:attribute name="visible_operations">
-          <dia:boolean val="true"/>
-        </dia:attribute>
-        <dia:attribute name="visible_comments">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="line_color">
-          <dia:color val="#000000"/>
-        </dia:attribute>
-        <dia:attribute name="fill_color">
-          <dia:color val="#ffffff"/>
-        </dia:attribute>
-        <dia:attribute name="text_color">
-          <dia:color val="#000000"/>
-        </dia:attribute>
-        <dia:attribute name="normal_font">
-          <dia:font family="monospace" style="0" name="Courier"/>
-        </dia:attribute>
-        <dia:attribute name="abstract_font">
-          <dia:font family="monospace" style="88" name="Courier"/>
-        </dia:attribute>
-        <dia:attribute name="polymorphic_font">
-          <dia:font family="monospace" style="8" name="Courier"/>
-        </dia:attribute>
-        <dia:attribute name="classname_font">
-          <dia:font family="sans" style="80" name="Helvetica"/>
-        </dia:attribute>
-        <dia:attribute name="abstract_classname_font">
-          <dia:font family="sans" style="88" name="Helvetica"/>
-        </dia:attribute>
-        <dia:attribute name="comment_font">
-          <dia:font family="sans" style="8" name="Helvetica"/>
-        </dia:attribute>
-        <dia:attribute name="font_height">
-          <dia:real val="0.8"/>
-        </dia:attribute>
-        <dia:attribute name="polymorphic_font_height">
-          <dia:real val="0.8"/>
-        </dia:attribute>
-        <dia:attribute name="abstract_font_height">
-          <dia:real val="0.8"/>
-        </dia:attribute>
-        <dia:attribute name="classname_font_height">
-          <dia:real val="1"/>
-        </dia:attribute>
-        <dia:attribute name="abstract_classname_font_height">
-          <dia:real val="1"/>
-        </dia:attribute>
-        <dia:attribute name="comment_font_height">
-          <dia:real val="1"/>
-        </dia:attribute>
-        <dia:attribute name="attributes">
-          <dia:composite type="umlattribute">
-            <dia:attribute name="name">
-              <dia:string>#name#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="type">
-              <dia:string>#CORE_TextShort#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="value">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="comment">
-              <dia:string>#Name of street/ave/etc#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="visibility">
-              <dia:enum val="0"/>
-            </dia:attribute>
-            <dia:attribute name="abstract">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="class_scope">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-          </dia:composite>
-          <dia:composite type="umlattribute">
-            <dia:attribute name="name">
-              <dia:string>#type#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="type">
-              <dia:string>#CDICT_Code#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="value">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="comment">
-              <dia:string>#Street/Ave/Blvd/etc, from 
CodeDictionary#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="visibility">
-              <dia:enum val="0"/>
-            </dia:attribute>
-            <dia:attribute name="abstract">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="class_scope">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-          </dia:composite>
-          <dia:composite type="umlattribute">
-            <dia:attribute name="name">
-              <dia:string>#formatted#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="type">
-              <dia:string>#string#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="value">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="comment">
-              <dia:string>#Returns place formatted per local 
requirements#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="visibility">
-              <dia:enum val="0"/>
-            </dia:attribute>
-            <dia:attribute name="abstract">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="class_scope">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-          </dia:composite>
-        </dia:attribute>
-        <dia:attribute name="operations"/>
-        <dia:attribute name="template">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="templates"/>
-        <dia:childnode parent="O0"/>
-      </dia:object>
-      <dia:object type="UML - Association" version="0" id="O5">
-        <dia:attribute name="obj_pos">
-          <dia:point val="11.7,31.3"/>
-        </dia:attribute>
-        <dia:attribute name="obj_bb">
-          <dia:rectangle val="11.65,31.25;15.4,42.3"/>
-        </dia:attribute>
-        <dia:attribute name="orth_points">
-          <dia:point val="11.7,31.3"/>
-          <dia:point val="12,31.3"/>
-          <dia:point val="12,40.7"/>
-          <dia:point val="14,40.7"/>
-        </dia:attribute>
-        <dia:attribute name="orth_orient">
-          <dia:enum val="0"/>
-          <dia:enum val="1"/>
-          <dia:enum val="0"/>
-        </dia:attribute>
-        <dia:attribute name="autorouting">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="name">
-          <dia:string>#street#</dia:string>
-        </dia:attribute>
-        <dia:attribute name="direction">
-          <dia:enum val="0"/>
-        </dia:attribute>
-        <dia:attribute name="ends">
-          <dia:composite>
-            <dia:attribute name="role">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="multiplicity">
-              <dia:string>#0..*#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="arrow">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="aggregate">
-              <dia:enum val="0"/>
-            </dia:attribute>
-          </dia:composite>
-          <dia:composite>
-            <dia:attribute name="role">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="multiplicity">
-              <dia:string>#0..*#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="arrow">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="aggregate">
-              <dia:enum val="0"/>
-            </dia:attribute>
-          </dia:composite>
-        </dia:attribute>
-        <dia:connections>
-          <dia:connection handle="0" to="O1" connection="15"/>
-          <dia:connection handle="1" to="O4" connection="3"/>
-        </dia:connections>
-        <dia:childnode parent="O0"/>
-      </dia:object>
-      <dia:object type="UML - Class" version="0" id="O6">
-        <dia:attribute name="obj_pos">
-          <dia:point val="29,33"/>
-        </dia:attribute>
-        <dia:attribute name="obj_bb">
-          <dia:rectangle val="28.95,32.95;37,38.25"/>
-        </dia:attribute>
-        <dia:attribute name="elem_corner">
-          <dia:point val="29,33"/>
-        </dia:attribute>
-        <dia:attribute name="elem_width">
-          <dia:real val="7.95"/>
-        </dia:attribute>
-        <dia:attribute name="elem_height">
-          <dia:real val="5.2"/>
-        </dia:attribute>
-        <dia:attribute name="name">
-          <dia:string>#Region#</dia:string>
-        </dia:attribute>
-        <dia:attribute name="stereotype">
-          <dia:string>##</dia:string>
-        </dia:attribute>
-        <dia:attribute name="comment">
-          <dia:string>##</dia:string>
-        </dia:attribute>
-        <dia:attribute name="abstract">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="suppress_attributes">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="suppress_operations">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="visible_attributes">
-          <dia:boolean val="true"/>
-        </dia:attribute>
-        <dia:attribute name="visible_operations">
-          <dia:boolean val="true"/>
-        </dia:attribute>
-        <dia:attribute name="visible_comments">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="line_color">
-          <dia:color val="#000000"/>
-        </dia:attribute>
-        <dia:attribute name="fill_color">
-          <dia:color val="#ffffff"/>
-        </dia:attribute>
-        <dia:attribute name="text_color">
-          <dia:color val="#000000"/>
-        </dia:attribute>
-        <dia:attribute name="normal_font">
-          <dia:font family="monospace" style="0" name="Courier"/>
-        </dia:attribute>
-        <dia:attribute name="abstract_font">
-          <dia:font family="monospace" style="88" name="Courier"/>
-        </dia:attribute>
-        <dia:attribute name="polymorphic_font">
-          <dia:font family="monospace" style="8" name="Courier"/>
-        </dia:attribute>
-        <dia:attribute name="classname_font">
-          <dia:font family="sans" style="80" name="Helvetica"/>
-        </dia:attribute>
-        <dia:attribute name="abstract_classname_font">
-          <dia:font family="sans" style="88" name="Helvetica"/>
-        </dia:attribute>
-        <dia:attribute name="comment_font">
-          <dia:font family="sans" style="8" name="Helvetica"/>
-        </dia:attribute>
-        <dia:attribute name="font_height">
-          <dia:real val="0.8"/>
-        </dia:attribute>
-        <dia:attribute name="polymorphic_font_height">
-          <dia:real val="0.8"/>
-        </dia:attribute>
-        <dia:attribute name="abstract_font_height">
-          <dia:real val="0.8"/>
-        </dia:attribute>
-        <dia:attribute name="classname_font_height">
-          <dia:real val="1"/>
-        </dia:attribute>
-        <dia:attribute name="abstract_classname_font_height">
-          <dia:real val="1"/>
-        </dia:attribute>
-        <dia:attribute name="comment_font_height">
-          <dia:real val="1"/>
-        </dia:attribute>
-        <dia:attribute name="attributes">
-          <dia:composite type="umlattribute">
-            <dia:attribute name="name">
-              <dia:string>#code#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="type">
-              <dia:string>#string(8)#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="value">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="comment">
-              <dia:string>#Region/state abbreviation#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="visibility">
-              <dia:enum val="0"/>
-            </dia:attribute>
-            <dia:attribute name="abstract">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="class_scope">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-          </dia:composite>
-          <dia:composite type="umlattribute">
-            <dia:attribute name="name">
-              <dia:string>#name#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="type">
-              <dia:string>#CORE_TextLong#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="value">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="comment">
-              <dia:string>#Full name of region/state#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="visibility">
-              <dia:enum val="0"/>
-            </dia:attribute>
-            <dia:attribute name="abstract">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="class_scope">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-          </dia:composite>
-          <dia:composite type="umlattribute">
-            <dia:attribute name="name">
-              <dia:string>#country#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="type">
-              <dia:string>#LOC_Country#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="value">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="comment">
-              <dia:string>#Country the region resides in#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="visibility">
-              <dia:enum val="0"/>
-            </dia:attribute>
-            <dia:attribute name="abstract">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="class_scope">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-          </dia:composite>
-          <dia:composite type="umlattribute">
-            <dia:attribute name="name">
-              <dia:string>#formatted#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="type">
-              <dia:string>#string#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="value">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="comment">
-              <dia:string>#Calculated: Returns region formatted per local 
requirements#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="visibility">
-              <dia:enum val="0"/>
-            </dia:attribute>
-            <dia:attribute name="abstract">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="class_scope">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-          </dia:composite>
-        </dia:attribute>
-        <dia:attribute name="operations"/>
-        <dia:attribute name="template">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="templates"/>
-        <dia:childnode parent="O0"/>
-      </dia:object>
-      <dia:object type="UML - Class" version="0" id="O7">
-        <dia:attribute name="obj_pos">
-          <dia:point val="15,32"/>
-        </dia:attribute>
-        <dia:attribute name="obj_bb">
-          <dia:rectangle val="14.95,31.95;24.05,38.85"/>
-        </dia:attribute>
-        <dia:attribute name="elem_corner">
-          <dia:point val="15,32"/>
-        </dia:attribute>
-        <dia:attribute name="elem_width">
-          <dia:real val="9"/>
-        </dia:attribute>
-        <dia:attribute name="elem_height">
-          <dia:real val="6.8"/>
-        </dia:attribute>
-        <dia:attribute name="name">
-          <dia:string>#Zip#</dia:string>
-        </dia:attribute>
-        <dia:attribute name="stereotype">
-          <dia:string>##</dia:string>
-        </dia:attribute>
-        <dia:attribute name="comment">
-          <dia:string>##</dia:string>
-        </dia:attribute>
-        <dia:attribute name="abstract">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="suppress_attributes">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="suppress_operations">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="visible_attributes">
-          <dia:boolean val="true"/>
-        </dia:attribute>
-        <dia:attribute name="visible_operations">
-          <dia:boolean val="true"/>
-        </dia:attribute>
-        <dia:attribute name="visible_comments">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="line_color">
-          <dia:color val="#000000"/>
-        </dia:attribute>
-        <dia:attribute name="fill_color">
-          <dia:color val="#ffffff"/>
-        </dia:attribute>
-        <dia:attribute name="text_color">
-          <dia:color val="#000000"/>
-        </dia:attribute>
-        <dia:attribute name="normal_font">
-          <dia:font family="monospace" style="0" name="Courier"/>
-        </dia:attribute>
-        <dia:attribute name="abstract_font">
-          <dia:font family="monospace" style="88" name="Courier"/>
-        </dia:attribute>
-        <dia:attribute name="polymorphic_font">
-          <dia:font family="monospace" style="8" name="Courier"/>
-        </dia:attribute>
-        <dia:attribute name="classname_font">
-          <dia:font family="sans" style="80" name="Helvetica"/>
-        </dia:attribute>
-        <dia:attribute name="abstract_classname_font">
-          <dia:font family="sans" style="88" name="Helvetica"/>
-        </dia:attribute>
-        <dia:attribute name="comment_font">
-          <dia:font family="sans" style="8" name="Helvetica"/>
-        </dia:attribute>
-        <dia:attribute name="font_height">
-          <dia:real val="0.8"/>
-        </dia:attribute>
-        <dia:attribute name="polymorphic_font_height">
-          <dia:real val="0.8"/>
-        </dia:attribute>
-        <dia:attribute name="abstract_font_height">
-          <dia:real val="0.8"/>
-        </dia:attribute>
-        <dia:attribute name="classname_font_height">
-          <dia:real val="1"/>
-        </dia:attribute>
-        <dia:attribute name="abstract_classname_font_height">
-          <dia:real val="1"/>
-        </dia:attribute>
-        <dia:attribute name="comment_font_height">
-          <dia:real val="1"/>
-        </dia:attribute>
-        <dia:attribute name="attributes">
-          <dia:composite type="umlattribute">
-            <dia:attribute name="name">
-              <dia:string>#code#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="type">
-              <dia:string>#string(8)#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="value">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="comment">
-              <dia:string>#ZIP code#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="visibility">
-              <dia:enum val="0"/>
-            </dia:attribute>
-            <dia:attribute name="abstract">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="class_scope">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-          </dia:composite>
-          <dia:composite type="umlattribute">
-            <dia:attribute name="name">
-              <dia:string>#city#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="type">
-              <dia:string>#CORE_TextLong#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="value">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="comment">
-              <dia:string>#Full name of city#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="visibility">
-              <dia:enum val="0"/>
-            </dia:attribute>
-            <dia:attribute name="abstract">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="class_scope">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-          </dia:composite>
-          <dia:composite type="umlattribute">
-            <dia:attribute name="name">
-              <dia:string>#region#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="type">
-              <dia:string>#LOC_REGION#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="value">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="comment">
-              <dia:string>#The region the zi code is in#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="visibility">
-              <dia:enum val="0"/>
-            </dia:attribute>
-            <dia:attribute name="abstract">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="class_scope">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-          </dia:composite>
-          <dia:composite type="umlattribute">
-            <dia:attribute name="name">
-              <dia:string>#latitude#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="type">
-              <dia:string>#number(12,9)#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="value">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="comment">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="visibility">
-              <dia:enum val="0"/>
-            </dia:attribute>
-            <dia:attribute name="abstract">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="class_scope">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-          </dia:composite>
-          <dia:composite type="umlattribute">
-            <dia:attribute name="name">
-              <dia:string>#longitude#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="type">
-              <dia:string>#number(12,9)#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="value">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="comment">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="visibility">
-              <dia:enum val="0"/>
-            </dia:attribute>
-            <dia:attribute name="abstract">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="class_scope">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-          </dia:composite>
-          <dia:composite type="umlattribute">
-            <dia:attribute name="name">
-              <dia:string>#formatted#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="type">
-              <dia:string>#string#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="value">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="comment">
-              <dia:string>#Calculated: Returns city/zip formatted per local 
requirements#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="visibility">
-              <dia:enum val="0"/>
-            </dia:attribute>
-            <dia:attribute name="abstract">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="class_scope">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-          </dia:composite>
-        </dia:attribute>
-        <dia:attribute name="operations"/>
-        <dia:attribute name="template">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="templates"/>
-        <dia:childnode parent="O0"/>
-      </dia:object>
-      <dia:object type="UML - Association" version="0" id="O8">
-        <dia:attribute name="obj_pos">
-          <dia:point val="11.7,30.5"/>
-        </dia:attribute>
-        <dia:attribute name="obj_bb">
-          <dia:rectangle val="11.65,30.45;16.4,34.3"/>
-        </dia:attribute>
-        <dia:attribute name="orth_points">
-          <dia:point val="11.7,30.5"/>
-          <dia:point val="13,30.5"/>
-          <dia:point val="13,32.7"/>
-          <dia:point val="15,32.7"/>
-        </dia:attribute>
-        <dia:attribute name="orth_orient">
-          <dia:enum val="0"/>
-          <dia:enum val="1"/>
-          <dia:enum val="0"/>
-        </dia:attribute>
-        <dia:attribute name="autorouting">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="name">
-          <dia:string>#zip#</dia:string>
-        </dia:attribute>
-        <dia:attribute name="direction">
-          <dia:enum val="0"/>
-        </dia:attribute>
-        <dia:attribute name="ends">
-          <dia:composite>
-            <dia:attribute name="role">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="multiplicity">
-              <dia:string>#0..*#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="arrow">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="aggregate">
-              <dia:enum val="0"/>
-            </dia:attribute>
-          </dia:composite>
-          <dia:composite>
-            <dia:attribute name="role">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="multiplicity">
-              <dia:string>#0..*#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="arrow">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="aggregate">
-              <dia:enum val="0"/>
-            </dia:attribute>
-          </dia:composite>
-        </dia:attribute>
-        <dia:connections>
-          <dia:connection handle="0" to="O1" connection="13"/>
-          <dia:connection handle="1" to="O7" connection="3"/>
-        </dia:connections>
-        <dia:childnode parent="O0"/>
-      </dia:object>
-      <dia:object type="UML - Association" version="0" id="O9">
-        <dia:attribute name="obj_pos">
-          <dia:point val="24,35.5"/>
-        </dia:attribute>
-        <dia:attribute name="obj_bb">
-          <dia:rectangle val="23.95,33.65;30.4,37.1"/>
-        </dia:attribute>
-        <dia:attribute name="orth_points">
-          <dia:point val="24,35.5"/>
-          <dia:point val="26.5,35.5"/>
-          <dia:point val="26.5,33.7"/>
-          <dia:point val="29,33.7"/>
-        </dia:attribute>
-        <dia:attribute name="orth_orient">
-          <dia:enum val="0"/>
-          <dia:enum val="1"/>
-          <dia:enum val="0"/>
-        </dia:attribute>
-        <dia:attribute name="name">
-          <dia:string>#region#</dia:string>
-        </dia:attribute>
-        <dia:attribute name="direction">
-          <dia:enum val="0"/>
-        </dia:attribute>
-        <dia:attribute name="ends">
-          <dia:composite>
-            <dia:attribute name="role">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="multiplicity">
-              <dia:string>#0..*#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="arrow">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="aggregate">
-              <dia:enum val="0"/>
-            </dia:attribute>
-          </dia:composite>
-          <dia:composite>
-            <dia:attribute name="role">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="multiplicity">
-              <dia:string>#0..1#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="arrow">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="aggregate">
-              <dia:enum val="0"/>
-            </dia:attribute>
-          </dia:composite>
-        </dia:attribute>
-        <dia:connections>
-          <dia:connection handle="0" to="O7" connection="13"/>
-          <dia:connection handle="1" to="O6" connection="3"/>
-        </dia:connections>
-        <dia:childnode parent="O0"/>
-      </dia:object>
-      <dia:object type="UML - Association" version="0" id="O10">
-        <dia:attribute name="obj_pos">
-          <dia:point val="32.975,33"/>
-        </dia:attribute>
-        <dia:attribute name="obj_bb">
-          <dia:rectangle val="27.6,27.65;35.55,34.6"/>
-        </dia:attribute>
-        <dia:attribute name="orth_points">
-          <dia:point val="32.975,33"/>
-          <dia:point val="33,33"/>
-          <dia:point val="33,27.7"/>
-          <dia:point val="27.65,27.7"/>
-        </dia:attribute>
-        <dia:attribute name="orth_orient">
-          <dia:enum val="0"/>
-          <dia:enum val="1"/>
-          <dia:enum val="0"/>
-        </dia:attribute>
-        <dia:attribute name="autorouting">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="name">
-          <dia:string>#country#</dia:string>
-        </dia:attribute>
-        <dia:attribute name="direction">
-          <dia:enum val="0"/>
-        </dia:attribute>
-        <dia:attribute name="ends">
-          <dia:composite>
-            <dia:attribute name="role">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="multiplicity">
-              <dia:string>#0..*#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="arrow">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="aggregate">
-              <dia:enum val="0"/>
-            </dia:attribute>
-          </dia:composite>
-          <dia:composite>
-            <dia:attribute name="role">
-              <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="multiplicity">
-              <dia:string>#0..1#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="arrow">
-              <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="aggregate">
-              <dia:enum val="0"/>
-            </dia:attribute>
-          </dia:composite>
-        </dia:attribute>
-        <dia:connections>
-          <dia:connection handle="0" to="O6" connection="1"/>
-          <dia:connection handle="1" to="O2" connection="4"/>
-        </dia:connections>
-        <dia:childnode parent="O0"/>
-      </dia:object>
-    </dia:group>
+  <dia:layer name="Cúlra" visible="true">
+    <dia:object type="UML - LargePackage" version="0" id="O0">
+      <dia:attribute name="obj_pos">
+        <dia:point val="0,1"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="-0.05,-0.05;32.05,16.05"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="0,1"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="32"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="15"/>
+      </dia:attribute>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="fill_colour">
+        <dia:color val="#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>#LOC#</dia:string>
+      </dia:attribute>
+    </dia:object>
+    <dia:object type="UML - Class" version="0" id="O1">
+      <dia:attribute name="obj_pos">
+        <dia:point val="1,2"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="0.95,1.95;7.95,11.25"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="1,2"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="6.9"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="9.2"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>#Address#</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="comment">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="abstract">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="suppress_attributes">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="suppress_operations">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="visible_attributes">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="visible_operations">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="visible_comments">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="line_color">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="fill_color">
+        <dia:color val="#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name="text_color">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="normal_font">
+        <dia:font family="monospace" style="0" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_font">
+        <dia:font family="monospace" style="88" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="polymorphic_font">
+        <dia:font family="monospace" style="8" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="classname_font">
+        <dia:font family="sans" style="80" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_classname_font">
+        <dia:font family="sans" style="88" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="comment_font">
+        <dia:font family="sans" style="8" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="font_height">
+        <dia:real val="0.8"/>
+      </dia:attribute>
+      <dia:attribute name="polymorphic_font_height">
+        <dia:real val="0.8"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_font_height">
+        <dia:real val="0.8"/>
+      </dia:attribute>
+      <dia:attribute name="classname_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_classname_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="comment_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="attributes">
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#country#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#LOC_Country#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#zip#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#LOC_Zip#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Also designates city, region#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#street#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#LOC_Street#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Name and type of place#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#number#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string(11)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#building#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string(4)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#staircase#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string(4)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#floor#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string(2)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#door#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string(4)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#formatted#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Calculated: Returns the full address per local 
requirements#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="3"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="operations"/>
+      <dia:attribute name="template">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="templates"/>
+      <dia:childnode parent="O0"/>
+    </dia:object>
+    <dia:object type="UML - Class" version="0" id="O2">
+      <dia:attribute name="obj_pos">
+        <dia:point val="22,2"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="21.95,1.95;28.05,6.45"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="22,2"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="6"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="4.4"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>#Country#</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="comment">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="abstract">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="suppress_attributes">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="suppress_operations">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="visible_attributes">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="visible_operations">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="visible_comments">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="line_color">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="fill_color">
+        <dia:color val="#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name="text_color">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="normal_font">
+        <dia:font family="monospace" style="0" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_font">
+        <dia:font family="monospace" style="88" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="polymorphic_font">
+        <dia:font family="monospace" style="8" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="classname_font">
+        <dia:font family="sans" style="80" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_classname_font">
+        <dia:font family="sans" style="88" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="comment_font">
+        <dia:font family="sans" style="8" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="font_height">
+        <dia:real val="0.8"/>
+      </dia:attribute>
+      <dia:attribute name="polymorphic_font_height">
+        <dia:real val="0.8"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_font_height">
+        <dia:real val="0.8"/>
+      </dia:attribute>
+      <dia:attribute name="classname_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_classname_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="comment_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="attributes">
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#code#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string(3)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#ISO 639-1 or 639-2 country code#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#name#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string(70)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Full name of country#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#formatted#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Returns country formatted per local 
requirements#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="3"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="operations"/>
+      <dia:attribute name="template">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="templates"/>
+      <dia:childnode parent="O0"/>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O3">
+      <dia:attribute name="obj_pos">
+        <dia:point val="7.9,3.9"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="7.85,2.65;22.05,5.5"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="7.9,3.9"/>
+        <dia:point val="14,3.9"/>
+        <dia:point val="14,2.7"/>
+        <dia:point val="22,2.7"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="autorouting">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O1" connection="9"/>
+        <dia:connection handle="1" to="O2" connection="3"/>
+      </dia:connections>
+      <dia:childnode parent="O0"/>
+    </dia:object>
+    <dia:object type="UML - Class" version="0" id="O4">
+      <dia:attribute name="obj_pos">
+        <dia:point val="12,11"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="11.95,10.95;18.05,15.45"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="12,11"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="6"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="4.4"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>#Street#</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="comment">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="abstract">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="suppress_attributes">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="suppress_operations">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="visible_attributes">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="visible_operations">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="visible_comments">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="line_color">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="fill_color">
+        <dia:color val="#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name="text_color">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="normal_font">
+        <dia:font family="monospace" style="0" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_font">
+        <dia:font family="monospace" style="88" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="polymorphic_font">
+        <dia:font family="monospace" style="8" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="classname_font">
+        <dia:font family="sans" style="80" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_classname_font">
+        <dia:font family="sans" style="88" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="comment_font">
+        <dia:font family="sans" style="8" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="font_height">
+        <dia:real val="0.8"/>
+      </dia:attribute>
+      <dia:attribute name="polymorphic_font_height">
+        <dia:real val="0.8"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_font_height">
+        <dia:real val="0.8"/>
+      </dia:attribute>
+      <dia:attribute name="classname_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_classname_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="comment_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="attributes">
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#name#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string(35)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Name of street/ave/etc#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#type#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string(35)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Street/Ave/Blvd/etc,#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#formatted#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Calculated: formatted per local 
requirements#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="3"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="operations"/>
+      <dia:attribute name="template">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="templates"/>
+      <dia:childnode parent="O0"/>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O5">
+      <dia:attribute name="obj_pos">
+        <dia:point val="7.9,5.5"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="7.85,5.45;12.05,13.3"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="7.9,5.5"/>
+        <dia:point val="10,5.5"/>
+        <dia:point val="10,11.7"/>
+        <dia:point val="12,11.7"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="autorouting">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O1" connection="13"/>
+        <dia:connection handle="1" to="O4" connection="3"/>
+      </dia:connections>
+      <dia:childnode parent="O0"/>
+    </dia:object>
+    <dia:object type="UML - Class" version="0" id="O6">
+      <dia:attribute name="obj_pos">
+        <dia:point val="22,8"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="21.95,7.95;28.95,13.25"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="22,8"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="6.9"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="5.2"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>#Region#</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="comment">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="abstract">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="suppress_attributes">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="suppress_operations">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="visible_attributes">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="visible_operations">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="visible_comments">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="line_color">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="fill_color">
+        <dia:color val="#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name="text_color">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="normal_font">
+        <dia:font family="monospace" style="0" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_font">
+        <dia:font family="monospace" style="88" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="polymorphic_font">
+        <dia:font family="monospace" style="8" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="classname_font">
+        <dia:font family="sans" style="80" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_classname_font">
+        <dia:font family="sans" style="88" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="comment_font">
+        <dia:font family="sans" style="8" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="font_height">
+        <dia:real val="0.8"/>
+      </dia:attribute>
+      <dia:attribute name="polymorphic_font_height">
+        <dia:real val="0.8"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_font_height">
+        <dia:real val="0.8"/>
+      </dia:attribute>
+      <dia:attribute name="classname_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_classname_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="comment_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="attributes">
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#code#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string(8)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Region/state abbreviation#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#name#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string(70)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Full name of region/state#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#country#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#LOC_Country#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Country the region resides in#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#formatted#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Calculated: Formatted per local 
requirements#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="3"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="operations"/>
+      <dia:attribute name="template">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="templates"/>
+      <dia:childnode parent="O0"/>
+    </dia:object>
+    <dia:object type="UML - Class" version="0" id="O7">
+      <dia:attribute name="obj_pos">
+        <dia:point val="12,5"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="11.95,4.95;18.35,10.25"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="12,5"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="6.3"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="5.2"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>#Zip#</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="comment">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="abstract">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="suppress_attributes">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="suppress_operations">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="visible_attributes">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="visible_operations">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="visible_comments">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="line_color">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="fill_color">
+        <dia:color val="#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name="text_color">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="normal_font">
+        <dia:font family="monospace" style="0" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_font">
+        <dia:font family="monospace" style="88" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="polymorphic_font">
+        <dia:font family="monospace" style="8" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="classname_font">
+        <dia:font family="sans" style="80" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_classname_font">
+        <dia:font family="sans" style="88" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="comment_font">
+        <dia:font family="sans" style="8" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="font_height">
+        <dia:real val="0.8"/>
+      </dia:attribute>
+      <dia:attribute name="polymorphic_font_height">
+        <dia:real val="0.8"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_font_height">
+        <dia:real val="0.8"/>
+      </dia:attribute>
+      <dia:attribute name="classname_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_classname_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="comment_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="attributes">
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#code#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string(8)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#ZIP code#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#city#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string(70)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Full name of city#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#region#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#LOC_REGION#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#The region the zi code is in#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#formatted#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Calculated: City/zip formatted per local 
requirements#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="3"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="operations"/>
+      <dia:attribute name="template">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="templates"/>
+      <dia:childnode parent="O0"/>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O8">
+      <dia:attribute name="obj_pos">
+        <dia:point val="7.9,4.7"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="7.85,4.65;12.05,7.3"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="7.9,4.7"/>
+        <dia:point val="11,4.7"/>
+        <dia:point val="11,5.7"/>
+        <dia:point val="12,5.7"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="autorouting">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O1" connection="11"/>
+        <dia:connection handle="1" to="O7" connection="3"/>
+      </dia:connections>
+      <dia:childnode parent="O0"/>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O9">
+      <dia:attribute name="obj_pos">
+        <dia:point val="18.3,8.5"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="18.25,8.45;22.05,10.3"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="18.3,8.5"/>
+        <dia:point val="20.15,8.5"/>
+        <dia:point val="20.15,8.7"/>
+        <dia:point val="22,8.7"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O7" connection="13"/>
+        <dia:connection handle="1" to="O6" connection="3"/>
+      </dia:connections>
+      <dia:childnode parent="O0"/>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O10">
+      <dia:attribute name="obj_pos">
+        <dia:point val="28.9,11.5"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="27.95,2.65;31.1,13.1"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="28.9,11.5"/>
+        <dia:point val="31,11.5"/>
+        <dia:point val="31,2.7"/>
+        <dia:point val="28,2.7"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="autorouting">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O6" connection="13"/>
+        <dia:connection handle="1" to="O2" connection="4"/>
+      </dia:connections>
+      <dia:childnode parent="O0"/>
+    </dia:object>
   </dia:layer>
+  <dia:layer name="License" visible="true">
+    <dia:object type="UML - Note" version="0" id="O11">
+      <dia:attribute name="obj_pos">
+        <dia:point val="-20,1"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="-20.05,0.95;-0.75,16.35"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="-20,1"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="19.2"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="15.3"/>
+      </dia:attribute>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="fill_colour">
+        <dia:color val="#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            <dia:string>#This file is part of GNU Enterprise.
+
+GNU Enterprise is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public
+License as published by the Free Software Foundation; either
+version 2, or (at you option) any later version.
+
+GNU Enterprise is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied
+warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with the program; see the file COPYING. If not,
+write to the Free Software Foundation, Inc., 59 Temple Place
+- Suite 330, Boston, MA 02111-1307, USA.
+
+Copyright 2000-2004 Free Software Foundation#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="font">
+            <dia:font family="monospace" style="0" name="Courier"/>
+          </dia:attribute>
+          <dia:attribute name="height">
+            <dia:real val="0.8"/>
+          </dia:attribute>
+          <dia:attribute name="pos">
+            <dia:point val="-19.65,2.15"/>
+          </dia:attribute>
+          <dia:attribute name="color">
+            <dia:color val="#000000"/>
+          </dia:attribute>
+          <dia:attribute name="alignment">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+    </dia:object>
+  </dia:layer>
 </dia:diagram>

Modified: trunk/gnue-packages/base/location/loc.gcd
===================================================================
--- trunk/gnue-packages/base/location/loc.gcd   2004-09-16 18:29:35 UTC (rev 
6318)
+++ trunk/gnue-packages/base/location/loc.gcd   2004-09-16 23:04:27 UTC (rev 
6319)
@@ -1,11 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!-- LOC Module
+
+     Copyright 2004 Free Software Foundation
+
+     This file is part of GNU Enterprise.
+
+     GNU Enterprise is free software; you can redistribute it and/or
+     modify it under the terms of the GNU General Public License as
+     published by the Free Software Foundation; either version 2 of
+     the License, or (at your option) any later version.
+
+     GNU Enterprise is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNU Enterprise; see the file COPYING.  If not, write to
+     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+
+     $Id$ -->
+
 <!-- Implements a business logic object representing a physical address. -->
 <module name="LOC" comment="Address management">
   <class name="Country" comment="">
-    <property name="code"       type="CORE_CountryCode"     nullable="False"   
 comment="ISO 3166-1 country code/name" />
-    <property name="phone"      type="string(4)"                               
 comment="Phone country prefix" />
-    <property name="formatted"  type="string"                                  
 comment="Returns country formatted per local requirements">
+    <property name="code"       type="string(3)"    nullable="False"    
comment="ISO 3166-1 country code" />
+    <property name="name"       type="string(70)"                       
comment="ISO 3166-1 country name" />
+    <property name="formatted"  type="string"                           
comment="Formatted per local requirements">
       <![CDATA[
       return self.name
       ]]>
@@ -13,10 +36,10 @@
   </class>
 
   <class name="Region">
-    <property name="code"       type="string(8)"            nullable="False"   
 comment="Region/state abbreviation" />
-    <property name="name"       type="CORE_TextLong"        nullable="False"   
 comment="Full name of region/state" />
-    <property name="country"    type="LOC_Country"          nullable="False"   
 comment="Country the region resides in" />
-    <property name="formatted"  type="string"                                  
 comment="Returns region formatted per local requirements">
+    <property name="code"       type="string(8)"    nullable="False"    
comment="Region/state abbreviation" />
+    <property name="name"       type="string(70)"                       
comment="Full name of region/state" />
+    <property name="country"    type="LOC_Country"                      
comment="Country the region resides in" />
+    <property name="formatted"  type="string"                           
comment="Formatted per local requirements">
       <![CDATA[
       return self.code
       ]]>
@@ -24,22 +47,20 @@
   </class>
 
   <class name="Zip" comment="">
-    <property name="code"       type="string(8)"            nullable="False"   
 comment="zip code" />
-    <property name="city"       type="CORE_TextLong"        nullable="False"   
 comment="Full name of city" />
-    <property name="region"     type="LOC_Region"                              
 comment="Region zip code is in" />
-    <property name="latitude"   type="number(12,9)"                            
 comment="" />
-    <property name="longitude"  type="number(12,9)"                            
 comment="" />
-    <property name="formatted"  type="string"                                  
 comment="Returns city/zip formatted per local requirements">
+    <property name="code"       type="string(8)"    nullable="False"    
comment="zip code" />
+    <property name="city"       type="string(70)"                       
comment="Full name of city" />
+    <property name="region"     type="LOC_Region"                       
comment="Region zip code is in" />
+    <property name="formatted"  type="string"                           
comment="Formatted per local requirements">
       <![CDATA[
-      return self.city + ', ' self.region.formatted + '\n' + self.code
+      return self.city + ', ' + self.region.formatted + ', ' + self.code
       ]]>
     </property>
   </class>
 
-  <class name="Place" comment="">
-    <property name="name"       type="CORE_TextShort"       nullable="False"   
 comment="GNUe..." />
-    <property name="type"       type="CDICT_Code"           nullable="False"   
 comment="street/avenue/boulevard/etc, Code 002" />
-    <property name="formatted"  type="string"                                  
 comment="Returns place formatted per local requirements">
+  <class name="Street" comment="">
+    <property name="name"       type="string(35)"   nullable="False"    
comment="GNUe, Abbey, Appia..." />
+    <property name="type"       type="string(35)"                       
comment="street/avenue/boulevard/etc." />
+    <property name="formatted"  type="string"                           
comment="Formatted per local requirements">
       <![CDATA[
       return self.name + ' ' + self.type
       ]]>
@@ -47,25 +68,19 @@
   </class>
 
   <class name="Address" comment="">
-    <property name="descr"      type="CDICT_Code"                              
 comment="Type of address (home, work, business, etc) Code 003" />
-    <property name="country"    type="LOC_Country"                             
 comment="" />
-    <property name="zip"        type="LOC_Zip"                                 
 comment="Also designates city" />
-    <property name="place"      type="LOC_Place"                               
 comment="Name and type of place" />
-    <property name="number"     type="string(11)"                              
 comment="" />
-    <property name="building"   type="string(4)"                               
 comment="" />
-    <property name="staircase"  type="string(4)"                               
 comment="" />
-    <property name="floor"      type="string(2)"                               
 comment="" />
-    <property name="door"       type="string(4)"                               
 comment="" />
-    <property name="pobox"      type="string(10)"                              
 comment="PO Box" />
-    <property name="lotNumber"  type="CORE_TextShort"                          
 comment="Topographical number if any" />
-    <property name="latitude"   type="number(12,9)"                            
 comment="" />
-    <property name="longitude"  type="number(12,9)"                            
 comment="" />
-
-    <property name="formatted"  type="string"                                  
 comment="Returns the full address per local requirements">
+    <property name="country"    type="LOC_Country"                      
comment="" />
+    <property name="zip"        type="LOC_Zip"                          
comment="Also designates city" />
+    <property name="street"     type="LOC_Street"                       
comment="Name and type of street" />
+    <property name="number"     type="string(11)"                       
comment="" />
+    <property name="building"   type="string(4)"                        
comment="" />
+    <property name="staircase"  type="string(4)"                        
comment="" />
+    <property name="floor"      type="string(2)"                        
comment="" />
+    <property name="door"       type="string(4)"                        
comment="" />
+    <property name="formatted"  type="string"                           
comment="Full address per local requirements">
       <![CDATA[
       addr = ''
 
-      if self.place:    addr += self.place.formatted
+      if self.street:   addr += self.street.formatted
       if self.number:   addr += self.number + '\n'
       if self.zip:      addr += self.zip.formatted + '\n'
       if self.country:  addr += self.country.formatted
@@ -73,8 +88,5 @@
       return addr
       ]]>
     </property>
-
-    <!--<procedure name="" type="" comment="">
-    </procedure>-->
   </class>
 </module>

Deleted: trunk/gnue-packages/base/location/loc.gpd
===================================================================
--- trunk/gnue-packages/base/location/loc.gpd   2004-09-16 18:29:35 UTC (rev 
6318)
+++ trunk/gnue-packages/base/location/loc.gpd   2004-09-16 23:04:27 UTC (rev 
6319)
@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-
-<processes title="Location">
-    <description>
-      <![CDATA[
-        <H1><CENTER>Location</CENTER></H1>
-        This branch contains forms that handle location data
-        implemented in GNUe AppServer with the use of .GCD descriptions.<p>
-      ]]>
-    </description>
-    <step type="form" location="./country.gfd"
-          title="Country">
-      <description>
-        <![CDATA[
-          <B>Country editor</B>
-          <p>
-          This form lets you edit country codes and names.
-        ]]>
-      </description>
-    </step>
-    <step type="form" location="./region.gfd"
-          title="Region">
-      <description>
-        <![CDATA[
-          <B>Region editor</B>
-          <p>
-          This form lets you edit region codes and names.
-        ]]>
-      </description>
-    </step>
-    <step type="form" location="./zip.gfd"
-          title="Cities and ZIP">
-      <description>
-        <![CDATA[
-          <B>ZIP editor</B>
-          <p>
-          This form lets you edit city names and corresponding ZIP codes.
-        ]]>
-      </description>
-    </step>
-    <step type="form" location="./place.gfd"
-          title="Place">
-      <description>
-        <![CDATA[
-          <B>Place editor</B>
-          <p>
-          This form lets you edit places like street, avenue, boulevard, etc.
-        ]]>
-      </description>
-    </step>
-    <step type="form" location="./address.gfd"
-          title="Address">
-      <description>
-        <![CDATA[
-          <B>Address editor</B>
-          <p>
-          This form lets you edit a full physical address.
-        ]]>
-      </description>
-    </step>
-</processes>
-

Modified: trunk/gnue-packages/base/location/loc.png
===================================================================
(Binary files differ)

Deleted: trunk/gnue-packages/base/location/place.gfd
===================================================================
--- trunk/gnue-packages/base/location/place.gfd 2004-09-16 18:29:35 UTC (rev 
6318)
+++ trunk/gnue-packages/base/location/place.gfd 2004-09-16 23:04:27 UTC (rev 
6319)
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="iso8859-1"?>
-
-<!--  GNUe-Designer (0.5.4.99)
-      Saved on: 2004-06-16 13:05:40  -->
-
-<form title="Place">
-  <options/>
-  <datasource name="dtsLOC_Place" connection="appserver" table="LOC_Place"/>
-  <datasource name="dts_CDICT_Code" connection="appserver" prequery="Y"
-              table="CDICT_Code">
-    <condition>
-      <eq>
-        <cfield name="CDICT_Descr.CDICT_type"/>
-        <cconst value="001"/>
-      </eq>
-    </condition>
-  </datasource>
-  <logic>
-    <block name="blkLOC_Place" datasource="dtsloc_place">
-      <field name="fldGnueId" field="gnue_id" maxLength="32"/>
-      <field name="fldLocName" field="LOC_name" maxLength="40"/>
-      <field name="fldLocType" field="LOC_type" fk_description="name"
-             fk_key="gnue_id" fk_source="dts_CDICT_Code" maxLength="3"/>
-    </block>
-  </logic>
-  <layout xmlns:Char="GNUe:Layout:Char" Char:height="4" Char:width="38">
-    <page name="Page1">
-      <label name="lblLoc Name:" Char:height="1" Char:width="5" Char:x="1"
-             Char:y="1" text="Name:"/>
-      <entry name="entLocName" Char:height="1" Char:width="30" Char:x="7"
-             Char:y="1" block="blkLOC_Place" field="fldLocName" focusorder="1" 
label=""/>
-      <label name="lblLoc Type:" Char:height="1" Char:width="5" Char:x="1"
-             Char:y="2" text="Type:"/>
-      <entry name="entLocType" Char:height="1" Char:width="30" Char:x="7"
-             Char:y="2" block="blkLOC_Place" field="fldLocType" focusorder="2" 
label=""
-             style="dropdown"/>
-      <entry name="entGnueId" Char:height="1" Char:width="32" Char:x="1"
-             Char:y="3" block="blkLOC_Place" field="fldGnueId" hidden="Y" 
label=""/>
-    </page>
-  </layout>
-</form>

Deleted: trunk/gnue-packages/base/location/region.gfd
===================================================================
--- trunk/gnue-packages/base/location/region.gfd        2004-09-16 18:29:35 UTC 
(rev 6318)
+++ trunk/gnue-packages/base/location/region.gfd        2004-09-16 23:04:27 UTC 
(rev 6319)
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="iso8859-1"?>
-
-<!--  GNUe-Designer (0.5.4.99)
-      Saved on: 2004-06-16 12:10:27  -->
-
-<form title="Region">
-  <options/>
-  <datasource name="dtsLOC_Region" connection="appserver" table="LOC_Region"/>
-  <datasource name="dts_LOC_Country" connection="appserver" prequery="Y"
-              table="LOC_Country"/>
-  <logic>
-    <block name="blkLOC_Region" datasource="dtsloc_region">
-      <field name="fldGnueId" field="gnue_id" maxLength="32"/>
-      <field name="fldLocCode" field="LOC_code" maxLength="8"/>
-      <field name="fldLocCountry" field="LOC_country" fk_description="name"
-             fk_key="gnue_id" fk_source="dts_LOC_Country" maxLength="32"/>
-      <field name="fldLocName" field="LOC_name" maxLength="60"/>
-    </block>
-  </logic>
-  <layout xmlns:Char="GNUe:Layout:Char" Char:height="5" Char:width="42">
-    <page name="Page1">
-      <label name="lblLoc Code:" Char:height="1" Char:width="5" Char:x="1"
-             Char:y="1" text="Code:"/>
-      <entry name="entLocCode" Char:height="1" Char:width="8" Char:x="10"
-             Char:y="1" block="blkLOC_Region" field="fldLocCode" 
focusorder="1" label=""/>
-      <label name="lblLoc Name:" Char:height="1" Char:width="5" Char:x="1"
-             Char:y="2" text="Name:"/>
-      <entry name="entLocName" Char:height="1" Char:width="30" Char:x="10"
-             Char:y="2" block="blkLOC_Region" field="fldLocName" 
focusorder="2" label=""/>
-      <label name="lblLoc Country:" Char:height="1" Char:width="8" Char:x="1"
-             Char:y="3" text="Country:"/>
-      <entry name="entLocCountry" Char:height="1" Char:width="30" Char:x="10"
-             Char:y="3" block="blkLOC_Region" field="fldLocCountry" 
focusorder="3"
-             label="" style="dropdown"/>
-      <entry name="entGnueId" Char:height="1" Char:width="32" Char:x="10"
-             Char:y="4" block="blkLOC_Region" field="fldGnueId" hidden="Y" 
label=""/>
-    </page>
-  </layout>
-</form>

Deleted: trunk/gnue-packages/base/location/zip.gfd
===================================================================
--- trunk/gnue-packages/base/location/zip.gfd   2004-09-16 18:29:35 UTC (rev 
6318)
+++ trunk/gnue-packages/base/location/zip.gfd   2004-09-16 23:04:27 UTC (rev 
6319)
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="iso8859-1"?>
-
-<!--  GNUe-Designer (0.5.4.99)
-      Saved on: 2004-06-17 13:55:00  -->
-
-<form title="Zip">
-  <options/>
-  <datasource name="dtsLOC_Zip" connection="appserver" table="LOC_Zip"/>
-  <datasource name="dts_LOC_Region" connection="appserver" prequery="Y"
-              table="LOC_Region"/>
-  <logic>
-    <block name="blkLOC_Zip" datasource="dtsloc_zip">
-      <field name="fldGnueId" field="gnue_id" maxLength="32"/>
-      <field name="fldLocCity" field="LOC_city" maxLength="60"/>
-      <field name="fldLocCode" field="LOC_code" maxLength="8"/>
-      <field name="fldLocLatitude" field="LOC_latitude" maxLength="10"
-             typecast="number"/>
-      <field name="fldLocLongitude" field="LOC_longitude" maxLength="10"
-             typecast="number"/>
-      <field name="fldLocRegion" field="LOC_region" fk_description="name"
-             fk_key="gnue_id" fk_source="dts_LOC_Region" maxLength="32"/>
-    </block>
-  </logic>
-  <layout xmlns:Char="GNUe:Layout:Char" Char:height="7" Char:width="43">
-    <page name="Page1">
-      <label name="lblLoc Code:" Char:height="1" Char:width="5" Char:x="1"
-             Char:y="1" text="Code:"/>
-      <entry name="entLocCode" Char:height="1" Char:width="8" Char:x="12"
-             Char:y="1" block="blkLOC_Zip" field="fldLocCode" focusorder="1" 
label=""/>
-      <label name="lblLoc City:" Char:height="1" Char:width="5" Char:x="1"
-             Char:y="2" text="City:"/>
-      <entry name="entLocCity" Char:height="1" Char:width="30" Char:x="12"
-             Char:y="2" block="blkLOC_Zip" field="fldLocCity" focusorder="2" 
label=""/>
-      <label name="lblLoc Region:" Char:height="1" Char:width="7" Char:x="1"
-             Char:y="3" text="Region:"/>
-      <entry name="entLocRegion" Char:height="1" Char:width="30" Char:x="12"
-             Char:y="3" block="blkLOC_Zip" field="fldLocRegion" focusorder="3" 
label=""
-             style="dropdown"/>
-      <label name="lblLoc Latitude:" Char:height="1" Char:width="9" Char:x="1"
-             Char:y="4" text="Latitude:"/>
-      <entry name="entLocLatitude" Char:height="1" Char:width="10" Char:x="12"
-             Char:y="4" block="blkLOC_Zip" field="fldLocLatitude" 
focusorder="4" label=""/>
-      <label name="lblLoc Longitude:" Char:height="1" Char:width="10"
-             Char:x="1" Char:y="5" text="Longitude:"/>
-      <entry name="entLocLongitude" Char:height="1" Char:width="10"
-             Char:x="12" Char:y="5" block="blkLOC_Zip" field="fldLocLongitude"
-             focusorder="5" label=""/>
-      <entry name="entGnueId" Char:height="1" Char:width="32" Char:x="1"
-             Char:y="6" block="blkLOC_Zip" field="fldGnueId" hidden="Y" 
label=""/>
-    </page>
-  </layout>
-</form>





reply via email to

[Prev in Thread] Current Thread [Next in Thread]