Commit bb2fcddc76db712a9262a6801d081e5ccf7993ad

Authored by Aníbal Pacheco
1 parent 9766b7b714
Exists in master

Actualizacion luego de reunion final

Showing 1 changed file with 56 additions and 64 deletions Side-by-side Diff

modelo_conceptual.xmi View file @ bb2fcdd
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<XMI verified="false" xmi.version="1.2" timestamp="2011-06-14T15:40:50" xmlns:UML="http://schema.omg.org/spec/UML/1.3">
  2 +<XMI verified="false" xmi.version="1.2" timestamp="2011-06-15T15:09:50" 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>
... ... @@ -303,6 +303,7 @@
303 303 </UML:Association>
304 304 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="B6kIvg1gUhU3" name="SubDireccion">
305 305 <UML:Classifier.feature>
  306 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="vfSJ6IxQ2ass" type="4vkGhFBaDyav" name="senda"/>
306 307 <UML:Attribute visibility="public" isSpecification="false" xmi.id="ngzobNmAliMT" type="xrosKNLalZGV" name="block"/>
307 308 <UML:Attribute visibility="public" isSpecification="false" xmi.id="s8pgTEZeKJuD" type="xrosKNLalZGV" name="torre"/>
308 309 <UML:Attribute visibility="public" isSpecification="false" xmi.id="ytuSbMWO2TAb" type="xrosKNLalZGV" name="piso"/>
309 310  
... ... @@ -390,9 +391,9 @@
390 391 <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="1" xmi.id="b3b9OfR8RgEx" type="9xmfrTwvPUo7" name="" aggregation="none"/>
391 392 </UML:Association.connection>
392 393 </UML:Association>
393   - <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="yFOQUsTK4hoX" name="Entrecalle izq">
  394 + <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="yFOQUsTK4hoX" name="Entrecalles">
394 395 <UML:Association.connection>
395   - <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="1" xmi.id="JJyexqSw2ehp" type="9xmfrTwvPUo7" name="" aggregation="none"/>
  396 + <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="0..2" xmi.id="JJyexqSw2ehp" type="9xmfrTwvPUo7" name="" aggregation="none"/>
396 397 <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="*" xmi.id="jsxBNzJLCfkg" type="nqgOB6HFGZ5m" name="" aggregation="none"/>
397 398 </UML:Association.connection>
398 399 </UML:Association>
399 400  
400 401  
... ... @@ -469,15 +470,15 @@
469 470 <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="47" showattsigs="601" showstereotype="1" y="110" 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"/>
470 471 <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"/>
471 472 <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="662" showattsigs="601" showstereotype="1" y="568" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="192" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="skIV1Qm93oyo" showscope="1" height="49" showopsigs="601"/>
472   - <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="375" showattsigs="601" showstereotype="1" y="416" 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"/>
  473 + <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="374" showattsigs="601" showstereotype="1" y="396" 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"/>
473 474 <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"/>
474 475 <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"/>
475 476 <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"/>
476 477 <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="44" showattsigs="601" showstereotype="1" y="418" 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"/>
477 478 <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="44" showattsigs="601" showstereotype="1" y="493" 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"/>
478   - <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="347" showattsigs="601" showstereotype="1" y="524" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="236" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="B6kIvg1gUhU3" showscope="1" height="119" showopsigs="601"/>
  479 + <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="347" showattsigs="601" showstereotype="1" y="498" showattributes="1" font="Sans Serif,9,-1,0,75,0,0,0,0,0" width="236" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="B6kIvg1gUhU3" showscope="1" height="133" showopsigs="601"/>
479 480 <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="44" showattsigs="601" showstereotype="1" y="349" 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"/>
480   - <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="929" showattsigs="601" showstereotype="1" y="383" 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"/>
  481 + <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="922" showattsigs="601" showstereotype="1" y="391" 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"/>
481 482 <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="876" showattsigs="601" showstereotype="1" y="163" showattributes="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" width="218" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="KZG5QMEvjqxe" showscope="1" height="35" showopsigs="601"/>
482 483 </widgets>
483 484 <messages/>
484 485  
... ... @@ -488,16 +489,16 @@
488 489 <endpoint endx="769" endy="141"/>
489 490 <point x="769" y="145"/>
490 491 </linepath>
491   - <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="YsdE0HJCG2xX" height="18"/>
492   - <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="MMUheZYpis4v" height="18"/>
  492 + <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="XW9RvKY5w7Zj" height="18"/>
  493 + <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="Y7YihjTkY1On" height="18"/>
