Commit 94af4b419b08c811f343ea28d742b48be8c00d91

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

Actualizaciones según último borrador (r27)

Showing 4 changed files with 423 additions and 205 deletions Side-by-side Diff

DireccionesXMLSchema.xsd View file @ 94af4b4
... ... @@ -3,8 +3,16 @@
3 3 xmlns="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://metadatos.pge.red.uy/direcciones.xsd"
4 4 xmlns:iso="http://metadatos.pge.red.uy/iso_3166-1.xsd" xmlns:gml="http://www.opengis.net/gml">
5 5 <import schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/geometryBasic0d1d.xsd" namespace="http://www.opengis.net/gml"/>
  6 + <import schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/geometryBasic2d.xsd" namespace="http://www.opengis.net/gml"/>
6 7 <import schemaLocation="iso_3166-1.xsd" namespace="http://metadatos.pge.red.uy/iso_3166-1.xsd"/>
7 8  
  9 + <!--
  10 + El foco de las instancias que implementen este esquema debe ser la direccion, por lo tanto este
  11 + esquema no sigue estrictamente el modelo conceptual en cuanto a las restricciones que en combinación
  12 + con las restricciones que se desprenden de las formas canónicas generarían redundancia de datos,
  13 + un ejemplo es la representación de Pais tanto en la dirección como en el departamento.
  14 + -->
  15 +
8 16 <element name="Direcciones" type="tns:DireccionList"/>
9 17  
10 18 <complexType name="DireccionList">
11 19  
12 20  
13 21  
14 22  
15 23  
16 24  
17 25  
18 26  
19 27  
20 28  
21 29  
22 30  
23 31  
24 32  
25 33  
26 34  
27 35  
28 36  
29 37  
30 38  
31 39  
32 40  
33 41  
34 42  
35 43  
36 44  
37 45  
38 46  
... ... @@ -13,179 +21,247 @@
13 21 </sequence>
14 22 </complexType>
15 23  
16   - <complexType name="Barrio">
  24 + <complexType name="Pais">
17 25 <sequence>
  26 + <element maxOccurs="1" minOccurs="1" name="codigo" type="iso:ISOCountryCode"/>
18 27 <element maxOccurs="1" minOccurs="0" name="nombre" type="string"/>
19   - <element maxOccurs="unbounded" minOccurs="0" name="alias" type="string"/>
  28 + <element maxOccurs="1" minOccurs="0" name="geometria">
  29 + <complexType>
  30 + <sequence>
  31 + <element ref="gml:_GeometricPrimitive"/>
  32 + </sequence>
  33 + </complexType>
  34 + </element>
20 35 </sequence>
21 36 </complexType>
22 37  
23   - <complexType name="DireccionType">
  38 + <complexType name="Departamento">
  39 + <sequence>
  40 + <element minOccurs="1" maxOccurs="1" name="codigo">
  41 + <simpleType>
  42 + <restriction base="NMTOKEN">
  43 + <enumeration value="AR"></enumeration>
  44 + <enumeration value="CA"></enumeration>
  45 + <enumeration value="CL"></enumeration>
  46 + <enumeration value="CO"></enumeration>
  47 + <enumeration value="DU"></enumeration>
  48 + <enumeration value="FS"></enumeration>
  49 + <enumeration value="FD"></enumeration>
  50 + <enumeration value="LA"></enumeration>
  51 + <enumeration value="MA"></enumeration>
  52 + <enumeration value="MO"></enumeration>
  53 + <enumeration value="PA"></enumeration>
  54 + <enumeration value="RN"></enumeration>
  55 + <enumeration value="RV"></enumeration>
  56 + <enumeration value="RO"></enumeration>
  57 + <enumeration value="SA"></enumeration>
  58 + <enumeration value="SJ"></enumeration>
  59 + <enumeration value="SO"></enumeration>
  60 + <enumeration value="TA"></enumeration>
  61 + <enumeration value="TT"></enumeration>
  62 + </restriction>
  63 + </simpleType>
  64 + </element>
  65 + <element maxOccurs="1" minOccurs="1" name="pais" type="tns:Pais"/>
  66 + <element maxOccurs="1" minOccurs="0" name="nombre" type="string"/>
  67 + <element maxOccurs="1" minOccurs="0" name="geometria">
  68 + <complexType>
  69 + <sequence>
  70 + <element ref="gml:_GeometricPrimitive"/>
  71 + </sequence>
  72 + </complexType>
  73 + </element>
  74 + </sequence>
  75 + </complexType>
  76 +
  77 + <complexType name="Municipio">
24 78 <sequence>
25   - <element maxOccurs="1" minOccurs="1" name="pais" type="iso:ISOCountryCode"/>
26   - <element maxOccurs="1" minOccurs="0" name="departamento" type="tns:Departamento"/>
27   - <element maxOccurs="1" minOccurs="0" name="localidadCatastral" type="tns:LocalidadCatastral"/>
28   - <element maxOccurs="1" minOccurs="0" name="localidad" type="tns:Localidad"/>
29   - <element maxOccurs="1" minOccurs="0" name="manzanaCatastral" type="int"/>
30   - <element maxOccurs="1" minOccurs="0" name="manzana" type="int"/>
31   - <element maxOccurs="1" minOccurs="0" name="padron" type="int"/>
32   - <element maxOccurs="1" minOccurs="0" name="solarCatastral" type="int"/>
33   - <element maxOccurs="1" minOccurs="0" name="solar" type="int"/>
34   - <element maxOccurs="1" minOccurs="0" name="numero" type="string"/>
35   - <element maxOccurs="1" minOccurs="0" name="letra" type="string"/>
36   - <element maxOccurs="1" minOccurs="0" name="kilometro" type="string"/>
37   - <element maxOccurs="1" minOccurs="0" name="nombreInmueble" type="string"/>
38   - <element maxOccurs="unbounded" minOccurs="0" name="referencia" type="tns:Referencia"/>
39   - <element maxOccurs="unbounded" minOccurs="0" name="subDireccion" type="tns:SubDireccion"/>
40   - <element maxOccurs="1" minOccurs="1" name="codigoPostal" type="int"/>
41   - <element maxOccurs="1" minOccurs="0" name="barrio" type="tns:Barrio"/>
42   - <element maxOccurs="1" minOccurs="0" name="seccionPolicial" type="int"/>
43   - <element maxOccurs="1" minOccurs="0" name="seccionJudicial" type="int"/>
44   - <element maxOccurs="1" minOccurs="0" name="entidadColectiva" type="tns:EntidadColectiva"/>
45   - <element maxOccurs="1" minOccurs="0" name="descripcion" type="string"/>
46   - <element maxOccurs="1" minOccurs="0" name="viaTransito" type="tns:ViaTransito"/>
47   - <element maxOccurs="1" minOccurs="0" name="tramoVia" type="tns:TramoVia"/>
48   - <element maxOccurs="1" minOccurs="0" name="criterioGeocod" type="tns:CriterioGeocod"/>
49   - <element maxOccurs="1" minOccurs="0" name="coordenadas">
  79 + <element maxOccurs="1" minOccurs="1" name="codigo" type="string"/>
  80 + <element maxOccurs="1" minOccurs="1" name="departamento" type="tns:Departamento"/>
  81 + <element maxOccurs="1" minOccurs="0" name="nombre" type="string"/>
  82 + </sequence>
  83 + </complexType>
  84 +
  85 + <complexType name="Localidad">
  86 + <sequence>
  87 + <element maxOccurs="1" minOccurs="1" name="codigo" type="string"/>
  88 + <element maxOccurs="1" minOccurs="1" name="departamento" type="tns:Departamento"/>
  89 + <element maxOccurs="1" minOccurs="0" name="nombre" type="string"/>
  90 + <element maxOccurs="unbounded" minOccurs="0" name="alias" type="string"/>
  91 + <element maxOccurs="1" minOccurs="0" name="geometria">
