Commit a1b767cd8a785015f7a26883492c25cfdec5cd03

Authored by Aníbal Pacheco
1 parent 3c953bfb52
Exists in master

Actualización luego de la segunda iteración, entre otros cambios se incluyen Loc…

…alidad, Manzana y Solar catastral

Showing 2 changed files with 184 additions and 94 deletions Side-by-side Diff

DireccionesXMLSchema.xsd View file @ a1b767c
... ... @@ -24,9 +24,12 @@
24 24 <sequence>
25 25 <element maxOccurs="1" minOccurs="1" name="pais" type="iso:ISOCountryCode"/>
26 26 <element maxOccurs="1" minOccurs="0" name="departamento" type="tns:Departamento"/>
  27 + <element maxOccurs="1" minOccurs="0" name="localidadCatastral" type="tns:LocalidadCatastral"/>
27 28 <element maxOccurs="1" minOccurs="0" name="localidad" type="tns:Localidad"/>
  29 + <element maxOccurs="1" minOccurs="0" name="manzanaCatastral" type="int"/>
28 30 <element maxOccurs="1" minOccurs="0" name="manzana" type="int"/>
29 31 <element maxOccurs="1" minOccurs="0" name="padron" type="int"/>
  32 + <element maxOccurs="1" minOccurs="0" name="solarCatastral" type="int"/>
30 33 <element maxOccurs="1" minOccurs="0" name="solar" type="int"/>
31 34 <element maxOccurs="1" minOccurs="0" name="numero" type="string"/>
32 35 <element maxOccurs="1" minOccurs="0" name="letra" type="string"/>
modelo_conceptual.xmi View file @ a1b767c
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<XMI verified="false" xmi.version="1.2" timestamp="2011-09-30T14:32:40" xmlns:UML="http://schema.omg.org/spec/UML/1.3">
  2 +<XMI verified="false" xmi.version="1.2" timestamp="2012-02-07T16:44:55" xmlns:UML="http://schema.omg.org/spec/UML/1.3">
3 3 <XMI.header>
4 4 <XMI.documentation>
5 5 <XMI.exporter>umbrello uml modeller http://uml.sf.net</XMI.exporter>
... ... @@ -50,6 +50,7 @@
50 50 <UML:DataType stereotype="datatype" visibility="public" isSpecification="false" namespace="Datatypes" isAbstract="false" isLeaf="false" elementReference="BaZFOwbCP9LS" isRoot="false" xmi.id="PhXZlZ9gs6sF" name="Alfanumerico(255)"/>
51 51 <UML:DataType stereotype="datatype" visibility="public" isSpecification="false" namespace="Datatypes" isAbstract="false" isLeaf="false" elementReference="d3ZqEjji5qNM" isRoot="false" xmi.id="0lNUP6kRom2r" name="Numerico(9)"/>
52 52 <UML:DataType stereotype="datatype" visibility="public" isSpecification="false" namespace="Datatypes" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="SvdnBnsvEuNw" name="[Geometria]"/>
  53 + <UML:DataType stereotype="datatype" visibility="public" isSpecification="false" namespace="Datatypes" isAbstract="false" isLeaf="false" elementReference="fJTBbDwmjazW" isRoot="false" xmi.id="9HdN5R731t3c" name="Alfabetico(4)"/>
53 54 </UML:Namespace.ownedElement>
54 55 </UML:Package>
55 56 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="tTM8hIy8GNaf" name="Direccion">
... ... @@ -481,7 +482,7 @@
481 482 </UML:Association>
482 483 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="SSn60ti0Hi7M" name="Coordenada">
483 484 <UML:Classifier.feature>
484   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="ARwCGMyiGZVP" type="WhcdEhNGTPXc" name="geom"/>
  485 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="ARwCGMyiGZVP" type="WhcdEhNGTPXc" name="geometria"/>
