Commit 4775e5d3526457857c9cce885badfb149cd69ce5

Authored by Aníbal Pacheco
1 parent baef7e74a9
Exists in master

Corrección de inconsistencias con borrador final, ronda 1

Showing 2 changed files with 46 additions and 44 deletions Side-by-side Diff

direccionesV01p01.xsd View file @ 4775e5d
... ... @@ -225,7 +225,7 @@
225 225 <sequence>
226 226 <element maxOccurs="unbounded" minOccurs="0" name="SolaresCatastrales" type="tns:TipoSolarCatastral" />
227 227 <element maxOccurs="1" minOccurs="1" name="LocalidadCatastral" type="tns:TipoLocalidadCatastral" />
228   - <element maxOccurs="1" minOccurs="1" name="Numero" type="int" />
  228 + <element maxOccurs="1" minOccurs="1" name="Numero" type="tns:Alfanumerico-5" />
229 229 <element maxOccurs="1" minOccurs="0" name="Geometria">
230 230 <complexType>
231 231 <sequence>
... ... @@ -289,7 +289,7 @@
289 289 <complexType name="TipoDireccionInterna">
290 290 <sequence>
291 291 <element maxOccurs="1" minOccurs="0" name="Senda" type="string" />
292   - <element maxOccurs="1" minOccurs="0" name="Block" type="tns:Alfanumerico-50" />
  292 + <element maxOccurs="1" minOccurs="0" name="Bloque" type="tns:Alfanumerico-50" />
293 293 <element maxOccurs="1" minOccurs="0" name="Torre" type="tns:Alfanumerico-50" />
294 294 <element maxOccurs="1" minOccurs="0" name="Piso" type="tns:Alfanumerico-50" />
295 295 <element maxOccurs="1" minOccurs="0" name="Unidad" type="tns:Alfanumerico-50" />
modelo_conceptual.xmi View file @ 4775e5d
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<XMI verified="false" xmi.version="1.2" timestamp="2012-06-01T17:16:57" xmlns:UML="http://schema.omg.org/spec/UML/1.3">
  2 +<XMI verified="false" xmi.version="1.2" timestamp="2012-06-05T16:05:09" 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>
... ... @@ -51,6 +51,7 @@
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 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)"/>
  54 + <UML:DataType stereotype="datatype" visibility="public" isSpecification="false" namespace="Datatypes" isAbstract="false" isLeaf="false" elementReference="BaZFOwbCP9LS" isRoot="false" xmi.id="IQ4xU5xIkwtw" name="Alfanumerico(2)"/>
54 55 </UML:Namespace.ownedElement>
55 56 </UML:Package>
56 57 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="tTM8hIy8GNaf" name="Direccion">
... ... @@ -76,7 +77,7 @@
76 77 </UML:Class>
77 78 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="JrepmBDIqpt5" name="Departamento">
78 79 <UML:Classifier.feature>
79   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="yuvmCS9ivIww" type="5PxxxWWUqjGq" name="Codigo"/>
  80 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="yuvmCS9ivIww" type="IQ4xU5xIkwtw" name="Codigo"/>
80 81 <UML:Attribute visibility="public" isSpecification="false" xmi.id="Pf2uK5LWaGWq" type="XT9G38k8Vh3T" name="Nombre"/>
81 82 <UML:Attribute visibility="public" isSpecification="false" xmi.id="QKCIpDrn5kXG" type="WhcdEhNGTPXc" name="Geometria"/>
82 83 </UML:Classifier.feature>
... ... @@ -307,7 +308,7 @@
307 308 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="B6kIvg1gUhU3" name="DireccionInterna">
308 309 <UML:Classifier.feature>
309 310 <UML:Attribute visibility="public" isSpecification="false" xmi.id="vfSJ6IxQ2ass" type="4vkGhFBaDyav" name="Senda"/>
310   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="ngzobNmAliMT" type="xrosKNLalZGV" name="Block"/>
  311 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="ngzobNmAliMT" type="xrosKNLalZGV" name="Bloque"/>
311 312 <UML:Attribute visibility="public" isSpecification="false" xmi.id="s8pgTEZeKJuD" type="xrosKNLalZGV" name="Torre"/>
312 313 <UML:Attribute visibility="public" isSpecification="false" xmi.id="ytuSbMWO2TAb" type="xrosKNLalZGV" name="Piso"/>
313 314 <UML:Attribute visibility="public" isSpecification="false" xmi.id="rwlcd63VEsBh" type="xrosKNLalZGV" name="Unidad"/>
... ... @@ -511,7 +512,7 @@
511 512 </UML:Class>
512 513 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="CyAWgunfYOu4" name="ManzanaCatastral">
513 514 <UML:Classifier.feature>
514   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="e9fXkAft9szU" type="gCEBGjygXMqu" name="Numero"/>
  515 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="e9fXkAft9szU" type="OLmI3FTsVcJv" name="Numero"/>