50 92 <complexType>
51 93 <sequence>
52   - <element ref="gml:Point"/>
  94 + <element ref="gml:_GeometricPrimitive"/>
53 95 </sequence>
54 96 </complexType>
55 97 </element>
56 98 </sequence>
57 99 </complexType>
58 100  
59   - <complexType name="SubDireccion">
  101 + <complexType name="LocalidadCatastral">
60 102 <sequence>
61   - <element maxOccurs="1" minOccurs="0" name="senda" type="string"/>
62   - <element maxOccurs="1" minOccurs="0" name="block" type="string"/>
63   - <element maxOccurs="1" minOccurs="0" name="torre" type="string"/>
64   - <element maxOccurs="1" minOccurs="0" name="piso" type="string"/>
65   - <element maxOccurs="1" minOccurs="0" name="apartamento" type="string"/>
66   - <element maxOccurs="1" minOccurs="0" name="descripcion" type="string"/>
67   - <element maxOccurs="1" minOccurs="0" name="criterioGeocod" type="tns:CriterioGeocod"/>
68   - <element maxOccurs="1" minOccurs="0" name="coordenadas">
  103 + <element maxOccurs="1" minOccurs="1" name="codigo" type="string"/>
  104 + <element maxOccurs="1" minOccurs="1" name="departamento" type="tns:Departamento"/>
  105 + <element maxOccurs="1" minOccurs="0" name="nombre" type="string"/>
  106 + <element maxOccurs="1" minOccurs="0" name="geometria">
69 107 <complexType>
70 108 <sequence>
71   - <element ref="gml:Point"/>
  109 + <element ref="gml:_GeometricPrimitive"/>
72 110 </sequence>
73 111 </complexType>
74 112 </element>
75 113 </sequence>
76 114 </complexType>
77   -
78   - <complexType name="ViaTransito">
  115 +
  116 + <complexType name="Barrio">
79 117 <sequence>
80 118 <element maxOccurs="1" minOccurs="0" name="nombre" type="string"/>
81   - <element maxOccurs="1" minOccurs="0" name="numeroRuta" type="int"/>
82 119 <element maxOccurs="unbounded" minOccurs="0" name="alias" type="string"/>
83   - <element maxOccurs="1" minOccurs="0" name="vialidad" type="tns:Vialidad"/>
84   - <element maxOccurs="unbounded" minOccurs="0" name="abrevEspecifica" type="string"/>
  120 + <element maxOccurs="1" minOccurs="0" name="geometria">
  121 + <complexType>
  122 + <sequence>
  123 + <element ref="gml:_GeometricPrimitive"/>
  124 + </sequence>
  125 + </complexType>
  126 + </element>
85 127 </sequence>
86 128 </complexType>
87 129  
88   - <complexType name="Referencia">
  130 + <complexType name="Manzana">
89 131 <sequence>
90   - <element maxOccurs="1" minOccurs="0" name="tipo" type="tns:TipoReferencia"/>
91   - <element maxOccurs="1" minOccurs="0" name="cuantificador" type="int"/>
92   - <element maxOccurs="1" minOccurs="0" name="viaReferencia" type="tns:ViaTransito"/>
  132 + <element maxOccurs="1" minOccurs="1" name="numero" type="int"/>
  133 + <element maxOccurs="1" minOccurs="0" name="geometria">
  134 + <complexType>
  135 + <sequence>
  136 + <element ref="gml:_GeometricPrimitive"/>
  137 + </sequence>
  138 + </complexType>
  139 + </element>
93 140 </sequence>
94 141 </complexType>
95 142  
96   - <simpleType name="TipoReferencia">
97   - <restriction base="string">
98   - <enumeration value="PARALELA"/>
99   - </restriction>
100   - </simpleType>
  143 + <complexType name="ManzanaCatastral">
  144 + <sequence>
  145 + <element maxOccurs="1" minOccurs="1" name="numero" type="int"/>
  146 + <element maxOccurs="1" minOccurs="0" name="geometria">
  147 + <complexType>
  148 + <sequence>
  149 + <element ref="gml:_GeometricPrimitive"/>
  150 + </sequence>
  151 + </complexType>
  152 + </element>
  153 + </sequence>
  154 + </complexType>
101 155  
102   - <complexType name="TramoVia">
  156 + <complexType name="Padron">
103 157 <sequence>
104   - <element maxOccurs="1" minOccurs="0" name="via" type="tns:ViaTransito"/>
105   - <element maxOccurs="2" minOccurs="0" name="entrecalles" type="tns:ViaTransito"/>
  158 + <element maxOccurs="1" minOccurs="1" name="numero" type="string"/>
  159 + <element maxOccurs="1" minOccurs="0" name="unidadCatastral" type="string"/>
  160 + <element maxOccurs="1" minOccurs="0" name="geometria">
  161 + <complexType>
  162 + <sequence>
  163 + <element ref="gml:_GeometricPrimitive"/>
  164 + </sequence>
  165 + </complexType>
  166 + </element>
106 167 </sequence>
107 168 </complexType>
108 169  
109   - <complexType name="Vialidad">
  170 + <complexType name="Solar">