493 494 </assocwidget>
494 495 <assocwidget indexa="1" indexb="2" widgetaid="9xmfrTwvPUo7" linecolor="none" totalcounta="2" xmi.id="RwCbXCCXurNw" widgetbid="v3uyqqkK5a0o" totalcountb="3" type="503" linewidth="none">
495 496 <linepath>
496 497 <startpoint startx="832" starty="272"/>
497 498 <endpoint endx="832" endy="141"/>
498 499 </linepath>
499   - <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="ef5sHlhqcK2a" height="18"/>
500   - <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="bLmpMjMg6oOi" height="18"/>
  500 + <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="JJBt00rVWzwQ" height="18"/>
  501 + <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="JSVDZ2w57Uoo" height="18"/>
501 502 </assocwidget>
502 503 <assocwidget indexa="5" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="6" xmi.id="5BrTJmYUl7f8" widgetbid="skIV1Qm93oyo" totalcountb="3" type="501" linewidth="none">
503 504 <linepath>
... ... @@ -514,7 +515,7 @@
514 515 <assocwidget indexa="4" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="6" xmi.id="2bh04anWmWtq" widgetbid="UFqijWWsUGXL" totalcountb="2" type="501" linewidth="none">
515 516 <linepath>
516 517 <startpoint startx="469" starty="327"/>
517   - <endpoint endx="469" endy="416"/>
  518 + <endpoint endx="469" endy="396"/>
518 519 </linepath>
519 520 </assocwidget>
520 521 <assocwidget indexa="1" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="5" xmi.id="AVQuzHiT3vtQ" widgetbid="7e2rlhJ4EUgq" totalcountb="2" type="501" linewidth="none">
521 522  
522 523  
523 524  
... ... @@ -554,14 +555,14 @@
554 555 <point x="340" y="64"/>
555 556 </linepath>
556 557 </assocwidget>
557   - <assocwidget indexa="4" indexb="1" widgetaid="9xmfrTwvPUo7" linecolor="none" totalcounta="5" xmi.id="h8hLBh6xWoje" widgetbid="nqgOB6HFGZ5m" totalcountb="2" type="510" linewidth="none">
  558 + <assocwidget indexa="2" indexb="1" widgetaid="9xmfrTwvPUo7" linecolor="none" totalcounta="4" xmi.id="h8hLBh6xWoje" widgetbid="nqgOB6HFGZ5m" totalcountb="2" type="510" linewidth="none">
558 559 <linepath>
559   - <startpoint startx="873" starty="321"/>
  560 + <startpoint startx="844" starty="321"/>
560 561 <endpoint endx="805" endy="458"/>
561   - <point x="873" y="458"/>
  562 + <point x="844" y="458"/>
562 563 </linepath>
563   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="851" showstereotype="1" y="330" 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="LwV3oZxQE2IU" height="18"/>
564   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="811" showstereotype="1" y="439" 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="mzIOHKyreig0" height="18"/>
  564 + <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="CFXkFvWWChPC" height="18"/>
  565 + <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="fFhCEcaV45jc" height="18"/>
565 566 </assocwidget>
566 567 <assocwidget indexa="1" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="6" xmi.id="u04Qom3cEViN" widgetbid="6wPQBVstQYw3" totalcountb="2" type="501" linewidth="none">
567 568 <linepath>
... ... @@ -577,7 +578,7 @@
577 578 <point x="328" y="518"/>
578 579 </linepath>
579 580 </assocwidget>
580   - <assocwidget indexa="3" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="4" xmi.id="90prHJZw6f0C" widgetbid="nqgOB6HFGZ5m" totalcountb="4" type="501" linewidth="none">
  581 + <assocwidget indexa="3" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="4" xmi.id="90prHJZw6f0C" widgetbid="nqgOB6HFGZ5m" totalcountb="3" type="501" linewidth="none">
581 582 <linepath>
582 583 <startpoint startx="553" starty="308"/>
583 584 <endpoint endx="667" endy="437"/>
584 585  
585 586  
586 587  
587 588  
588 589  
... ... @@ -589,26 +590,26 @@
589 590 <startpoint startx="739" starty="472"/>
590 591 <endpoint endx="739" endy="568"/>
591 592 </linepath>
592   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="741" showstereotype="1" y="475" text="0..1" 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="P3gTr2BDzhEl" height="18"/>
593   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="742" showstereotype="1" y="549" 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="EBCRCStySBMh" height="18"/>
  593 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="741" showstereotype="1" y="475" text="0..1" 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="5fhC8VyIjV2y" height="18"/>
  594 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="742" showstereotype="1" y="549" 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="OYUbErlt4R3I" height="18"/>