515 516 <UML:Attribute visibility="public" isSpecification="false" xmi.id="2147pQZTbej2" type="WhcdEhNGTPXc" name="Geometria"/>
516 517 </UML:Classifier.feature>
517 518 </UML:Class>
... ... @@ -592,7 +593,7 @@
592 593 </UML:Namespace.ownedElement>
593 594 <XMI.extension xmi.extender="umbrello">
594 595 <diagrams>
595   - <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="782" canvaswidth="1266" 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">
  596 + <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="782" 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">
596 597 <widgets>
597 598 <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="523" showattsigs="601" showstereotype="1" y="222" showattributes="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" width="250" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="tTM8hIy8GNaf" showscope="1" height="105" showopsigs="601"/>
598 599 <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="248" showattsigs="601" showstereotype="1" y="83" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="176" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="BtctkDrlM8Ug" showscope="1" height="63" showopsigs="601"/>
... ... @@ -613,7 +614,7 @@
613 614 <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="660" showattsigs="601" showstereotype="1" y="107" showattributes="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" width="194" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="an76wmD6d9AN" showscope="1" height="63" showopsigs="601"/>
614 615 <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="672" showattsigs="601" showstereotype="1" y="681" showattributes="1" font="Sans Serif,9,-1,0,75,0,0,0,0,0" width="337" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="SSn60ti0Hi7M" showscope="1" height="49" showopsigs="601"/>
615 616 <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="16" showattsigs="601" showstereotype="1" y="128" showattributes="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" width="194" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="Jft158ximH8y" showscope="1" height="63" showopsigs="601"/>
616   - <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="120" showattsigs="601" showstereotype="1" y="449" showattributes="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="CyAWgunfYOu4" showscope="1" height="49" showopsigs="601"/>
  617 + <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="107" showattsigs="601" showstereotype="1" y="454" showattributes="1" font="Sans Serif,9,-1,5,75,0,0,0,0,0" width="181" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="CyAWgunfYOu4" showscope="1" height="49" showopsigs="601"/>
617 618 <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="176" showattsigs="601" showstereotype="1" y="224" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="qFnI6mQPRHOU" showscope="1" height="49" showopsigs="601"/>
618 619 </widgets>
619 620 <messages/>
... ... @@ -678,8 +679,8 @@
678 679 <endpoint endx="1121" endy="515"/>
679 680 <point x="1167" y="515"/>
680 681 </linepath>
681   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="1148" showstereotype="1" y="348" 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="c7nHwapZ0ZAG" height="18"/>
682   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="1122" showstereotype="1" y="497" 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="YJtz6dhYlFRs" height="18"/>
  682 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="1148" showstereotype="1" y="348" 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="mTA18pfTDebB" height="18"/>
  683 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="1122" showstereotype="1" y="497" 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="E5HKel4FattO" height="18"/>
683 684 </assocwidget>
684 685 <assocwidget indexa="3" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="8" xmi.id="u04Qom3cEViN" widgetbid="6wPQBVstQYw3" totalcountb="2" type="501" linewidth="none">
685 686 <linepath>
... ... @@ -707,9 +708,9 @@
707 708 <startpoint startx="692" starty="327"/>
708 709 <endpoint endx="692" endy="496"/>
709 710 </linepath>
710   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="694" showstereotype="1" y="454" text="DireccionInterna" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="703" width="108" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="VtFseuGHz2Yu" height="18"/>
711   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="694" showstereotype="1" y="348" text="1..N" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="33" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="cLRdvbtTukSy" height="18"/>
712   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="693" showstereotype="1" y="479" 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="N8W6NvysmElP" height="18"/>
  711 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="694" showstereotype="1" y="454" text="DireccionInterna" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="703" width="108" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="Owzu9gAu9JvF" height="18"/>
  712 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="694" showstereotype="1" y="348" text="1..N" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="33" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="6ZiHDIRQNik1" height="18"/>
  713 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="693" showstereotype="1" y="479" 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="RmE1d6N12Mv9" height="18"/>