485 486 <UML:Attribute visibility="public" isSpecification="false" xmi.id="KOJZGgVg6Jk5" type="4i4b5BkoCPyn" name="criterioGeocod"/>
486 487 </UML:Classifier.feature>
487 488 </UML:Class>
488 489  
489 490  
490 491  
491 492  
492 493  
493 494  
494 495  
495 496  
496 497  
497 498  
498 499  
499 500  
500 501  
... ... @@ -498,54 +499,100 @@
498 499 </UML:Association.connection>
499 500 </UML:Association>
500 501 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="0lCIJN1IBOOh" name="TipoParidad"/>
  502 + <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="Jft158ximH8y" name="LocalidadCatastral">
  503 + <UML:Classifier.feature>
  504 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="nXCm7mwd2bOe" type="6aMgotUEBgWz" name="codigo"/>
  505 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="lnLAJP3dec1i" type="yLDTOQJUye8m" name="nombre"/>
  506 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="CX1tEZW7yMkj" type="WhcdEhNGTPXc" name="geometria"/>
  507 + </UML:Classifier.feature>
  508 + </UML:Class>
  509 + <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="CyAWgunfYOu4" name="ManzanaCatastral">
  510 + <UML:Classifier.feature>
  511 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="e9fXkAft9szU" type="gCEBGjygXMqu" name="numero"/>
  512 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="2147pQZTbej2" type="WhcdEhNGTPXc" name="geometria"/>
  513 + </UML:Classifier.feature>
  514 + </UML:Class>
  515 + <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="qFnI6mQPRHOU" name="SolarCatastral">
  516 + <UML:Classifier.feature>
  517 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="E35x2gPAwjO2" type="gCEBGjygXMqu" name="numero"/>
  518 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="39wCXCzZB3g1" type="WhcdEhNGTPXc" name="geometria"/>
  519 + </UML:Classifier.feature>
  520 + </UML:Class>
  521 + <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="DXZZTFZEkj1p" name="">
  522 + <UML:Association.connection>
  523 + <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="WxQYWpDf4q2A" type="Jft158ximH8y" name="" aggregation="composite"/>
  524 + <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="F7BHyFrCkOlE" type="JrepmBDIqpt5" name="" aggregation="none"/>
  525 + </UML:Association.connection>
  526 + </UML:Association>
  527 + <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="bISJ1T8VPY4v" name="">
  528 + <UML:Association.connection>
  529 + <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="1" xmi.id="LHbO5bYJhhaf" type="JrepmBDIqpt5" name="" aggregation="composite"/>
  530 + <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="*" xmi.id="uPpfnYrMqJfq" type="Jft158ximH8y" name="" aggregation="none"/>
  531 + </UML:Association.connection>
  532 + </UML:Association>
  533 + <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="pphLhemI7qLT" name="">
  534 + <UML:Association.connection>
  535 + <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="dD5IRcK5jzcT" type="tTM8hIy8GNaf" name="" aggregation="aggregate"/>
  536 + <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="9GMG6Mkw9QFo" type="CyAWgunfYOu4" name="" aggregation="none"/>
  537 + </UML:Association.connection>
  538 + </UML:Association>
  539 + <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="TDU5sD54E92E" name="">
  540 + <UML:Association.connection>
  541 + <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="pPMj8llCsgMP" type="tTM8hIy8GNaf" name="" aggregation="aggregate"/>
  542 + <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="qLyzPc0qqStg" type="qFnI6mQPRHOU" name="" aggregation="none"/>
  543 + </UML:Association.connection>
  544 + </UML:Association>
501 545 </UML:Namespace.ownedElement>
502 546 <XMI.extension xmi.extender="umbrello">
503 547 <diagrams>
504   - <diagram showopsig="1" linecolor="#000000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" isopen="1" showpackage="1" showpubliconly="1" showstereotype="1" name="class diagram" font="Sans Serif,9,-1,0,50,0,0,0,0,0" canvasheight="672" canvaswidth="1342" localid="-1" snapcsgrid="0" showgrid="0" showops="1" griddotcolor="#808080" backgroundcolor="#ffffff" usefillcolor="1" fillcolor="#ffffff" zoom="100" xmi.id="LivcEe3649X1" documentation="" showscope="1" snapgrid="0" showatts="1" type="1">
  548 + <diagram showopsig="1" linecolor="#000000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" isopen="1" showpackage="1" showpubliconly="1" showstereotype="1" name="class diagram" font="Sans Serif,9,-1,0,50,0,0,0,0,0" canvasheight="780" canvaswidth="1340" localid="-1" snapcsgrid="0" showgrid="0" showops="1" griddotcolor="#808080" backgroundcolor="#ffffff" usefillcolor="1" fillcolor="#ffffff" zoom="100" xmi.id="LivcEe3649X1" documentation="" showscope="1" snapgrid="0" showatts="1" type="1">
505 549 <widgets>
506 550 <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="299" showattsigs="601" showstereotype="1" y="219" showattributes="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" width="253" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="tTM8hIy8GNaf" showscope="1" height="105" showopsigs="601"/>
507 551 <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="9" showattsigs="601" showstereotype="1" y="53" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="176" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="BtctkDrlM8Ug" showscope="1" height="63" showopsigs="601"/>
508 552 <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="340" showattsigs="601" showstereotype="1" y="0" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="176" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="JrepmBDIqpt5" showscope="1" height="63" showopsigs="601"/>
509   - <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="621" showattsigs="601" showstereotype="1" y="0" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="196" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="UGLwdsYoj8hU" showscope="1" height="63" showopsigs="601"/>
510   - <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="41" showattsigs="601" showstereotype="1" y="253" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="JWDdehHvWvjI" showscope="1" height="49" showopsigs="601"/>
511   - <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="8" showattsigs="601" showstereotype="1" y="327" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="236" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="4wYvkPyCfH8G" showscope="1" height="63" showopsigs="601"/>
512   - <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="41" showattsigs="601" showstereotype="1" y="191" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="7e2rlhJ4EUgq" showscope="1" height="49" showopsigs="601"/>
513   - <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="722" showattsigs="601" showstereotype="1" y="272" showattributes="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" width="196" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="9xmfrTwvPUo7" showscope="1" height="49" showopsigs="601"/>
  553 + <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="676" showattsigs="601" showstereotype="1" y="0" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="196" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="UGLwdsYoj8hU" showscope="1" height="63" showopsigs="601"/>
  554 + <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="61" showattsigs="601" showstereotype="1" y="423" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="JWDdehHvWvjI" showscope="1" height="49" showopsigs="601"/>
  555 + <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="13" showattsigs="601" showstereotype="1" y="497" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="236" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="4wYvkPyCfH8G" showscope="1" height="63" showopsigs="601"/>
  556 + <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="4" showattsigs="601" showstereotype="1" y="255" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="7e2rlhJ4EUgq" showscope="1" height="49" showopsigs="601"/>
  557 + <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="760" showattsigs="601" showstereotype="1" y="284" showattributes="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" width="196" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="9xmfrTwvPUo7" showscope="1" height="49" showopsigs="601"/>