594 595 </assocwidget>
595   - <assocwidget indexa="1" indexb="3" widgetaid="skIV1Qm93oyo" linecolor="none" totalcounta="2" xmi.id="OGLzSLNsoP5t" widgetbid="9xmfrTwvPUo7" totalcountb="5" type="503" linewidth="none">
  596 + <assocwidget indexa="1" indexb="3" widgetaid="skIV1Qm93oyo" linecolor="none" totalcounta="2" xmi.id="OGLzSLNsoP5t" widgetbid="9xmfrTwvPUo7" totalcountb="4" type="503" linewidth="none">
596 597 <linepath>
597   - <startpoint startx="854" starty="593"/>
598   - <endpoint endx="889" endy="321"/>
599   - <point x="889" y="593"/>
  598 + <startpoint startx="854" starty="595"/>
  599 + <endpoint endx="877" endy="321"/>
  600 + <point x="877" y="595"/>
600 601 </linepath>
601   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="894" showstereotype="1" y="526" text="Vía de Referencia" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="703" width="111" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="VIY7yF7NImr7" height="18"/>
602   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="857" showstereotype="1" y="574" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="m2KjhXVugfLs" height="18"/>
603   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="894" showstereotype="1" y="327" text="0..1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="32" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="5EqXNADqQlyO" height="18"/>
  602 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="881" showstereotype="1" y="522" text="Vía de Referencia" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="703" width="111" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="1dm5gThl6PxE" height="18"/>
  603 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="857" showstereotype="1" y="576" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="swWbPXXo5zNH" height="18"/>
  604 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="882" showstereotype="1" y="327" text="0..1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="32" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="r69vVCCWowcS" height="18"/>
604 605 </assocwidget>
605 606 <assocwidget indexa="3" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="6" xmi.id="wZ8M1u9f6AQT" widgetbid="B6kIvg1gUhU3" totalcountb="3" type="510" linewidth="none">
606 607 <linepath>
607 608 <startpoint startx="361" starty="327"/>
608   - <endpoint endx="361" endy="524"/>
  609 + <endpoint endx="361" endy="498"/>
609 610 </linepath>
610   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="364" 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="03mGpdMadeJJ" height="18"/>
611   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="363" showstereotype="1" y="505" 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="BmDsRWkXib25" height="18"/>
  611 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="364" 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="PJEVg9iZ3C8R" height="18"/>
  612 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="362" showstereotype="1" y="480" 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="jgFnfa2UgBOA" height="18"/>
612 613 </assocwidget>
613 614 <assocwidget indexa="2" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="4" xmi.id="w0Z5ax6axb3g" widgetbid="9xmfrTwvPUo7" totalcountb="2" type="501" linewidth="none">
614 615 <linepath>
615 616  
616 617  
617 618  
618 619  
... ... @@ -622,29 +623,19 @@
622 623 <endpoint endx="204" endy="349"/>
623 624 </linepath>
624 625 </assocwidget>
625   - <assocwidget indexa="3" indexb="1" widgetaid="nqgOB6HFGZ5m" linecolor="none" totalcounta="4" xmi.id="joF6VICJXJV3" widgetbid="9xmfrTwvPUo7" totalcountb="5" type="503" linewidth="none">
  626 + <assocwidget indexa="1" indexb="2" widgetaid="9xmfrTwvPUo7" linecolor="none" totalcounta="4" xmi.id="yFOQUsTK4hoX" widgetbid="nqgOB6HFGZ5m" totalcountb="3" type="503" linewidth="none">
626 627 <linepath>
627   - <startpoint startx="777" starty="437"/>
628   - <endpoint endx="777" endy="316"/>
629   - <point x="777" y="316"/>
  628 + <startpoint startx="785" starty="321"/>
  629 + <endpoint endx="785" endy="437"/>
630 630 </linepath>
631   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="778" showstereotype="1" y="368" text="Entrecalle der" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="703" width="92" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="jFvAztYzxIEk" height="18"/>
632   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="780" showstereotype="1" y="415" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="taKVEcoOOzGo" height="18"/>
633   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="759" showstereotype="1" y="296" text="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="VyLDZLGHZBRY" height="18"/>
  631 + <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="v2xToJfiORef" height="18"/>
  632 + <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="J0draN2j9gX6" height="18"/>
  633 + <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="iVOK8pO1pLUc" height="18"/>