713 714 </assocwidget>
714 715 <assocwidget indexa="3" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="5" xmi.id="w0Z5ax6axb3g" widgetbid="9xmfrTwvPUo7" totalcountb="2" type="501" linewidth="none">
715 716 <linepath>
... ... @@ -729,9 +730,9 @@
729 730 <startpoint startx="1097" starty="330"/>
730 731 <endpoint endx="1097" endy="480"/>
731 732 </linepath>
732   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="1023" showstereotype="1" y="410" 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="6zg51CzeYQFR" height="18"/>
733   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="1100" showstereotype="1" y="333" 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="06usoLr9TLFq" height="18"/>
734   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="1098" showstereotype="1" y="459" 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="FDh1PQOTP4ZR" height="18"/>
  733 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="1023" showstereotype="1" y="410" 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="243CLzRRY8hj" height="18"/>
  734 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="1100" showstereotype="1" y="333" 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="Q87lqrnHbzGE" height="18"/>
  735 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="1098" showstereotype="1" y="459" 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="5dF509F2BGCW" height="18"/>
735 736 </assocwidget>
736 737 <assocwidget indexa="1" indexb="1" widgetaid="BtctkDrlM8Ug" linecolor="none" totalcounta="3" xmi.id="ZW1vOR74z6tq" widgetbid="JrepmBDIqpt5" totalcountb="3" type="510" linewidth="none">
737 738 <linepath>
738 739  
739 740  
... ... @@ -739,24 +740,24 @@
739 740 <endpoint endx="511" endy="63"/>
740 741 <point x="511" y="109"/>
741 742 </linepath>
742   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="429" showstereotype="1" y="86" 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="FW3lvGCtK6l8" height="18"/>
743   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="495" showstereotype="1" y="66" 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="PaHswUhBhOA5" height="18"/>
  743 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="429" showstereotype="1" y="86" 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="DcvlicT6karY" height="18"/>
  744 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="495" showstereotype="1" y="66" 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="Qcn1c3GfhTjh" height="18"/>
744 745 </assocwidget>
745 746 <assocwidget indexa="1" indexb="1" widgetaid="JrepmBDIqpt5" linecolor="none" totalcounta="3" xmi.id="wSYw991iByO4" widgetbid="UGLwdsYoj8hU" totalcountb="2" type="510" linewidth="none">
746 747 <linepath>
747 748 <startpoint startx="603" starty="23"/>
748 749 <endpoint endx="851" endy="23"/>
749 750 </linepath>
750   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="619" showstereotype="1" y="5" 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="oZYBb5aocbZV" height="18"/>
751   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="832" showstereotype="1" y="7" 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="rlO9s9HHkW8e" height="18"/>
  751 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="619" showstereotype="1" y="5" 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="awhlCsFQUB9A" height="18"/>
  752 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="832" showstereotype="1" y="7" 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="laGU952ZiqaI" height="18"/>
752 753 </assocwidget>
753 754 <assocwidget indexa="1" indexb="3" widgetaid="xg2HZ89UTSe9" linecolor="none" totalcounta="2" xmi.id="33WRqx8ehYyk" widgetbid="9xmfrTwvPUo7" totalcountb="4" type="503" linewidth="none">
754 755 <linepath>
755 756 <startpoint startx="1200" starty="576"/>
756 757 <endpoint endx="1200" endy="330"/>
757 758 </linepath>
758   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="1202" showstereotype="1" y="556" 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="0ppgBxlxUH66" height="18"/>
759   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="1204" showstereotype="1" y="333" 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="NhsxISS8DqH3" height="18"/>
  759 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="1202" showstereotype="1" y="556" 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="rovYGeDqYtal" height="18"/>
  760 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="1204" showstereotype="1" y="333" 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="ln9DyGLirbA0" height="18"/>
760 761 </assocwidget>
761 762 <assocwidget indexa="4" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="5" xmi.id="3BaBClOzRqz2" widgetbid="an76wmD6d9AN" totalcountb="2" type="501" linewidth="none">
762 763 <linepath>
... ... @@ -770,8 +771,8 @@
770 771 <endpoint endx="753" endy="107"/>
771 772 <point x="753" y="40"/>
772 773 </linepath>
773   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="622" showstereotype="1" y="46" 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="xXLf3RJ2E6iP" height="18"/>
774   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="736" showstereotype="1" y="84" 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="4RKWgQa37TyO" height="18"/>
  774 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="622" showstereotype="1" y="46" 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="eCXM07cquWO8" height="18"/>
  775 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="736" showstereotype="1" y="84" 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="AawjTWSCKbNG" height="18"/>