514 558 <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="416" showattsigs="601" showstereotype="1" y="371" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="196" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="UFqijWWsUGXL" showscope="1" height="63" showopsigs="601"/>
515   - <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="605" showattsigs="601" showstereotype="1" y="193" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="196" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="jRE7u3EmnWHn" showscope="1" height="49" showopsigs="601"/>
516   - <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="730" showattsigs="601" showstereotype="1" y="106" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="175" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="v3uyqqkK5a0o" showscope="1" height="35" showopsigs="601"/>
  559 + <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="718" showattsigs="601" showstereotype="1" y="218" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="196" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="jRE7u3EmnWHn" showscope="1" height="49" showopsigs="601"/>
  560 + <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="888" showattsigs="601" showstereotype="1" y="159" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="175" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="v3uyqqkK5a0o" showscope="1" height="35" showopsigs="601"/>
517 561 <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="645" showattsigs="601" showstereotype="1" y="437" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="nqgOB6HFGZ5m" showscope="1" height="35" showopsigs="601"/>
518   - <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="83" showattsigs="601" showstereotype="1" y="483" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="6wPQBVstQYw3" showscope="1" height="49" showopsigs="601"/>
519   - <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="83" showattsigs="601" showstereotype="1" y="549" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="45gDAFCxsqL4" showscope="1" height="49" showopsigs="601"/>
520   - <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="380" showattsigs="601" showstereotype="1" y="492" showattributes="1" font="Sans Serif,9,-1,5,75,0,0,0,0,0" width="218" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="B6kIvg1gUhU3" showscope="1" height="119" showopsigs="601"/>
521   - <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="84" showattsigs="601" showstereotype="1" y="414" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="dICuM9h6UsS8" showscope="1" height="49" showopsigs="601"/>
  562 + <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="100" showattsigs="601" showstereotype="1" y="660" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="6wPQBVstQYw3" showscope="1" height="49" showopsigs="601"/>
  563 + <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="99" showattsigs="601" showstereotype="1" y="727" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="45gDAFCxsqL4" showscope="1" height="49" showopsigs="601"/>
  564 + <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="380" showattsigs="601" showstereotype="1" y="492" showattributes="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" width="218" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="B6kIvg1gUhU3" showscope="1" height="119" showopsigs="601"/>
  565 + <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="100" showattsigs="601" showstereotype="1" y="594" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="dICuM9h6UsS8" showscope="1" height="49" showopsigs="601"/>
522 566 <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="644" showattsigs="601" showstereotype="1" y="539" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="164" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="xg2HZ89UTSe9" showscope="1" height="35" showopsigs="601"/>
523 567 <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="249" showattsigs="601" showstereotype="1" y="101" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="196" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="an76wmD6d9AN" showscope="1" height="49" showopsigs="601"/>
524   - <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="7" showattsigs="601" showstereotype="1" y="619" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="236" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="SSn60ti0Hi7M" showscope="1" height="49" showopsigs="601"/>
  568 + <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="411" showattsigs="601" showstereotype="1" y="673" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="236" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="SSn60ti0Hi7M" showscope="1" height="49" showopsigs="601"/>
  569 + <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="626" showattsigs="601" showstereotype="1" y="78" showattributes="1" font="Sans Serif,9,-1,5,75,0,0,0,0,0" width="196" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="Jft158ximH8y" showscope="1" height="63" showopsigs="601"/>
  570 + <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="30" showattsigs="601" showstereotype="1" y="349" showattributes="1" font="Sans Serif,9,-1,5,75,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="CyAWgunfYOu4" showscope="1" height="49" showopsigs="601"/>
  571 + <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="5" showattsigs="601" showstereotype="1" y="150" showattributes="1" font="Sans Serif,9,-1,0,75,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="qFnI6mQPRHOU" showscope="1" height="49" showopsigs="601"/>
525 572 </widgets>
526 573 <messages/>
527 574 <associations>
528   - <assocwidget indexa="1" indexb="1" widgetaid="jRE7u3EmnWHn" linecolor="none" totalcounta="2" xmi.id="FaYBOOviTUgF" widgetbid="v3uyqqkK5a0o" totalcountb="3" type="503" linewidth="none">
  575 + <assocwidget indexa="1" indexb="1" widgetaid="jRE7u3EmnWHn" linecolor="none" totalcounta="2" xmi.id="FaYBOOviTUgF" widgetbid="v3uyqqkK5a0o" totalcountb="2" type="503" linewidth="none">
529 576 <linepath>
530   - <startpoint startx="769" starty="193"/>
531   - <endpoint endx="769" endy="141"/>
532   - <point x="769" y="145"/>
  577 + <startpoint startx="856" starty="218"/>
  578 + <endpoint endx="888" endy="182"/>
  579 + <point x="856" y="182"/>