110 171 <sequence>
111   - <element maxOccurs="1" minOccurs="0" name="tipo" type="tns:TipoVialidad"/>
112   - <element maxOccurs="unbounded" minOccurs="0" name="abrevGenerica" type="string"/>
  172 + <element maxOccurs="1" minOccurs="1" name="numero" type="int"/>
  173 + <element maxOccurs="1" minOccurs="0" name="geometria">
  174 + <complexType>
  175 + <sequence>
  176 + <element ref="gml:_GeometricPrimitive"/>
  177 + </sequence>
  178 + </complexType>
  179 + </element>
113 180 </sequence>
114 181 </complexType>
115 182  
116   - <simpleType name="Departamento">
117   - <restriction base="NMTOKEN">
118   - <enumeration value="AR"></enumeration>
119   - <enumeration value="CA"></enumeration>
120   - <enumeration value="CL"></enumeration>
121   - <enumeration value="CO"></enumeration>
122   - <enumeration value="DU"></enumeration>
123   - <enumeration value="FS"></enumeration>
124   - <enumeration value="FD"></enumeration>
125   - <enumeration value="LA"></enumeration>
126   - <enumeration value="MA"></enumeration>
127   - <enumeration value="MO"></enumeration>
128   - <enumeration value="PA"></enumeration>
129   - <enumeration value="RN"></enumeration>
130   - <enumeration value="RV"></enumeration>
131   - <enumeration value="RO"></enumeration>
132   - <enumeration value="SA"></enumeration>
133   - <enumeration value="SJ"></enumeration>
134   - <enumeration value="SO"></enumeration>
135   - <enumeration value="TA"></enumeration>
136   - <enumeration value="TT"></enumeration>
137   - </restriction>
138   - </simpleType>
  183 + <complexType name="SolarCatastral">
  184 + <sequence>
  185 + <element maxOccurs="1" minOccurs="1" name="numero" type="int"/>
  186 + <element maxOccurs="1" minOccurs="0" name="geometria">
  187 + <complexType>
  188 + <sequence>
  189 + <element ref="gml:_GeometricPrimitive"/>
  190 + </sequence>
  191 + </complexType>
  192 + </element>
  193 + </sequence>
  194 + </complexType>
139 195  
140   - <simpleType final="list" name="TipoVialidad">
  196 + <simpleType final="list" name="TipoParidad">
141 197 <restriction base="string">
142   - <enumeration value="AVENIDA"/>
143   - <enumeration value="BOULEVARD"/>
144   - <enumeration value="CALLE"/>
145   - <enumeration value="CALLEJON"/>
146   - <enumeration value="CALZADA"/>
147   - <enumeration value="CAMINO"/>
148   - <enumeration value="CIRCUNVALACION"/>
149   - <enumeration value="CONTINUACION"/>
150   - <enumeration value="CORREDOR"/>
151   - <enumeration value="DIAGONAL"/>
152   - <enumeration value="PASAJE"/>
153   - <enumeration value="PEATONAL"/>
154   - <enumeration value="PROLONGACION"/>
155   - <enumeration value="PUENTE"/>
156   - <enumeration value="RAMBLA"/>
157   - <enumeration value="RUTA"/>
158   - <enumeration value="TUNEL"/>
159   - <enumeration value="VIADUCTO"/>
  198 + <enumeration value="Izquierda"/>
  199 + <enumeration value="Derecha"/>
160 200 </restriction>
161   - </simpleType>
162   -
163   - <complexType name="Localidad">
  201 + </simpleType>
  202 +
  203 + <complexType name="DireccionInterna">
164 204 <sequence>
165   - <element maxOccurs="1" minOccurs="0" name="codigo" type="string"/>
166   - <element maxOccurs="1" minOccurs="0" name="nombre" type="string"/>
167   - <element maxOccurs="unbounded" minOccurs="0" name="alias" type="string"/>
  205 + <element maxOccurs="1" minOccurs="0" name="senda" type="string"/>
  206 + <element maxOccurs="1" minOccurs="0" name="block" type="string"/>
  207 + <element maxOccurs="1" minOccurs="0" name="torre" type="string"/>
  208 + <element maxOccurs="1" minOccurs="0" name="piso" type="string"/>
  209 + <element maxOccurs="1" minOccurs="0" name="unidad" type="string"/>
  210 + <element maxOccurs="1" minOccurs="0" name="descripcion" type="string"/>
  211 + <element maxOccurs="1" minOccurs="0" name="coordenadas" type="tns:Coordenada"/>
168 212 </sequence>
169 213 </complexType>
170   -
171   - <complexType name="EntidadColectiva">
  214 +
  215 + <complexType name="CodigoPostal">
172 216 <sequence>
173   - <element maxOccurs="1" minOccurs="0" name="tipo" type="tns:TipoEntidadColectiva"/>
174   - <element maxOccurs="1" minOccurs="0" name="nombre" type="string"/>
  217 + <element maxOccurs="1" minOccurs="1" name="numero" type="int"/>
  218 + <element maxOccurs="1" minOccurs="0" name="geometria">
  219 + <complexType>
  220 + <sequence>
  221 + <element ref="gml:_GeometricPrimitive"/>
  222 + </sequence>
  223 + </complexType>
  224 + </element>
175 225 </sequence>
176 226 </complexType>
177   -
  227 +
  228 + <complexType name="SeccionPolicial">
  229 + <sequence>
  230 + <element maxOccurs="1" minOccurs="1" name="numero" type="int"/>
  231 + <element maxOccurs="1" minOccurs="0" name="geometria">
  232 + <complexType>
  233 + <sequence>
  234 + <element ref="gml:_GeometricPrimitive"/>
  235 + </sequence>
  236 + </complexType>
  237 + </element>
  238 + </sequence>
  239 + </complexType>
  240 +
  241 + <complexType name="SeccionJudicial">
  242 + <sequence>
  243 + <element maxOccurs="1" minOccurs="1" name="numero" type="int"/>
  244 + <element maxOccurs="1" minOccurs="0" name="geometria">
  245 + <complexType>
  246 + <sequence>
  247 + <element ref="gml:_GeometricPrimitive"/>
  248 + </sequence>
  249 + </complexType>
  250 + </element>
  251 + </sequence>
  252 + </complexType>
  253 +
178 254 <simpleType final="list" name="TipoEntidadColectiva">
179 255 <restriction base="string">
180 256 <enumeration value="AEROPUERTO"/>
181 257 <enumeration value="ASENTAMIENTO IRREGULAR"/>
182   - <enumeration value="BARRIO PRIVADO"/>
183 258 <enumeration value="CENTRO COMERICAL"/>
184 259 <enumeration value="CENTRO LOGÍSTICO"/>
185 260 <enumeration value="COMPLEJO SOCIAL - DEPORTIVO"/>
186 261 <enumeration value="COMPLEJO DE VIVIENDAS"/>
187 262 <enumeration value="PARQUE INDUSTRIAL"/>
188 263 <enumeration value="TERMINAL DE ÓMNIBUS"/>
  264 + <enumeration value="URBANIZACIÓN DE PROPIEDAD HORIZONTAL (UPH)"/>