634 634 </assocwidget>
635   - <assocwidget indexa="2" indexb="2" widgetaid="9xmfrTwvPUo7" linecolor="none" totalcounta="5" xmi.id="yFOQUsTK4hoX" widgetbid="nqgOB6HFGZ5m" totalcountb="4" type="503" linewidth="none">
636   - <linepath>
637   - <startpoint startx="766" starty="321"/>
638   - <endpoint endx="766" endy="437"/>
639   - </linepath>
640   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="674" showstereotype="1" y="369" text="Entrecalle izq" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="703" width="89" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="3xVyEhg7F1cU" height="18"/>
641   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="747" showstereotype="1" y="323" 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="dOszN6ns463c" height="18"/>
642   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="749" showstereotype="1" y="415" 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="SHtzRIVUD0QR" height="18"/>
643   - </assocwidget>
644 635 <assocwidget indexa="2" indexb="1" widgetaid="B6kIvg1gUhU3" linecolor="none" totalcounta="3" xmi.id="jWbih5XSFvh0" widgetbid="UFqijWWsUGXL" totalcountb="2" type="503" linewidth="none">
645 636 <linepath>
646   - <startpoint startx="452" starty="524"/>
647   - <endpoint endx="452" endy="479"/>
  637 + <startpoint startx="452" starty="498"/>
  638 + <endpoint endx="452" endy="459"/>
648 639 </linepath>
649 640 </assocwidget>
650 641 <assocwidget indexa="1" indexb="1" widgetaid="BtctkDrlM8Ug" linecolor="none" totalcounta="3" xmi.id="ZW1vOR74z6tq" widgetbid="JrepmBDIqpt5" totalcountb="2" type="510" linewidth="none">
... ... @@ -653,8 +644,8 @@
653 644 <endpoint endx="369" endy="42"/>
654 645 <point x="247" y="42"/>
655 646 </linepath>
656   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="240" showstereotype="1" y="19" 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="g6Zv59NgYDgt" height="18"/>
657   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="354" showstereotype="1" y="25" 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="JTkOaly03rzU" height="18"/>
  647 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="240" showstereotype="1" y="19" 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="f7I3YwgrvHgV" height="18"/>
  648 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="354" showstereotype="1" y="25" 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="chElNmq6FEON" height="18"/>
658 649 </assocwidget>
659 650 <assocwidget indexa="1" indexb="1" widgetaid="JrepmBDIqpt5" linecolor="none" totalcounta="2" xmi.id="wSYw991iByO4" widgetbid="UGLwdsYoj8hU" totalcountb="2" type="510" linewidth="none">
660 651 <linepath>
... ... @@ -662,8 +653,8 @@
662 653 <endpoint endx="616" endy="57"/>
663 654 <point x="615" y="57"/>
664 655 </linepath>
665   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="548" showstereotype="1" y="32" 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="7UwKSMm8QJ4W" height="18"/>
666   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="602" showstereotype="1" y="39" 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="QPCwdsqwMaIu" height="18"/>
  656 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="548" showstereotype="1" y="32" 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="1nOr6qRlyjmU" height="18"/>
  657 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="602" showstereotype="1" y="39" 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="eQKZg02IfG23" height="18"/>
667 658 </assocwidget>
668 659 <assocwidget indexa="1" indexb="1" widgetaid="UGLwdsYoj8hU" linecolor="none" totalcounta="2" xmi.id="oFsAUjbRPciw" widgetbid="v3uyqqkK5a0o" totalcountb="2" type="503" linewidth="none">
669 660 <linepath>
670 661  
671 662  
672 663  
673 664  
... ... @@ -671,26 +662,26 @@
671 662 <endpoint endx="875" endy="106"/>
672 663 <point x="875" y="49"/>
673 664 </linepath>
674   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="815" showstereotype="1" y="28" 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="JEuM3roALkVl" height="18"/>
675   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="877" 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="4FuTWwzuLBrw" height="18"/>
  665 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="815" showstereotype="1" y="28" 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="0s7E4VZ3GysL" height="18"/>
  666 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="877" 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="mJ4i1rBfFVCv" height="18"/>