775 776 </assocwidget>
776 777 <assocwidget indexa="5" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="8" xmi.id="1yvbfORhpxwl" widgetbid="SSn60ti0Hi7M" totalcountb="2" type="503" linewidth="none">
777 778 <linepath>
778 779  
... ... @@ -779,17 +780,17 @@
779 780 <endpoint endx="672" endy="690"/>
780 781 <point x="619" y="690"/>
781 782 </linepath>
782   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="620" showstereotype="1" y="328" 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="vQW8ElCAIVpK" height="18"/>
783   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="654" showstereotype="1" y="672" 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="u9K8D0VFPpm5" height="18"/>
  783 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="620" showstereotype="1" y="328" 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="piwgH6evHBGH" height="18"/>
  784 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="654" showstereotype="1" y="672" 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="Hq79MUHV2DEV" height="18"/>
784 785 </assocwidget>
785 786 <assocwidget indexa="1" indexb="1" widgetaid="B6kIvg1gUhU3" linecolor="none" totalcounta="2" xmi.id="WdDLZA6Wj9qJ" widgetbid="SSn60ti0Hi7M" totalcountb="2" type="503" linewidth="none">
786 787 <linepath>
787 788 <startpoint startx="754" starty="615"/>
788 789 <endpoint endx="754" endy="681"/>
789 790 </linepath>
790   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="648" showstereotype="1" y="649" text="Coordenadas" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="703" width="86" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="DM7Jp5hiUBpi" height="18"/>
791   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="756" showstereotype="1" y="617" 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="u1sBUgVOpnU2" height="18"/>
792   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="758" showstereotype="1" y="662" 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="nzGCm2HzOMGC" height="18"/>
  791 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="648" showstereotype="1" y="649" text="Coordenadas" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="703" width="86" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="ief2D2G2iDhx" height="18"/>
  792 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="756" showstereotype="1" y="617" 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="JLsaV6qkvvtH" height="18"/>
  793 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="758" showstereotype="1" y="662" 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="N8mPLys3cV3n" height="18"/>
793 794 </assocwidget>
794 795 <assocwidget indexa="1" indexb="1" widgetaid="JrepmBDIqpt5" linecolor="none" totalcounta="2" xmi.id="bISJ1T8VPY4v" widgetbid="Jft158ximH8y" totalcountb="2" type="510" linewidth="none">
795 796 <linepath>
... ... @@ -797,8 +798,8 @@
797 798 <endpoint endx="118" endy="128"/>
798 799 <point x="118" y="40"/>
799 800 </linepath>
800   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="398" showstereotype="1" y="17" 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="Sxuw6jc1iVCA" height="18"/>
801   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="120" showstereotype="1" y="109" 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="BfWySyyFxEPj" height="18"/>
  801 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="398" showstereotype="1" y="17" 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="VIqDVVAmo1LJ" height="18"/>
  802 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="120" showstereotype="1" y="109" 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="59102uGO22nM" height="18"/>
802 803 </assocwidget>
803 804 <assocwidget indexa="1" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="5" xmi.id="TDU5sD54E92E" widgetbid="qFnI6mQPRHOU" totalcountb="2" type="501" linewidth="none">
804 805 <linepath>
805 806  
806 807  
807 808  
808 809  
809 810  
810 811  
... ... @@ -818,39 +819,39 @@
818 819 <startpoint startx="376" starty="482"/>
819 820 <endpoint endx="376" endy="406"/>
820 821 </linepath>
821   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="379" showstereotype="1" y="452" 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="Eehb1xnTtfNx" height="18"/>
822   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="376" showstereotype="1" y="409" 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="Nzw3S8CblgZB" height="18"/>
  822 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="379" showstereotype="1" y="452" 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="zeNZ9PNfhBqA" height="18"/>
  823 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="376" showstereotype="1" y="409" 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="gzuSyDk3Ml2N" height="18"/>
823 824 </assocwidget>
824 825 <assocwidget indexa="2" indexb="1" widgetaid="Jft158ximH8y" linecolor="none" totalcounta="3" xmi.id="a56QInX9m5Ef" widgetbid="CyAWgunfYOu4" totalcountb="4" type="510" linewidth="none">
825 826 <linepath>
826 827 <startpoint startx="149" starty="191"/>
827   - <endpoint endx="149" endy="449"/>
  828 + <endpoint endx="149" endy="454"/>