189 265 <enumeration value="ZONA FRANCA"/>
190 266 <enumeration value="ZONA MILITAR"/>
191 267 <enumeration value="ZONA PORTUARIA"/>
192 268  
193 269  
... ... @@ -193,18 +269,128 @@
193 269 </restriction>
194 270 </simpleType>
195 271  
196   - <simpleType name="CriterioGeocod">
  272 + <complexType name="EntidadColectiva">
  273 + <sequence>
  274 + <element maxOccurs="1" minOccurs="0" name="tipo" type="tns:TipoEntidadColectiva"/>
  275 + <element maxOccurs="1" minOccurs="0" name="nombre" type="string"/>
  276 + <element maxOccurs="unbounded" minOccurs="0" name="direccionInterna" type="tns:DireccionInterna"/>
  277 + <element maxOccurs="1" minOccurs="0" name="geometria">
  278 + <complexType>
  279 + <sequence>
  280 + <element ref="gml:_GeometricPrimitive"/>
  281 + </sequence>
  282 + </complexType>
  283 + </element>
  284 + </sequence>
  285 + </complexType>
  286 +
  287 + <complexType name="Vialidad">
  288 + <sequence>
  289 + <element maxOccurs="1" minOccurs="0" name="tipo">
  290 + <simpleType final="list">
  291 + <restriction base="string">
  292 + <enumeration value="AVENIDA"/>
  293 + <enumeration value="BOULEVARD"/>
  294 + <enumeration value="CALLE"/>
  295 + <enumeration value="CALLEJON"/>
  296 + <enumeration value="CAMINO"/>
  297 + <enumeration value="CIRCUNVALACION"/>
  298 + <enumeration value="CORREDOR"/>
  299 + <enumeration value="DIAGONAL"/>
  300 + <enumeration value="PASAJE"/>
  301 + <enumeration value="PEATONAL"/>
  302 + <enumeration value="PUENTE"/>
  303 + <enumeration value="RAMBLA"/>
  304 + <enumeration value="RUTA"/>
  305 + <enumeration value="SENDA"/>
  306 + <enumeration value="SENDERO"/>
  307 + <enumeration value="SERVIDUMBRE"/>
  308 + <enumeration value="TUNEL"/>
  309 + <enumeration value="VIADUCTO"/>
  310 + </restriction>
  311 + </simpleType>
  312 + </element>
  313 + </sequence>
  314 + </complexType>
  315 +
  316 + <complexType name="ViaCirculacion">
  317 + <sequence>
  318 + <element maxOccurs="1" minOccurs="0" name="numeroRuta" type="int"/>
  319 + <element maxOccurs="1" minOccurs="0" name="nombre" type="string"/>
  320 + <element maxOccurs="unbounded" minOccurs="0" name="alias" type="string"/>
  321 + <element maxOccurs="1" minOccurs="0" name="vialidad" type="tns:Vialidad"/>
  322 + <element maxOccurs="unbounded" minOccurs="0" name="tramo" type="tns:TramoVia"/>
  323 + </sequence>
  324 + </complexType>
  325 +
  326 + <complexType name="TramoVia">
  327 + <sequence>
  328 + <element maxOccurs="1" minOccurs="0" name="via" type="tns:ViaCirculacion"/>
  329 + <element maxOccurs="2" minOccurs="0" name="entrecalles" type="tns:ViaCirculacion"/>
  330 + <element maxOccurs="1" minOccurs="0" name="geometria">
  331 + <complexType>
  332 + <sequence>
  333 + <element ref="gml:_GeometricPrimitive"/>
  334 + </sequence>
  335 + </complexType>
  336 + </element>
  337 + </sequence>
  338 + </complexType>
  339 +
  340 + <simpleType name="TipoCriterioGeocod">
197 341 <restriction base="string">
198   - <enumeration value="0: Punto de entrega del servicio"/>
199   - <enumeration value="1: Sobre la calle frente a la entrega del servicio"/>
200   - <enumeration value="2: Centroide del padrón"/>
201   - <enumeration value="3: Punto arbitario del padrón"/>
202   - <enumeration value="4: Definición Propia"/>
203   - <enumeration value="5: Interpolado"/>
204   - <enumeration value="6: Desconocido"/>
205   - <enumeration value="7: No aplica"/>
  342 + <enumeration value="0: Punto de acceso"/>
  343 + <enumeration value="1: Punto de entrega del servicio"/>
  344 + <enumeration value="2: Sobre la calle frente a la entrega del servicio"/>
  345 + <enumeration value="3: Centroide del padrón"/>
  346 + <enumeration value="4: Punto arbitario del padrón"/>
  347 + <enumeration value="5: Definición Propia"/>
  348 + <enumeration value="6: Interpolado"/>
  349 + <enumeration value="7: Desconocido"/>