533 580 </linepath>
534   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="770" showstereotype="1" y="172" text="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="N5MqIlU5yzkE" height="18"/>
535   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="771" showstereotype="1" y="145" text="*" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="tJnw5oQgeNdQ" height="18"/>
  581 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="857" showstereotype="1" y="197" text="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="FvaWDJAmRTb7" height="18"/>
  582 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="872" showstereotype="1" y="164" text="*" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="hvksSdD9xHhB" height="18"/>
536 583 </assocwidget>
537   - <assocwidget indexa="1" indexb="2" widgetaid="9xmfrTwvPUo7" linecolor="none" totalcounta="2" xmi.id="RwCbXCCXurNw" widgetbid="v3uyqqkK5a0o" totalcountb="3" type="503" linewidth="none">
  584 + <assocwidget indexa="1" indexb="1" widgetaid="9xmfrTwvPUo7" linecolor="none" totalcounta="2" xmi.id="RwCbXCCXurNw" widgetbid="v3uyqqkK5a0o" totalcountb="2" type="503" linewidth="none">
538 585 <linepath>
539   - <startpoint startx="832" starty="272"/>
540   - <endpoint endx="832" endy="141"/>
  586 + <startpoint startx="938" starty="284"/>
  587 + <endpoint endx="938" endy="194"/>
541 588 </linepath>
542   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="833" showstereotype="1" y="252" text="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="g9sdteoHhA7x" height="18"/>
543   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="835" showstereotype="1" y="146" text="*" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="tZ2qZk4Q3pL7" height="18"/>
  589 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="943" showstereotype="1" y="260" text="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="WwMA6OfLHGqU" height="18"/>
  590 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="942" showstereotype="1" y="197" text="*" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="Z0EyRp39ln1D" height="18"/>
544 591 </assocwidget>
545   - <assocwidget indexa="1" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="4" xmi.id="HBC1Iq7Q0Ttn" widgetbid="jRE7u3EmnWHn" totalcountb="2" type="501" linewidth="none">
  592 + <assocwidget indexa="2" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="5" xmi.id="HBC1Iq7Q0Ttn" widgetbid="jRE7u3EmnWHn" totalcountb="2" type="501" linewidth="none">
546 593 <linepath>
547   - <startpoint startx="552" starty="226"/>
548   - <endpoint endx="605" endy="226"/>
  594 + <startpoint startx="552" starty="244"/>
  595 + <endpoint endx="718" endy="244"/>
549 596 </linepath>
550 597 </assocwidget>
551 598 <assocwidget indexa="6" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="7" xmi.id="2bh04anWmWtq" widgetbid="UFqijWWsUGXL" totalcountb="2" type="501" linewidth="none">
552 599  
553 600  
554 601  
555 602  
556 603  
557 604  
558 605  
559 606  
560 607  
... ... @@ -554,38 +601,40 @@
554 601 <endpoint endx="469" endy="371"/>
555 602 </linepath>
556 603 </assocwidget>
557   - <assocwidget indexa="1" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="4" xmi.id="AVQuzHiT3vtQ" widgetbid="7e2rlhJ4EUgq" totalcountb="2" type="501" linewidth="none">
  604 + <assocwidget indexa="2" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="6" xmi.id="AVQuzHiT3vtQ" widgetbid="7e2rlhJ4EUgq" totalcountb="2" type="501" linewidth="none">
558 605 <linepath>
559   - <startpoint startx="299" starty="226"/>
560   - <endpoint endx="201" endy="226"/>
  606 + <startpoint startx="299" starty="276"/>
  607 + <endpoint endx="164" endy="276"/>
561 608 </linepath>
562 609 </assocwidget>
563   - <assocwidget indexa="3" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="4" xmi.id="zOk2HbQUv3hx" widgetbid="4wYvkPyCfH8G" totalcountb="2" type="501" linewidth="none">
  610 + <assocwidget indexa="5" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="6" xmi.id="zOk2HbQUv3hx" widgetbid="4wYvkPyCfH8G" totalcountb="2" type="501" linewidth="none">
564 611 <linepath>
565   - <startpoint startx="299" starty="286"/>
566   - <endpoint endx="226" endy="327"/>
567   - <point x="226" y="286"/>
  612 + <startpoint startx="299" starty="317"/>
  613 + <endpoint endx="235" endy="497"/>
  614 + <point x="235" y="317"/>
568 615 </linepath>
569 616 </assocwidget>
570   - <assocwidget indexa="2" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="4" xmi.id="ujtqlalxmIoD" widgetbid="JWDdehHvWvjI" totalcountb="2" type="501" linewidth="none">
  617 + <assocwidget indexa="4" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="6" xmi.id="ujtqlalxmIoD" widgetbid="JWDdehHvWvjI" totalcountb="2" type="501" linewidth="none">
571 618 <linepath>
572   - <startpoint startx="299" starty="263"/>
573   - <endpoint endx="201" endy="263"/>
  619 + <startpoint startx="299" starty="305"/>
  620 + <endpoint endx="206" endy="423"/>
  621 + <point x="206" y="305"/>
574 622 </linepath>
575 623 </assocwidget>
576   - <assocwidget indexa="4" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="5" xmi.id="11YlIKzGKBwa" widgetbid="UGLwdsYoj8hU" totalcountb="2" type="501" linewidth="none">
  624 + <assocwidget indexa="1" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="5" xmi.id="11YlIKzGKBwa" widgetbid="UGLwdsYoj8hU" totalcountb="2" type="501" linewidth="none">