828 829 </linepath>
829   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="128" showstereotype="1" y="197" 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="fWOainKxSzYT" height="18"/>
830   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="131" showstereotype="1" y="427" 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="uJunwHjHEfJh" height="18"/>
  830 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="128" showstereotype="1" y="197" 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="gIlgKW2HAQrI" height="18"/>
  831 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="131" showstereotype="1" y="432" 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="pCxWNle1kYTi" height="18"/>
831 832 </assocwidget>
832 833 <assocwidget indexa="2" indexb="3" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="5" xmi.id="29tZvAToysQp" widgetbid="CyAWgunfYOu4" totalcountb="4" type="501" linewidth="none">
833 834 <linepath>
834 835 <startpoint startx="523" starty="288"/>
835   - <endpoint endx="254" endy="449"/>
  836 + <endpoint endx="254" endy="454"/>
836 837 <point x="254" y="288"/>
837 838 </linepath>
838 839 </assocwidget>
839 840 <assocwidget indexa="2" indexb="1" widgetaid="CyAWgunfYOu4" linecolor="none" totalcounta="4" xmi.id="kex27YIwpTgg" widgetbid="qFnI6mQPRHOU" totalcountb="2" type="510" linewidth="none">
840 841 <linepath>
841   - <startpoint startx="202" starty="449"/>
  842 + <startpoint startx="202" starty="454"/>
842 843 <endpoint endx="202" endy="273"/>
843 844 </linepath>
844   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="208" showstereotype="1" y="426" 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="mTIX9qhmM5N4" height="18"/>
845   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="207" showstereotype="1" y="278" 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="tfzJeVkYoeKj" height="18"/>
  845 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="208" showstereotype="1" y="431" 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="mDk6zmTd4CJM" height="18"/>
  846 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="207" showstereotype="1" y="278" 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="jMerkT9Xf610" height="18"/>
846 847 </assocwidget>
847 848 <assocwidget indexa="1" indexb="1" widgetaid="Jft158ximH8y" linecolor="none" totalcounta="3" xmi.id="Ru31JQW6jVUY" widgetbid="4wYvkPyCfH8G" totalcountb="2" type="510" linewidth="none">
848 849 <linepath>
849 850 <startpoint startx="62" starty="191"/>
850 851 <endpoint endx="62" endy="548"/>
851 852 </linepath>
852   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="39" showstereotype="1" y="202" 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="t1y7gHoQk5ws" height="18"/>
853   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="46" showstereotype="1" y="528" 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="vdeHi1JZgHsI" height="18"/>
  853 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="39" showstereotype="1" y="202" 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="qf1aDSHxe14b" height="18"/>
  854 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="46" showstereotype="1" y="528" 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="nVEriVBPppGZ" height="18"/>
854 855 </assocwidget>
855 856 </associations>
856 857 </diagram>
... ... @@ -873,7 +874,7 @@
873 874 </UML:Model>
874 875 </XMI.content>
875 876 <XMI.extensions xmi.extender="umbrello">
876   - <docsettings viewid="LivcEe3649X1" uniqueid="mapZE9I58GDo" documentation=""/>
  877 + <docsettings viewid="LivcEe3649X1" uniqueid="IQ4xU5xIkwtw" documentation=""/>
877 878 <listview>
878 879 <listitem open="1" type="800" id="Views">
879 880 <listitem open="1" type="801" id="Logical View">
... ... @@ -1000,7 +1001,7 @@
1000 1001 <listitem open="1" type="813" id="xg2HZ89UTSe9">
1001 1002 <listitem open="0" type="814" id="TT1F82F8gHxU"/>
1002 1003 </listitem>
1003   - <listitem open="0" type="830" id="Datatypes">
  1004 + <listitem open="1" type="830" id="Datatypes">
1004 1005 <listitem open="1" type="829" id="XT9G38k8Vh3T"/>
1005 1006 <listitem open="1" type="829" id="5PxxxWWUqjGq"/>
1006 1007 <listitem open="1" type="829" id="6aMgotUEBgWz"/>
... ... @@ -1008,6 +1009,7 @@
1008 1009 <listitem open="1" type="829" id="j1fAd2kkA44b"/>
1009 1010 <listitem open="1" type="829" id="IOGfkFP0mMfT"/>
1010 1011 <listitem open="1" type="829" id="2kfs2jaY2kSV"/>
  1012 + <listitem open="1" type="829" id="IQ4xU5xIkwtw"/>
1011 1013 <listitem open="1" type="829" id="xJzBOwv8UelF"/>
1012 1014 <listitem open="1" type="829" id="yLDTOQJUye8m"/>
1013 1015 <listitem open="1" type="829" id="PhXZlZ9gs6sF"/>