206 350 </restriction>
207 351 </simpleType>
208   -
  352 +
  353 + <complexType name="Coordenada">
  354 + <sequence>
  355 + <element maxOccurs="1" minOccurs="1" name="valor">
  356 + <complexType>
  357 + <sequence>
  358 + <element ref="gml:pos"/>
  359 + </sequence>
  360 + </complexType>
  361 + </element>
  362 + <element maxOccurs="1" minOccurs="0" name="criterioGeocod" type="tns:TipoCriterioGeocod"/>
  363 + </sequence>
  364 + </complexType>
  365 +
  366 + <complexType name="DireccionType">
  367 + <sequence>
  368 + <element maxOccurs="1" minOccurs="0" name="pais" type="tns:Pais"/>
  369 + <element maxOccurs="1" minOccurs="0" name="departamento" type="tns:Departamento"/>
  370 + <element maxOccurs="1" minOccurs="0" name="municipio" type="tns:Municipio"/>
  371 + <element maxOccurs="1" minOccurs="0" name="localidad" type="tns:Localidad"/>
  372 + <element maxOccurs="1" minOccurs="0" name="localidadCatastral" type="tns:LocalidadCatastral"/>
  373 + <element maxOccurs="1" minOccurs="0" name="barrio" type="tns:Barrio"/>
  374 + <element maxOccurs="1" minOccurs="0" name="manzana" type="tns:Manzana"/>
  375 + <element maxOccurs="1" minOccurs="0" name="manzanaCatastral" type="tns:ManzanaCatastral"/>
  376 + <element maxOccurs="1" minOccurs="0" name="padron" type="tns:Padron"/>
  377 + <element maxOccurs="1" minOccurs="0" name="solar" type="tns:Solar"/>
  378 + <element maxOccurs="1" minOccurs="0" name="solarCatastral" type="tns:SolarCatastral"/>
  379 + <element maxOccurs="1" minOccurs="0" name="numero" type="int"/>
  380 + <element maxOccurs="1" minOccurs="0" name="letra" type="string"/>
  381 + <element maxOccurs="1" minOccurs="0" name="kilometro" type="float"/>
  382 + <element maxOccurs="1" minOccurs="0" name="nombreInmueble" type="string"/>
  383 + <element maxOccurs="1" minOccurs="0" name="descripcion" type="string"/>
  384 + <element maxOccurs="1" minOccurs="0" name="paridad" type="tns:TipoParidad"/>
  385 + <element maxOccurs="unbounded" minOccurs="0" name="direccionInterna" type="tns:DireccionInterna"/>
  386 + <element maxOccurs="1" minOccurs="1" name="codigoPostal" type="tns:CodigoPostal"/>
  387 + <element maxOccurs="1" minOccurs="0" name="seccionPolicial" type="tns:SeccionPolicial"/>
  388 + <element maxOccurs="1" minOccurs="0" name="seccionJudicial" type="tns:SeccionJudicial"/>
  389 + <element maxOccurs="1" minOccurs="0" name="entidadColectiva" type="tns:EntidadColectiva"/>
  390 + <element maxOccurs="1" minOccurs="0" name="viaCirculacion" type="tns:ViaCirculacion"/>
  391 + <element maxOccurs="1" minOccurs="0" name="tramoVia" type="tns:TramoVia"/>
  392 + <element maxOccurs="unbounded" minOccurs="0" name="coordenadas" type="tns:Coordenada"/>
  393 + </sequence>
  394 + </complexType>
209 395 </schema>
ejemplo1.xml View file @ 94af4b4
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <tns:Direcciones xmlns:gml="http://www.opengis.net/gml" xmlns:tns="http://metadatos.pge.red.uy/direcciones.xsd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://metadatos.pge.red.uy/direcciones.xsd DireccionesXMLSchema.xsd">
3 3 <tns:Direccion>
4   - <tns:pais>UY</tns:pais>
5   - <tns:departamento>MO</tns:departamento>
6 4 <tns:localidad>
7 5 <tns:codigo>MVD</tns:codigo>
  6 + <tns:departamento>
  7 + <tns:codigo>MO</tns:codigo>
  8 + <tns:pais>
  9 + <tns:codigo>UY</tns:codigo>
  10 + </tns:pais>
  11 + </tns:departamento>
8 12 </tns:localidad>
9   - <tns:manzana>0</tns:manzana>
10   - <tns:padron>5019</tns:padron>
11   - <tns:solar>0</tns:solar>
  13 + <tns:barrio>
  14 + <!-- Fuente: Capa de barrios según INE de montevideo.gub.uy -->
  15 + <tns:nombre>CENTRO</tns:nombre>
  16 + <tns:alias></tns:alias>
  17 + <tns:geometria>
  18 + <gml:Polygon>
  19 + <gml:outerBoundaryIs>
  20 + <gml:LinearRing>
  21 + <gml:coordinates>-56.196556987254581,-34.899506944868996 -56.195699816088485,-34.899500410248343 -56.195457773026718,-34.899505616149945 -56.194312460109309,-34.899517930919927 -56.193195143229026,-34.899440016086281 -56.192151658770811,-34.899357372936556 -56.191473186768881,-34.899323255801235 -56.19121815290324,-34.899247365658994 -56.191082401687105,-34.899243245809721 -56.191008894279847,-34.899243455343381 -56.189811446150834,-34.899215313934597 -56.188686938633722,-34.899132871120507 -56.187993009434258,-34.899080750596141 -56.187583916389414,-34.899036836481194 -56.187394773987499,-34.899019342388264 -56.186782901034157,-34.898966983483369 -56.186468195098172,-34.8996709497819 -56.18609519947475,-34.900501272948773 -56.186008493890171,-34.900947702265213 -56.185864552389972,-34.901691749329117 -56.185673256516203,-34.90264324760647 -56.185494669633385,-34.903527105935105 -56.185452122040999,-34.903739050722372 -56.185315214019198,-34.904532653265832 -56.185141710993499,-34.905407482731242 -56.185114250322385,-34.90554727429533 -56.184685057361783,-34.90561157305838 -56.184524092823338,-34.906378200290177 -56.184479956645554,-34.907284215108746 -56.184374409461526,-34.908140825368335 -56.184366139686887,-34.908208452309538 -56.184360189154695,-34.908258045080316 -56.185226888162639,-34.908314208747356 -56.186578940632501,-34.908405056693539 -56.187712425490659,-34.908478479228002 -56.18884935041423,-34.90855638835734 -56.189958561863754,-34.908629858686737 -56.190615263954982,-34.908673059765093 -56.191112264502181,-34.908712205865022 -56.192200982793587,-34.90879022106428 -56.19331914755179,-34.908877155841814 -56.194458495420577,-34.908959512417709 -56.195585213034057,-34.909046401701559 -56.19674475874443,-34.909133185402702 -56.197821519665254,-34.909211184854797 -56.197922819509152,-34.908273451412306 -56.198023452612802,-34.90734022660785 -56.198091204675464,-34.906713567768271 -56.198126760981424,-34.906393473043956 -56.198722263974695,-34.906441315322972 -56.198765327148053,-34.905958949417553 -56.199313583868921,-34.905993405736368 -56.199365817071794,-34.905497492070531 -56.19945974755516,-34.904600340659663 -56.199561249164326,-34.903635563116829 -56.199638417197619,-34.902896202539161 -56.199657297370742,-34.902675308199939 -56.199710995979167,-34.902044182173327 -56.19979493835563,-34.901052413818448 -56.199883246141766,-34.901074690316641 -56.200259016029818,-34.901078098169336 -56.200560184767347,-34.900987077993598 -56.200469102798564,-34.900955796263929 -56.199716038760378,-34.900674062810019 -56.198748925105768,-34.900307317016143 -56.198443106655425,-34.900191027737336 -56.198179761690831,-34.900092641822837 -56.19768838551002,-34.899918300305082 -56.196556987254581,-34.899506944868996</gml:coordinates>
  22 + </gml:LinearRing>
  23 + </gml:outerBoundaryIs>
  24 + </gml:Polygon>
  25 + </tns:geometria>
  26 + </tns:barrio>
  27 + <tns:manzana>
  28 + <tns:numero>0</tns:numero>
  29 + </tns:manzana>
  30 + <tns:padron>
  31 + <tns:numero>5019</tns:numero>
  32 + </tns:padron>
  33 + <tns:solar>
  34 + <tns:numero>0</tns:numero>
  35 + </tns:solar>