577 625 <linepath>
578 626 <startpoint startx="552" starty="219"/>
579   - <endpoint endx="621" endy="63"/>
  627 + <endpoint endx="850" endy="63"/>
  628 + <point x="850" y="156"/>
580 629 </linepath>
581 630 </assocwidget>
582   - <assocwidget indexa="3" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="5" xmi.id="g5UyERWxSOpf" widgetbid="JrepmBDIqpt5" totalcountb="2" type="501" linewidth="none">
  631 + <assocwidget indexa="3" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="4" xmi.id="g5UyERWxSOpf" widgetbid="JrepmBDIqpt5" totalcountb="2" type="501" linewidth="none">
583 632 <linepath>
584 633 <startpoint startx="500" starty="219"/>
585 634 <endpoint endx="500" endy="63"/>
586 635 </linepath>
587 636 </assocwidget>
588   - <assocwidget indexa="1" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="5" xmi.id="gNA8l0oeEeEh" widgetbid="BtctkDrlM8Ug" totalcountb="2" type="501" linewidth="none">
  637 + <assocwidget indexa="1" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="4" xmi.id="gNA8l0oeEeEh" widgetbid="BtctkDrlM8Ug" totalcountb="2" type="501" linewidth="none">
589 638 <linepath>
590 639 <startpoint startx="299" starty="219"/>
591 640 <endpoint endx="185" endy="116"/>
592 641  
593 642  
594 643  
595 644  
596 645  
... ... @@ -593,32 +642,32 @@
593 642 </assocwidget>
594 643 <assocwidget indexa="2" indexb="1" widgetaid="9xmfrTwvPUo7" linecolor="none" totalcounta="4" xmi.id="h8hLBh6xWoje" widgetbid="nqgOB6HFGZ5m" totalcountb="2" type="510" linewidth="none">
595 644 <linepath>
596   - <startpoint startx="844" starty="321"/>
  645 + <startpoint startx="844" starty="333"/>
597 646 <endpoint endx="805" endy="458"/>
598 647 <point x="844" y="458"/>
599 648 </linepath>
600   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="825" showstereotype="1" y="339" text="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="dlnI9OgnWWRP" height="18"/>
601   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="806" showstereotype="1" y="440" text="*" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="ADepMjkFJm3q" height="18"/>
  649 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="825" showstereotype="1" y="351" text="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="PCNKT2Vxyp52" height="18"/>
  650 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="806" showstereotype="1" y="440" text="*" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="DjOUxCwUCASb" height="18"/>
602 651 </assocwidget>
603 652 <assocwidget indexa="2" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="7" xmi.id="u04Qom3cEViN" widgetbid="6wPQBVstQYw3" totalcountb="2" type="501" linewidth="none">
604 653 <linepath>
605   - <startpoint startx="311" starty="324"/>
606   - <endpoint endx="243" endy="491"/>
607   - <point x="311" y="491"/>
  654 + <startpoint startx="312" starty="324"/>
  655 + <endpoint endx="260" endy="689"/>
  656 + <point x="312" y="689"/>
608 657 </linepath>
609 658 </assocwidget>
610 659 <assocwidget indexa="3" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="7" xmi.id="xk79DpWfhJWi" widgetbid="45gDAFCxsqL4" totalcountb="2" type="501" linewidth="none">
611 660 <linepath>
612   - <startpoint startx="329" starty="324"/>
613   - <endpoint endx="243" endy="556"/>
614   - <point x="329" y="556"/>
  661 + <startpoint startx="330" starty="324"/>
  662 + <endpoint endx="259" endy="751"/>
  663 + <point x="330" y="751"/>
615 664 </linepath>
616 665 </assocwidget>
617   - <assocwidget indexa="3" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="4" xmi.id="90prHJZw6f0C" widgetbid="nqgOB6HFGZ5m" totalcountb="3" type="501" linewidth="none">
  666 + <assocwidget indexa="4" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="5" xmi.id="90prHJZw6f0C" widgetbid="nqgOB6HFGZ5m" totalcountb="3" type="501" linewidth="none">
618 667 <linepath>
619   - <startpoint startx="552" starty="295"/>
620   - <endpoint endx="675" endy="437"/>
621   - <point x="675" y="295"/>
  668 + <startpoint startx="552" starty="311"/>
  669 + <endpoint endx="670" endy="437"/>
  670 + <point x="670" y="311"/>
622 671 </linepath>
623 672 </assocwidget>
624 673 <assocwidget indexa="5" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="7" xmi.id="wZ8M1u9f6AQT" widgetbid="B6kIvg1gUhU3" totalcountb="3" type="510" linewidth="none">
625 674  
626 675  
627 676  
628 677  
629 678  
... ... @@ -626,29 +675,29 @@
626 675 <startpoint startx="400" starty="324"/>
627 676 <endpoint endx="400" endy="492"/>
628 677 </linepath>
629   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="403" showstereotype="1" y="345" text="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="U7EYuZdWJOoS" height="18"/>
630   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="401" showstereotype="1" y="474" text="*" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="nSDJzcg7qJxA" height="18"/>
  678 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="403" showstereotype="1" y="345" text="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="yVijGhufrFxL" height="18"/>
  679 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="401" showstereotype="1" y="474" text="*" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="HSGDGKGR3cw0" height="18"/>