676 667 </assocwidget>
677 668 <assocwidget indexa="1" indexb="2" widgetaid="xg2HZ89UTSe9" linecolor="none" totalcounta="3" xmi.id="33WRqx8ehYyk" widgetbid="9xmfrTwvPUo7" totalcountb="3" type="503" linewidth="none">
678 669 <linepath>
679   - <startpoint startx="978" starty="383"/>
  670 + <startpoint startx="978" starty="391"/>
680 671 <endpoint endx="918" endy="305"/>
681 672 <point x="978" y="305"/>
682 673 </linepath>
683   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="962" showstereotype="1" y="364" 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="2ftMD9GWO8tR" height="18"/>
684   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="921" showstereotype="1" y="308" 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="zfaIQ53SIxtm" height="18"/>
  674 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="962" showstereotype="1" y="372" 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="TEE9SEAR4Hf8" height="18"/>
  675 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="921" showstereotype="1" y="308" 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="kEBzA4KvLOdM" height="18"/>
685 676 </assocwidget>
686 677 <assocwidget indexa="2" indexb="2" widgetaid="xg2HZ89UTSe9" linecolor="none" totalcounta="3" xmi.id="0gawd74veI04" widgetbid="KZG5QMEvjqxe" totalcountb="3" type="503" linewidth="none">
687 678 <linepath>
688   - <startpoint startx="991" starty="383"/>
  679 + <startpoint startx="991" starty="391"/>
689 680 <endpoint endx="991" endy="198"/>
690 681 </linepath>
691   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="996" showstereotype="1" y="295" text="AbrevGenerica" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="703" width="96" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="el7d03gk5jh6" height="18"/>
692   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="993" showstereotype="1" y="364" 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="rsgB2X72CyOP" height="18"/>
693   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="993" showstereotype="1" y="202" 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="6cuUinthSTzq" height="18"/>
  682 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="996" showstereotype="1" y="299" text="AbrevGenerica" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="703" width="96" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="DozTHBMjPYsq" height="18"/>
  683 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="993" showstereotype="1" y="372" 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="m2HqHuwz68yH" height="18"/>
  684 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="993" showstereotype="1" y="202" 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="AIATfnqsapJp" height="18"/>
694 685 </assocwidget>
695 686 <assocwidget indexa="1" indexb="1" widgetaid="9xmfrTwvPUo7" linecolor="none" totalcounta="3" xmi.id="6ufiCfmprjDt" widgetbid="KZG5QMEvjqxe" totalcountb="3" type="503" linewidth="none">
696 687 <linepath>
... ... @@ -698,9 +689,9 @@
698 689 <endpoint endx="978" endy="198"/>
699 690 <point x="978" y="291"/>
700 691 </linepath>
701   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="873" showstereotype="1" y="230" text="AbrevEspecifica" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="703" width="104" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="doU0IhKuSRXQ" height="18"/>
702   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="920" showstereotype="1" y="272" 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="W2HoyAYn1Fw3" height="18"/>
703   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="964" showstereotype="1" y="202" 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="m45x0RK61EYj" height="18"/>
  692 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="873" showstereotype="1" y="230" text="AbrevEspecifica" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="703" width="104" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="1eYOCOCzOTpf" height="18"/>
  693 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="920" showstereotype="1" y="272" 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="LmfSsbh0srTX" height="18"/>
  694 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="964" showstereotype="1" y="202" 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="cHNA7f06JWSV" height="18"/>
704 695 </assocwidget>
705 696 </associations>
706 697 </diagram>
... ... @@ -723,7 +714,7 @@
723 714 </UML:Model>
724 715 </XMI.content>
725 716 <XMI.extensions xmi.extender="umbrello">
726   - <docsettings viewid="LivcEe3649X1" uniqueid="doU0IhKuSRXQ" documentation=""/>
  717 + <docsettings viewid="LivcEe3649X1" uniqueid="vfSJ6IxQ2ass" documentation=""/>
727 718 <listview>
728 719 <listitem open="1" type="800" id="Views">
729 720 <listitem open="1" type="801" id="Logical View">
... ... @@ -801,6 +792,7 @@
801 792 <listitem open="0" type="814" id="DlOEvisprZ8k"/>
802 793 </listitem>
803 794 <listitem open="1" type="813" id="B6kIvg1gUhU3">
  795 + <listitem open="0" type="814" id="vfSJ6IxQ2ass"/>
804 796 <listitem open="0" type="814" id="ngzobNmAliMT"/>
805 797 <listitem open="0" type="814" id="s8pgTEZeKJuD"/>
806 798 <listitem open="0" type="814" id="ytuSbMWO2TAb"/>