12 36 <tns:numero>1365</tns:numero>
13 37 <tns:letra></tns:letra>
14   - <tns:kilometro></tns:kilometro>
15 38 <tns:nombreInmueble></tns:nombreInmueble>
16   - <tns:referencia></tns:referencia>
17   - <tns:subDireccion>
  39 + <tns:direccionInterna>
18 40 <tns:block></tns:block>
19 41 <tns:torre></tns:torre>
20 42 <tns:piso>7</tns:piso>
21   - <tns:apartamento></tns:apartamento>
22   - </tns:subDireccion>
23   - <tns:codigoPostal>11100</tns:codigoPostal>
24   - <tns:barrio>
25   - <tns:nombre>Centro</tns:nombre>
26   - <tns:alias></tns:alias>
27   - </tns:barrio>
28   - <tns:seccionPolicial>0</tns:seccionPolicial>
29   - <tns:seccionJudicial>0</tns:seccionJudicial>
  43 + <tns:unidad></tns:unidad>
  44 + </tns:direccionInterna>
  45 + <tns:codigoPostal>
  46 + <tns:numero>11100</tns:numero>
  47 + </tns:codigoPostal>
30 48 <tns:entidadColectiva>
31 49 <tns:tipo>OTROS</tns:tipo>
32 50 <tns:nombre></tns:nombre>
33 51 </tns:entidadColectiva>
34   - <tns:descripcion></tns:descripcion>
35   - <tns:viaTransito>
36   - <tns:nombre>Andes</tns:nombre>
  52 + <tns:viaCirculacion>
37 53 <tns:numeroRuta>0</tns:numeroRuta>
  54 + <tns:nombre>Andes</tns:nombre>
38 55 <tns:alias></tns:alias>
39 56 <tns:vialidad>
40 57 <tns:tipo>CALLE</tns:tipo>
41 58 </tns:vialidad>
42   - </tns:viaTransito>
43   - <tns:criterioGeocod>0: Punto de entrega del servicio</tns:criterioGeocod>
  59 + </tns:viaCirculacion>
44 60 <tns:coordenadas>
45   - <gml:Point>
  61 + <tns:valor>
46 62 <gml:pos>-56.19 -34.90</gml:pos>
47   - </gml:Point>
  63 + </tns:valor>
  64 + <tns:criterioGeocod>1: Punto de entrega del servicio</tns:criterioGeocod>
48 65 </tns:coordenadas>
49 66 </tns:Direccion>
50 67 <tns:Direccion>
51   - <tns:pais>UY</tns:pais>
52   - <tns:departamento>MO</tns:departamento>
53 68 <tns:localidad>
54 69 <tns:codigo>MVD</tns:codigo>
  70 + <tns:departamento>
  71 + <tns:codigo>MO</tns:codigo>
  72 + <tns:pais>
  73 + <tns:codigo>UY</tns:codigo>
  74 + </tns:pais>
  75 + </tns:departamento>
55 76 </tns:localidad>
56 77 <tns:numero>1366</tns:numero>
57   - <tns:codigoPostal>11100</tns:codigoPostal>
58   - <tns:viaTransito>
  78 + <tns:codigoPostal>
  79 + <tns:numero>11100</tns:numero>
  80 + </tns:codigoPostal>
  81 + <tns:viaCirculacion>
59 82 <tns:nombre>Andes</tns:nombre>
60 83 <tns:vialidad>
61 84 <tns:tipo>CALLE</tns:tipo>
62 85 </tns:vialidad>
63   - </tns:viaTransito>
  86 + </tns:viaCirculacion>
64 87 </tns:Direccion>
65 88 </tns:Direcciones>
ejemplo2.xml View file @ 94af4b4
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <tns:Direcciones xmlns:gml="http://www.opengis.net/gml" xmlns:tns="http://metadatos.pge.red.uy/direcciones.xsd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://metadatos.pge.red.uy/direcciones.xsd DireccionesXMLSchema.xsd">
3 3 <tns:Direccion>
4   - <tns:pais>UY</tns:pais>
5   - <tns:departamento>MO</tns:departamento>
6 4 <tns:localidad>
7 5 <tns:codigo>MVD</tns:codigo>
  6 + <tns:departamento>
  7 + <tns:codigo>MO</tns:codigo>
  8 + <tns:pais>
  9 + <tns:codigo>UY</tns:codigo>
  10 + </tns:pais>
  11 + </tns:departamento>
8 12 </tns:localidad>
9 13 <tns:numero>1365</tns:numero>
10   - <tns:codigoPostal>11100</tns:codigoPostal>
11   - <tns:viaTransito>
  14 + <tns:codigoPostal>
  15 + <tns:numero>11100</tns:numero>
  16 + </tns:codigoPostal>
  17 + <tns:viaCirculacion>
12 18 <tns:nombre>Andes</tns:nombre>
13   - </tns:viaTransito>
  19 + </tns:viaCirculacion>
14 20 <tns:coordenadas>
15   - <gml:Point>
  21 + <tns:valor>
16 22 <gml:pos>-56.19 -34.90</gml:pos>
17   - </gml:Point>
  23 + </tns:valor>
18 24 </tns:coordenadas>
19 25 </tns:Direccion>
20 26 </tns:Direcciones>
modelo_conceptual.xmi View file @ 94af4b4
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<XMI verified="false" xmi.version="1.2" timestamp="2012-02-07T16:44:55" xmlns:UML="http://schema.omg.org/spec/UML/1.3">
  2 +<XMI verified="false" xmi.version="1.2" timestamp="2012-02-23T17:32:44" 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>
... ... @@ -319,7 +319,7 @@
319 319 <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="8F9EiFMMyQ88" type="tTM8hIy8GNaf" name="" aggregation="none"/>
320 320 </UML:Association.connection>
321 321 </UML:Association>
322   - <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="wZ8M1u9f6AQT" name="">
  322 + <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="wZ8M1u9f6AQT" name="direccionInterna">
323 323 <UML:Association.connection>
324 324 <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="1" xmi.id="yv5cdA0jN7x5" type="tTM8hIy8GNaf" name="" aggregation="composite"/>
325 325 <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="*" xmi.id="MJSLiaRe7Zy6" type="B6kIvg1gUhU3" name="" aggregation="none"/>
... ... @@ -482,7 +482,7 @@
482 482 </UML:Association>
483 483 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="SSn60ti0Hi7M" name="Coordenada">
484 484 <UML:Classifier.feature>
485   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="ARwCGMyiGZVP" type="WhcdEhNGTPXc" name="geometria"/>
  485 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="ARwCGMyiGZVP" type="iwXhez2vY6H2" name="coord"/>