631 680 </assocwidget>
632   - <assocwidget indexa="2" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="4" xmi.id="w0Z5ax6axb3g" widgetbid="9xmfrTwvPUo7" totalcountb="2" type="501" linewidth="none">
  681 + <assocwidget indexa="3" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="5" xmi.id="w0Z5ax6axb3g" widgetbid="9xmfrTwvPUo7" totalcountb="2" type="501" linewidth="none">
633 682 <linepath>
634   - <startpoint startx="552" starty="281"/>
635   - <endpoint endx="722" endy="281"/>
  683 + <startpoint startx="552" starty="295"/>
  684 + <endpoint endx="760" endy="295"/>
636 685 </linepath>
637 686 </assocwidget>
638 687 <assocwidget indexa="1" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="7" xmi.id="F027j6D4NIkF" widgetbid="dICuM9h6UsS8" totalcountb="2" type="501" linewidth="none">
639 688 <linepath>
640 689 <startpoint startx="299" starty="324"/>
641   - <endpoint endx="244" endy="414"/>
  690 + <endpoint endx="260" endy="594"/>
642 691 </linepath>
643 692 </assocwidget>
644 693 <assocwidget indexa="1" indexb="2" widgetaid="9xmfrTwvPUo7" linecolor="none" totalcounta="4" xmi.id="yFOQUsTK4hoX" widgetbid="nqgOB6HFGZ5m" totalcountb="3" type="503" linewidth="none">
645 694 <linepath>
646   - <startpoint startx="785" starty="321"/>
  695 + <startpoint startx="785" starty="333"/>
647 696 <endpoint endx="785" endy="437"/>
648 697 </linepath>
649   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="707" showstereotype="1" y="379" text="Entrecalles" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="703" width="74" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="0fNJSR7wWKSR" height="18"/>
650   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="752" showstereotype="1" y="324" text="0..2" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="32" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="r3xASjaFBoWA" height="18"/>
651   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="768" showstereotype="1" y="416" text="*" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="QAGETBOUqmlI" height="18"/>
  698 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="707" showstereotype="1" y="385" text="Entrecalles" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="703" width="74" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="oqUyzuZxPIef" height="18"/>
  699 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="752" showstereotype="1" y="336" text="0..2" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="32" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="xWJpmG81hMFx" height="18"/>
  700 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="768" showstereotype="1" y="416" text="*" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="gTOh3Ifr77p6" height="18"/>
652 701 </assocwidget>
653 702 <assocwidget indexa="2" indexb="1" widgetaid="B6kIvg1gUhU3" linecolor="none" totalcounta="3" xmi.id="jWbih5XSFvh0" widgetbid="UFqijWWsUGXL" totalcountb="2" type="503" linewidth="none">
654 703 <linepath>
655 704  
656 705  
657 706  
658 707  
659 708  
660 709  
661 710  
662 711  
663 712  
... ... @@ -662,37 +711,38 @@
662 711 <endpoint endx="340" endy="17"/>
663 712 <point x="133" y="17"/>
664 713 </linepath>
665   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="138" showstereotype="1" y="30" text="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="DrDhBd82h3D9" height="18"/>
666   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="325" showstereotype="1" y="3" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="mnMwZs4y2KCU" height="18"/>
  714 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="138" showstereotype="1" y="30" text="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="1M1Qcf4aBNPv" height="18"/>
  715 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="325" showstereotype="1" y="3" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="bXxItADYbcFe" height="18"/>
667 716 </assocwidget>
668   - <assocwidget indexa="1" indexb="1" widgetaid="JrepmBDIqpt5" linecolor="none" totalcounta="2" xmi.id="wSYw991iByO4" widgetbid="UGLwdsYoj8hU" totalcountb="2" type="510" linewidth="none">
  717 + <assocwidget indexa="1" indexb="1" widgetaid="JrepmBDIqpt5" linecolor="none" totalcounta="3" xmi.id="wSYw991iByO4" widgetbid="UGLwdsYoj8hU" totalcountb="2" type="510" linewidth="none">
669 718 <linepath>
670 719 <startpoint startx="516" starty="31"/>
671   - <endpoint endx="621" endy="31"/>
  720 + <endpoint endx="676" endy="31"/>
672 721 <point x="617" y="31"/>
673 722 </linepath>
674   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="519" showstereotype="1" y="8" text="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="VZyKLhcWYnDj" height="18"/>
675   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="605" showstereotype="1" y="11" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="PKk6NxD8iZ2G" height="18"/>
  723 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="519" showstereotype="1" y="8" text="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="utTz0I52c6QF" height="18"/>
  724 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="660" showstereotype="1" y="11" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="lSnvnCqPhlhY" height="18"/>
676 725 </assocwidget>
677 726 <assocwidget indexa="1" indexb="1" widgetaid="UGLwdsYoj8hU" linecolor="none" totalcounta="2" xmi.id="oFsAUjbRPciw" widgetbid="v3uyqqkK5a0o" totalcountb="2" type="503" linewidth="none">
678 727 <linepath>
679   - <startpoint startx="817" starty="10"/>
680   - <endpoint endx="882" endy="106"/>
  728 + <startpoint startx="872" starty="10"/>
  729 + <endpoint endx="937" endy="159"/>
681 730 <point x="882" y="10"/>
  731 + <point x="937" y="10"/>
682 732 </linepath>
683   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="819" showstereotype="1" y="13" text="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="P4EPPQtszpCI" height="18"/>
684   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="884" showstereotype="1" y="86" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="Xno3Y0nxIX1d" height="18"/>
  733 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="874" showstereotype="1" y="13" text="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="vv6WVK8NDbND" height="18"/>
  734 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="940" showstereotype="1" y="139" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="rSDUXchG4UBs" height="18"/>
685 735 </assocwidget>
686 736 <assocwidget indexa="1" indexb="3" widgetaid="xg2HZ89UTSe9" linecolor="none" totalcounta="2" xmi.id="33WRqx8ehYyk" widgetbid="9xmfrTwvPUo7" totalcountb="4" type="503" linewidth="none">
687 737 <linepath>
688 738 <startpoint startx="808" starty="548"/>
689   - <endpoint endx="890" endy="321"/>
  739 + <endpoint endx="890" endy="333"/>
690 740 <point x="890" y="548"/>
691 741 </linepath>
692   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="809" showstereotype="1" y="529" text="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="SCj8jlO6qcWD" height="18"/>
693   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="892" showstereotype="1" y="329" text="*" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="1N3yBEHg13jX" height="18"/>
  742 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="809" showstereotype="1" y="529" text="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="e0HLlwthpyBK" height="18"/>
  743 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="892" showstereotype="1" y="341" text="*" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="IKgVv3inTuFy" height="18"/>
694 744 </assocwidget>
695   - <assocwidget indexa="2" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="5" xmi.id="3BaBClOzRqz2" widgetbid="an76wmD6d9AN" totalcountb="2" type="501" linewidth="none">
  745 + <assocwidget indexa="2" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="4" xmi.id="3BaBClOzRqz2" widgetbid="an76wmD6d9AN" totalcountb="2" type="501" linewidth="none">
696 746 <linepath>
697 747 <startpoint startx="331" starty="219"/>
698 748 <endpoint endx="331" endy="150"/>
699 749  
700 750  
701 751  
702 752  
703 753  
704 754  
705 755  
... ... @@ -704,27 +754,50 @@
704 754 <endpoint endx="275" endy="101"/>
705 755 <point x="275" y="32"/>
706 756 </linepath>
707   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="321" showstereotype="1" y="40" text="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="1UTJzSxPfgYM" height="18"/>
708   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="278" showstereotype="1" y="80" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="QuTEVxRWISST" height="18"/>
  757 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="321" showstereotype="1" y="40" text="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="WwFYOOQ2MfL8" height="18"/>
  758 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="278" showstereotype="1" y="80" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="aEnNAwiSGMxA" height="18"/>
709 759 </assocwidget>
710   - <assocwidget indexa="4" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="7" xmi.id="1yvbfORhpxwl" widgetbid="SSn60ti0Hi7M" totalcountb="3" type="503" linewidth="none">
  760 + <assocwidget indexa="4" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="7" xmi.id="1yvbfORhpxwl" widgetbid="SSn60ti0Hi7M" totalcountb="2" type="503" linewidth="none">
711 761 <linepath>
712   - <startpoint startx="342" starty="324"/>
713   - <endpoint endx="243" endy="626"/>
714   - <point x="342" y="626"/>
  762 + <startpoint startx="343" starty="324"/>
  763 + <endpoint endx="411" endy="691"/>
  764 + <point x="343" y="691"/>
715 765 </linepath>
716   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="343" showstereotype="1" y="325" text="1..N" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="33" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="gh7flrDkJe4J" height="18"/>
717   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="244" showstereotype="1" y="643" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="6zgjdE419VFe" height="18"/>
  766 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="344" showstereotype="1" y="325" text="1..N" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="33" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="NevqYAn260aU" height="18"/>
  767 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="393" showstereotype="1" y="673" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="O1UjeprE1ccC" height="18"/>
718 768 </assocwidget>
719   - <assocwidget indexa="1" indexb="2" widgetaid="B6kIvg1gUhU3" linecolor="none" totalcounta="2" xmi.id="WdDLZA6Wj9qJ" widgetbid="SSn60ti0Hi7M" totalcountb="3" type="503" linewidth="none">
  769 + <assocwidget indexa="1" indexb="1" widgetaid="B6kIvg1gUhU3" linecolor="none" totalcounta="2" xmi.id="WdDLZA6Wj9qJ" widgetbid="SSn60ti0Hi7M" totalcountb="2" type="503" linewidth="none">
720 770 <linepath>
721 771 <startpoint startx="456" starty="611"/>
722   - <endpoint endx="243" endy="643"/>
  772 + <endpoint endx="456" endy="673"/>
723 773 <point x="456" y="643"/>
724 774 </linepath>
725   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="458" showstereotype="1" y="613" text="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="Se8i7aAlIHR1" height="18"/>
726   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="245" showstereotype="1" y="609" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="6cjOGnfKkL4M" height="18"/>
  775 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="458" showstereotype="1" y="613" text="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="WIelcavzEonk" height="18"/>
  776 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="458" showstereotype="1" y="639" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="yam2aMUzLyg0" height="18"/>