486 486 <UML:Attribute visibility="public" isSpecification="false" xmi.id="KOJZGgVg6Jk5" type="4i4b5BkoCPyn" name="criterioGeocod"/>
487 487 </UML:Classifier.feature>
488 488 </UML:Class>
... ... @@ -492,7 +492,7 @@
492 492 <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="*" xmi.id="BjjdcwEdtACY" type="SSn60ti0Hi7M" name="" aggregation="none"/>
493 493 </UML:Association.connection>
494 494 </UML:Association>
495   - <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="WdDLZA6Wj9qJ" name="">
  495 + <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="WdDLZA6Wj9qJ" name="coordenadas">
496 496 <UML:Association.connection>
497 497 <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="1" xmi.id="5lVLvQI69zjj" type="B6kIvg1gUhU3" name="" aggregation="none"/>
498 498 <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="*" xmi.id="tyKm6XJc8Wvh" type="SSn60ti0Hi7M" name="" aggregation="none"/>
499 499  
... ... @@ -542,10 +542,11 @@
542 542 <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="qLyzPc0qqStg" type="qFnI6mQPRHOU" name="" aggregation="none"/>
543 543 </UML:Association.connection>
544 544 </UML:Association>
  545 + <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="iwXhez2vY6H2" name="Position"/>
545 546 </UML:Namespace.ownedElement>
546 547 <XMI.extension xmi.extender="umbrello">
547 548 <diagrams>
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">
  549 + <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="793" canvaswidth="1067" localid="-1" snapcsgrid="0" showgrid="0" showops="1" griddotcolor="#808080" backgroundcolor="#ffffff" usefillcolor="1" fillcolor="#ffffff" zoom="75" xmi.id="LivcEe3649X1" documentation="" showscope="1" snapgrid="0" showatts="1" type="1">
549 550 <widgets>
550 551 <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"/>
551 552 <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"/>
... ... @@ -566,9 +567,9 @@
566 567 <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"/>
567 568 <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"/>
568 569 <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"/>
  570 + <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,50,0,0,0,0,0" width="196" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="Jft158ximH8y" showscope="1" height="63" showopsigs="601"/>
  571 + <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,50,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="CyAWgunfYOu4" showscope="1" height="49" showopsigs="601"/>
  572 + <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,50,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="qFnI6mQPRHOU" showscope="1" height="49" showopsigs="601"/>
572 573 </widgets>
573 574 <messages/>
574 575 <associations>
575 576  
... ... @@ -578,16 +579,16 @@
578 579 <endpoint endx="888" endy="182"/>
579 580 <point x="856" y="182"/>
580 581 </linepath>
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"/>
  582 + <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="d2omcpPqRAvj" height="18"/>
  583 + <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="tXuh0vEJ0Gqf" height="18"/>
583 584 </assocwidget>
584 585 <assocwidget indexa="1" indexb="1" widgetaid="9xmfrTwvPUo7" linecolor="none" totalcounta="2" xmi.id="RwCbXCCXurNw" widgetbid="v3uyqqkK5a0o" totalcountb="2" type="503" linewidth="none">
585 586 <linepath>
586 587 <startpoint startx="938" starty="284"/>
587 588 <endpoint endx="938" endy="194"/>
588 589 </linepath>
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"/>
  590 + <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="AC6Q321g4nRf" height="18"/>
  591 + <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="bqV00PhrucYu" height="18"/>
591 592 </assocwidget>
592 593 <assocwidget indexa="2" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="5" xmi.id="HBC1Iq7Q0Ttn" widgetbid="jRE7u3EmnWHn" totalcountb="2" type="501" linewidth="none">
593 594 <linepath>
... ... @@ -646,8 +647,8 @@
646 647 <endpoint endx="805" endy="458"/>
647 648 <point x="844" y="458"/>
648 649 </linepath>
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"/>
  650 + <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="VkBVy298EDWI" height="18"/>
  651 + <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="FVwHINurDQqB" height="18"/>
651 652 </assocwidget>
652 653 <assocwidget indexa="2" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="7" xmi.id="u04Qom3cEViN" widgetbid="6wPQBVstQYw3" totalcountb="2" type="501" linewidth="none">
653 654 <linepath>
... ... @@ -675,8 +676,9 @@
675 676 <startpoint startx="400" starty="324"/>
676 677 <endpoint endx="400" endy="492"/>
677 678 </linepath>
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"/>
  679 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="402" showstereotype="1" y="461" text="direccionInterna" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="703" width="107" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="QOR03NZyG0iS" height="18"/>
  680 + <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="nX2h7YZdIk6G" height="18"/>
  681 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="385" 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="mFM1SsHfNBxe" height="18"/>
680 682 </assocwidget>
681 683 <assocwidget indexa="3" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="5" xmi.id="w0Z5ax6axb3g" widgetbid="9xmfrTwvPUo7" totalcountb="2" type="501" linewidth="none">
682 684 <linepath>
683 685  
... ... @@ -695,14 +697,14 @@
695 697 <startpoint startx="785" starty="333"/>
696 698 <endpoint endx="785" endy="437"/>
697 699 </linepath>
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"/>
  700 + <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="ZrTkFJw2pwhu" height="18"/>
  701 + <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="VGXl1e0nrMmI" height="18"/>
  702 + <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="D1xaDsEkigUx" height="18"/>
701 703 </assocwidget>
702 704 <assocwidget indexa="2" indexb="1" widgetaid="B6kIvg1gUhU3" linecolor="none" totalcounta="3" xmi.id="jWbih5XSFvh0" widgetbid="UFqijWWsUGXL" totalcountb="2" type="503" linewidth="none">
703 705 <linepath>
704   - <startpoint startx="452" starty="492"/>
705   - <endpoint endx="452" endy="434"/>
  706 + <startpoint startx="568" starty="492"/>
  707 + <endpoint endx="568" endy="434"/>
706 708 </linepath>
707 709 </assocwidget>
708 710 <assocwidget indexa="1" indexb="1" widgetaid="BtctkDrlM8Ug" linecolor="none" totalcounta="2" xmi.id="ZW1vOR74z6tq" widgetbid="JrepmBDIqpt5" totalcountb="3" type="510" linewidth="none">
... ... @@ -711,8 +713,8 @@
711 713 <endpoint endx="340" endy="17"/>
712 714 <point x="133" y="17"/>
713 715 </linepath>
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"/>
  716 + <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="zQymLfhouCZv" height="18"/>
  717 + <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="oXgguTy7Stff" height="18"/>