727 777 </assocwidget>
  778 + <assocwidget indexa="2" indexb="1" widgetaid="JrepmBDIqpt5" linecolor="none" totalcounta="3" xmi.id="bISJ1T8VPY4v" widgetbid="Jft158ximH8y" totalcountb="2" type="510" linewidth="none">
  779 + <linepath>
  780 + <startpoint startx="516" starty="63"/>
  781 + <endpoint endx="626" endy="78"/>
  782 + <point x="530" y="64"/>
  783 + </linepath>
  784 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="521" showstereotype="1" y="41" text="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="IpPuROcdvbU8" height="18"/>
  785 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="619" showstereotype="1" y="60" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="cT45OpseeFY4" height="18"/>
  786 + </assocwidget>
  787 + <assocwidget indexa="3" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="6" xmi.id="pphLhemI7qLT" widgetbid="CyAWgunfYOu4" totalcountb="2" type="501" linewidth="none">
  788 + <linepath>
  789 + <startpoint startx="299" starty="291"/>
  790 + <endpoint endx="179" endy="349"/>
  791 + <point x="179" y="291"/>
  792 + </linepath>
  793 + </assocwidget>
  794 + <assocwidget indexa="1" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="6" xmi.id="TDU5sD54E92E" widgetbid="qFnI6mQPRHOU" totalcountb="2" type="501" linewidth="none">
  795 + <linepath>
  796 + <startpoint startx="299" starty="234"/>
  797 + <endpoint endx="142" endy="199"/>
  798 + <point x="142" y="234"/>
  799 + </linepath>
  800 + </assocwidget>
728 801 </associations>
729 802 </diagram>
730 803 </diagrams>
... ... @@ -746,7 +819,7 @@
746 819 </UML:Model>
747 820 </XMI.content>
748 821 <XMI.extensions xmi.extender="umbrello">
749   - <docsettings viewid="LivcEe3649X1" uniqueid="kps2XaWjxILB" documentation=""/>
  822 + <docsettings viewid="LivcEe3649X1" uniqueid="qLyzPc0qqStg" documentation=""/>
750 823 <listview>
751 824 <listitem open="1" type="800" id="Views">
752 825 <listitem open="1" type="801" id="Logical View">
753 826  
... ... @@ -804,10 +877,19 @@
804 877 <listitem open="0" type="814" id="sLkv5IBFw5Kr"/>
805 878 <listitem open="0" type="814" id="Vc1gHVf7pQ2s"/>
806 879 </listitem>
  880 + <listitem open="1" type="813" id="Jft158ximH8y">
  881 + <listitem open="0" type="814" id="nXCm7mwd2bOe"/>
  882 + <listitem open="0" type="814" id="lnLAJP3dec1i"/>
  883 + <listitem open="0" type="814" id="CX1tEZW7yMkj"/>
  884 + </listitem>
807 885 <listitem open="1" type="813" id="JWDdehHvWvjI">
808 886 <listitem open="0" type="814" id="iC8cHSUDoffC"/>
809 887 <listitem open="0" type="814" id="5yf1ano5Opmf"/>
810 888 </listitem>
  889 + <listitem open="1" type="813" id="CyAWgunfYOu4">
  890 + <listitem open="0" type="814" id="e9fXkAft9szU"/>
  891 + <listitem open="0" type="814" id="2147pQZTbej2"/>
  892 + </listitem>
811 893 <listitem open="1" type="813" id="an76wmD6d9AN">
812 894 <listitem open="0" type="814" id="kT1UkY4rfa5e"/>
813 895 <listitem open="0" type="814" id="1Q075SLa2rQm"/>
... ... @@ -839,6 +921,10 @@
839 921 <listitem open="0" type="814" id="VHBTNHhwr7G7"/>
840 922 <listitem open="0" type="814" id="DlOEvisprZ8k"/>
841 923 </listitem>
  924 + <listitem open="1" type="813" id="qFnI6mQPRHOU">
  925 + <listitem open="0" type="814" id="E35x2gPAwjO2"/>
  926 + <listitem open="0" type="814" id="39wCXCzZB3g1"/>
  927 + </listitem>
842 928 <listitem open="1" type="813" id="4i4b5BkoCPyn"/>
843 929 <listitem open="1" type="813" id="8Vu4Hrb8golj"/>
844 930 <listitem open="1" type="813" id="3o2H8oL0ircy"/>
845 931  
... ... @@ -855,10 +941,11 @@
855 941 <listitem open="1" type="813" id="xg2HZ89UTSe9">
856 942 <listitem open="0" type="814" id="TT1F82F8gHxU"/>
857 943 </listitem>
858   - <listitem open="0" type="830" id="Datatypes">
  944 + <listitem open="1" type="830" id="Datatypes">
859 945 <listitem open="1" type="829" id="XT9G38k8Vh3T"/>
860 946 <listitem open="1" type="829" id="5PxxxWWUqjGq"/>
861 947 <listitem open="1" type="829" id="6aMgotUEBgWz"/>
  948 + <listitem open="1" type="829" id="9HdN5R731t3c"/>
862 949 <listitem open="1" type="829" id="j1fAd2kkA44b"/>
863 950 <listitem open="1" type="829" id="IOGfkFP0mMfT"/>
864 951 <listitem open="1" type="829" id="2kfs2jaY2kSV"/>