716 718 </assocwidget>
717 719 <assocwidget indexa="1" indexb="1" widgetaid="JrepmBDIqpt5" linecolor="none" totalcounta="3" xmi.id="wSYw991iByO4" widgetbid="UGLwdsYoj8hU" totalcountb="2" type="510" linewidth="none">
718 720 <linepath>
... ... @@ -720,8 +722,8 @@
720 722 <endpoint endx="676" endy="31"/>
721 723 <point x="617" y="31"/>
722 724 </linepath>
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"/>
  725 + <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="msPUYsPXGNIb" height="18"/>
  726 + <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="1zPvBxo0UUeM" height="18"/>
725 727 </assocwidget>
726 728 <assocwidget indexa="1" indexb="1" widgetaid="UGLwdsYoj8hU" linecolor="none" totalcounta="2" xmi.id="oFsAUjbRPciw" widgetbid="v3uyqqkK5a0o" totalcountb="2" type="503" linewidth="none">
727 729 <linepath>
... ... @@ -730,8 +732,8 @@
730 732 <point x="882" y="10"/>
731 733 <point x="937" y="10"/>
732 734 </linepath>
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"/>
  735 + <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="vaTOT73FzRhX" height="18"/>
  736 + <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="J52ZQKBRHYKT" height="18"/>
735 737 </assocwidget>
736 738 <assocwidget indexa="1" indexb="3" widgetaid="xg2HZ89UTSe9" linecolor="none" totalcounta="2" xmi.id="33WRqx8ehYyk" widgetbid="9xmfrTwvPUo7" totalcountb="4" type="503" linewidth="none">
737 739 <linepath>
... ... @@ -739,8 +741,8 @@
739 741 <endpoint endx="890" endy="333"/>
740 742 <point x="890" y="548"/>
741 743 </linepath>
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"/>
  744 + <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="V8R0d5MYdow6" height="18"/>
  745 + <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="tyKsNzNg4PDV" height="18"/>
744 746 </assocwidget>
745 747 <assocwidget indexa="2" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="4" xmi.id="3BaBClOzRqz2" widgetbid="an76wmD6d9AN" totalcountb="2" type="501" linewidth="none">
746 748 <linepath>
... ... @@ -754,8 +756,8 @@
754 756 <endpoint endx="275" endy="101"/>
755 757 <point x="275" y="32"/>
756 758 </linepath>
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"/>
  759 + <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="kMw1vFSONrMy" height="18"/>
  760 + <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="uhVXTPeMNyEk" height="18"/>
759 761 </assocwidget>
760 762 <assocwidget indexa="4" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="7" xmi.id="1yvbfORhpxwl" widgetbid="SSn60ti0Hi7M" totalcountb="2" type="503" linewidth="none">
761 763 <linepath>
762 764  
763 765  
... ... @@ -763,17 +765,17 @@
763 765 <endpoint endx="411" endy="691"/>
764 766 <point x="343" y="691"/>
765 767 </linepath>
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"/>
  768 + <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="vZO0ycVgyPgr" height="18"/>
  769 + <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="e8G20cysJTQk" height="18"/>
768 770 </assocwidget>
769 771 <assocwidget indexa="1" indexb="1" widgetaid="B6kIvg1gUhU3" linecolor="none" totalcounta="2" xmi.id="WdDLZA6Wj9qJ" widgetbid="SSn60ti0Hi7M" totalcountb="2" type="503" linewidth="none">
770 772 <linepath>
771   - <startpoint startx="456" starty="611"/>
772   - <endpoint endx="456" endy="673"/>
773   - <point x="456" y="643"/>
  773 + <startpoint startx="447" starty="611"/>
  774 + <endpoint endx="447" endy="673"/>
774 775 </linepath>
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"/>
  776 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="353" showstereotype="1" y="645" text="coordenadas" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="703" width="85" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="rknkaVBzuB0H" height="18"/>
  777 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="449" 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="t46E0IxvrJvq" height="18"/>
  778 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="451" showstereotype="1" y="654" 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="vOUsoAhSJvSH" height="18"/>
777 779 </assocwidget>
778 780 <assocwidget indexa="2" indexb="1" widgetaid="JrepmBDIqpt5" linecolor="none" totalcounta="3" xmi.id="bISJ1T8VPY4v" widgetbid="Jft158ximH8y" totalcountb="2" type="510" linewidth="none">
779 781 <linepath>
... ... @@ -781,8 +783,8 @@
781 783 <endpoint endx="626" endy="78"/>
782 784 <point x="530" y="64"/>
783 785 </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 + <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="WR9nsXYjbeyZ" height="18"/>
  787 + <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="vvTmCMa6l5yX" height="18"/>
786 788 </assocwidget>
787 789 <assocwidget indexa="3" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="6" xmi.id="pphLhemI7qLT" widgetbid="CyAWgunfYOu4" totalcountb="2" type="501" linewidth="none">
788 790 <linepath>
... ... @@ -819,7 +821,7 @@
819 821 </UML:Model>
820 822 </XMI.content>
821 823 <XMI.extensions xmi.extender="umbrello">
822   - <docsettings viewid="LivcEe3649X1" uniqueid="qLyzPc0qqStg" documentation=""/>
  824 + <docsettings viewid="LivcEe3649X1" uniqueid="iwXhez2vY6H2" documentation=""/>
823 825 <listview>
824 826 <listitem open="1" type="800" id="Views">
825 827 <listitem open="1" type="801" id="Logical View">
... ... @@ -905,6 +907,7 @@
905 907 <listitem open="0" type="814" id="8ifejVtOoKXN"/>
906 908 <listitem open="0" type="814" id="CXx2GBqOsV1Z"/>
907 909 </listitem>
  910 + <listitem open="1" type="813" id="iwXhez2vY6H2"/>
908 911 <listitem open="1" type="813" id="skIV1Qm93oyo">
909 912 <listitem open="0" type="814" id="05wqnEWIVgmt"/>
910 913 <listitem open="0" type="814" id="woXlLgWJjQAW"/>
... ... @@ -941,7 +944,7 @@
941 944 <listitem open="1" type="813" id="xg2HZ89UTSe9">
942 945 <listitem open="0" type="814" id="TT1F82F8gHxU"/>
943 946 </listitem>
944   - <listitem open="1" type="830" id="Datatypes">
  947 + <listitem open="0" type="830" id="Datatypes">
945 948 <listitem open="1" type="829" id="XT9G38k8Vh3T"/>
946 949 <listitem open="1" type="829" id="5PxxxWWUqjGq"/>
947 950 <listitem open="1" type="829" id="6aMgotUEBgWz"/>