Commit baef7e74a971b9ca661af267e57dd755ac963c3b

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

Mayusculas segun normas internacionales CEFACT

Showing 4 changed files with 311 additions and 310 deletions Side-by-side Diff

direccionesV01p01.xsd View file @ baef7e7
... ... @@ -43,9 +43,9 @@
43 43  
44 44 <complexType name="TipoPais">
45 45 <sequence>
46   - <element maxOccurs="1" minOccurs="1" name="codigo" type="paises:ISOCountryCode" />
47   - <element maxOccurs="1" minOccurs="0" name="nombre" type="string" />
48   - <element maxOccurs="1" minOccurs="0" name="geometria">
  46 + <element maxOccurs="1" minOccurs="1" name="Codigo" type="paises:ISOCountryCode" />
  47 + <element maxOccurs="1" minOccurs="0" name="Nombre" type="string" />
  48 + <element maxOccurs="1" minOccurs="0" name="Geometria">
49 49 <complexType>
50 50 <sequence>
51 51 <element ref="gml:_GeometricPrimitive" />
... ... @@ -57,10 +57,10 @@
57 57  
58 58 <complexType name="TipoDepartamento">
59 59 <sequence>
60   - <element minOccurs="1" maxOccurs="1" name="codigo" type="departamentos:CodigoDepartamentoLC" />
61   - <element maxOccurs="1" minOccurs="1" name="pais" type="tns:TipoPais" />
62   - <element maxOccurs="1" minOccurs="0" name="nombre" type="string" />
63   - <element maxOccurs="1" minOccurs="0" name="geometria">
  60 + <element minOccurs="1" maxOccurs="1" name="Codigo" type="departamentos:CodigoDepartamentoLC" />
  61 + <element maxOccurs="1" minOccurs="1" name="Pais" type="tns:TipoPais" />
  62 + <element maxOccurs="1" minOccurs="0" name="Nombre" type="string" />
  63 + <element maxOccurs="1" minOccurs="0" name="Geometria">
64 64 <complexType>
65 65 <sequence>
66 66 <element ref="gml:_GeometricPrimitive" />
67 67  
... ... @@ -156,18 +156,18 @@
156 156  
157 157 <complexType name="TipoMunicipio">
158 158 <sequence>
159   - <element maxOccurs="1" minOccurs="1" name="codigo" type="tns:TipoCodigoMunicipio" />
160   - <element maxOccurs="1" minOccurs="1" name="departamento" type="tns:TipoDepartamento" />
161   - <element maxOccurs="1" minOccurs="0" name="nombre" type="string" />
  159 + <element maxOccurs="1" minOccurs="1" name="Codigo" type="tns:TipoCodigoMunicipio" />
  160 + <element maxOccurs="1" minOccurs="1" name="Departamento" type="tns:TipoDepartamento" />
  161 + <element maxOccurs="1" minOccurs="0" name="Nombre" type="string" />
162 162 </sequence>
163 163 </complexType>
164 164  
165 165 <complexType name="TipoLocalidad">
166 166 <sequence>
167   - <element maxOccurs="1" minOccurs="1" name="codigo" type="tns:Alfa-3" />
168   - <element maxOccurs="1" minOccurs="1" name="departamento" type="tns:TipoDepartamento" />
169   - <element maxOccurs="1" minOccurs="0" name="nombre" type="string" />
170   - <element maxOccurs="1" minOccurs="0" name="geometria">
  167 + <element maxOccurs="1" minOccurs="1" name="Codigo" type="tns:Alfa-3" />
  168 + <element maxOccurs="1" minOccurs="1" name="Departamento" type="tns:TipoDepartamento" />
  169 + <element maxOccurs="1" minOccurs="0" name="Nombre" type="string" />
  170 + <element maxOccurs="1" minOccurs="0" name="Geometria">
171 171 <complexType>
172 172 <sequence>
173 173 <element ref="gml:_GeometricPrimitive" />
... ... @@ -179,12 +179,12 @@
179 179  
180 180 <complexType name="TipoLocalidadCatastral">
181 181 <sequence>
182   - <element maxOccurs="unbounded" minOccurs="0" name="manzanasCatastrales" type="tns:TipoManzanaCatastral" />
183   - <element maxOccurs="unbounded" minOccurs="0" name="padrones" type="tns:TipoPadron" />
184   - <element maxOccurs="1" minOccurs="1" name="codigo" type="tns:Alfa-3" />
185   - <element maxOccurs="1" minOccurs="1" name="departamento" type="tns:TipoDepartamento" />
186   - <element maxOccurs="1" minOccurs="0" name="nombre" type="string" />
187   - <element maxOccurs="1" minOccurs="0" name="geometria">
  182 + <element maxOccurs="unbounded" minOccurs="0" name="ManzanasCatastrales" type="tns:TipoManzanaCatastral" />
  183 + <element maxOccurs="unbounded" minOccurs="0" name="Padrones" type="tns:TipoPadron" />
  184 + <element maxOccurs="1" minOccurs="1" name="Codigo" type="tns:Alfa-3" />
  185 + <element maxOccurs="1" minOccurs="1" name="Departamento" type="tns:TipoDepartamento" />
  186 + <element maxOccurs="1" minOccurs="0" name="Nombre" type="string" />
  187 + <element maxOccurs="1" minOccurs="0" name="Geometria">
188 188 <complexType>
189 189 <sequence>
190 190 <element ref="gml:_GeometricPrimitive" />
... ... @@ -196,8 +196,8 @@
196 196  
197 197 <complexType name="TipoBarrio">
198 198 <sequence>
199   - <element maxOccurs="1" minOccurs="0" name="nombre" type="tns:Alfanumerico-100" />
200   - <element maxOccurs="1" minOccurs="0" name="geometria">
  199 + <element maxOccurs="1" minOccurs="0" name="Nombre" type="tns:Alfanumerico-100" />
  200 + <element maxOccurs="1" minOccurs="0" name="Geometria">
201 201 <complexType>
202 202 <sequence>
203 203 <element ref="gml:_GeometricPrimitive" />
... ... @@ -209,9 +209,9 @@
209 209  
210 210 <complexType name="TipoManzana">
211 211 <sequence>
212   - <element maxOccurs="unbounded" minOccurs="0" name="solares" type="tns:TipoSolar" />
213   - <element maxOccurs="1" minOccurs="1" name="numero" type="tns:Numerico-5" />
214   - <element maxOccurs="1" minOccurs="0" name="geometria">
  212 + <element maxOccurs="unbounded" minOccurs="0" name="Solares" type="tns:TipoSolar" />
  213 + <element maxOccurs="1" minOccurs="1" name="Numero" type="tns:Numerico-5" />
  214 + <element maxOccurs="1" minOccurs="0" name="Geometria">
215 215 <complexType>
216 216 <sequence>
217 217 <element ref="gml:_GeometricPrimitive" />
... ... @@ -223,10 +223,10 @@
223 223  
224 224 <complexType name="TipoManzanaCatastral">
225 225 <sequence>
226   - <element maxOccurs="unbounded" minOccurs="0" name="solaresCatastrales" type="tns:TipoSolarCatastral" />
227   - <element maxOccurs="1" minOccurs="1" name="localidadCatastral" type="tns:TipoLocalidadCatastral" />
228   - <element maxOccurs="1" minOccurs="1" name="numero" type="int" />
229   - <element maxOccurs="1" minOccurs="0" name="geometria">
  226 + <element maxOccurs="unbounded" minOccurs="0" name="SolaresCatastrales" type="tns:TipoSolarCatastral" />
  227 + <element maxOccurs="1" minOccurs="1" name="LocalidadCatastral" type="tns:TipoLocalidadCatastral" />
  228 + <element maxOccurs="1" minOccurs="1" name="Numero" type="int" />
  229 + <element maxOccurs="1" minOccurs="0" name="Geometria">
230 230 <complexType>
231 231 <sequence>
232 232 <element ref="gml:_GeometricPrimitive" />
... ... @@ -238,10 +238,10 @@
238 238  
239 239 <complexType name="TipoPadron">
240 240 <sequence>
241   - <element maxOccurs="1" minOccurs="1" name="localidadCatastral" type="tns:TipoLocalidadCatastral" />
242   - <element maxOccurs="1" minOccurs="1" name="numero" type="tns:Alfanumerico-30" />
243   - <element maxOccurs="1" minOccurs="0" name="unidadCatastral" type="string" />
244   - <element maxOccurs="1" minOccurs="0" name="geometria">
  241 + <element maxOccurs="1" minOccurs="1" name="LocalidadCatastral" type="tns:TipoLocalidadCatastral" />
  242 + <element maxOccurs="1" minOccurs="1" name="Numero" type="tns:Alfanumerico-30" />
  243 + <element maxOccurs="1" minOccurs="0" name="UnidadCatastral" type="string" />
  244 + <element maxOccurs="1" minOccurs="0" name="Geometria">
245 245 <complexType>
246 246 <sequence>
247 247 <element ref="gml:_GeometricPrimitive" />
... ... @@ -253,9 +253,9 @@
253 253  
254 254 <complexType name="TipoSolar">
255 255 <sequence>
256   - <element maxOccurs="1" minOccurs="1" name="manzana" type="tns:TipoManzana" />
257   - <element maxOccurs="1" minOccurs="1" name="numero" type="tns:Numerico-5" />
258   - <element maxOccurs="1" minOccurs="0" name="geometria">
  256 + <element maxOccurs="1" minOccurs="1" name="Manzana" type="tns:TipoManzana" />
  257 + <element maxOccurs="1" minOccurs="1" name="Numero" type="tns:Numerico-5" />
  258 + <element maxOccurs="1" minOccurs="0" name="Geometria">
259 259 <complexType>
260 260 <sequence>
261 261 <element ref="gml:_GeometricPrimitive" />
... ... @@ -267,9 +267,9 @@
267 267  
268 268 <complexType name="TipoSolarCatastral">
269 269 <sequence>
270   - <element maxOccurs="1" minOccurs="1" name="manzanaCatastral" type="tns:TipoManzanaCatastral" />
271   - <element maxOccurs="1" minOccurs="1" name="numero" type="int" />
272   - <element maxOccurs="1" minOccurs="0" name="geometria">
  270 + <element maxOccurs="1" minOccurs="1" name="ManzanaCatastral" type="tns:TipoManzanaCatastral" />
  271 + <element maxOccurs="1" minOccurs="1" name="Numero" type="int" />
  272 + <element maxOccurs="1" minOccurs="0" name="Geometria">
273 273 <complexType>
274 274 <sequence>
275 275 <element ref="gml:_GeometricPrimitive" />
276 276  
... ... @@ -288,20 +288,20 @@
288 288  
289 289 <complexType name="TipoDireccionInterna">
290 290 <sequence>
291   - <element maxOccurs="1" minOccurs="0" name="senda" type="string" />
292   - <element maxOccurs="1" minOccurs="0" name="block" type="tns:Alfanumerico-50" />
293   - <element maxOccurs="1" minOccurs="0" name="torre" type="tns:Alfanumerico-50" />
294   - <element maxOccurs="1" minOccurs="0" name="piso" type="tns:Alfanumerico-50" />
295   - <element maxOccurs="1" minOccurs="0" name="unidad" type="tns:Alfanumerico-50" />
296   - <element maxOccurs="1" minOccurs="0" name="descripcion" type="tns:Alfanumerico-300" />
297   - <element maxOccurs="unbounded" minOccurs="0" name="coordenadas" type="tns:TipoCoordenada" />
  291 + <element maxOccurs="1" minOccurs="0" name="Senda" type="string" />
  292 + <element maxOccurs="1" minOccurs="0" name="Block" type="tns:Alfanumerico-50" />
  293 + <element maxOccurs="1" minOccurs="0" name="Torre" type="tns:Alfanumerico-50" />
  294 + <element maxOccurs="1" minOccurs="0" name="Piso" type="tns:Alfanumerico-50" />
  295 + <element maxOccurs="1" minOccurs="0" name="Unidad" type="tns:Alfanumerico-50" />
  296 + <element maxOccurs="1" minOccurs="0" name="Descripcion" type="tns:Alfanumerico-300" />
  297 + <element maxOccurs="unbounded" minOccurs="0" name="Coordenadas" type="tns:TipoCoordenadas" />
298 298 </sequence>
299 299 </complexType>
300 300  
301 301 <complexType name="TipoCodigoPostal">
302 302 <sequence>
303   - <element maxOccurs="1" minOccurs="1" name="numero" type="tns:Numerico-5" />
304   - <element maxOccurs="1" minOccurs="0" name="geometria">
  303 + <element maxOccurs="1" minOccurs="1" name="Numero" type="tns:Numerico-5" />
  304 + <element maxOccurs="1" minOccurs="0" name="Geometria">
305 305 <complexType>
306 306 <sequence>
307 307 <element ref="gml:_GeometricPrimitive" />
... ... @@ -313,8 +313,8 @@
313 313  
314 314 <complexType name="TipoSeccionPolicial">
315 315 <sequence>
316   - <element maxOccurs="1" minOccurs="1" name="numero" type="tns:Numerico-2" />
317   - <element maxOccurs="1" minOccurs="0" name="geometria">
  316 + <element maxOccurs="1" minOccurs="1" name="Numero" type="tns:Numerico-2" />
  317 + <element maxOccurs="1" minOccurs="0" name="Geometria">
318 318 <complexType>
319 319 <sequence>
320 320 <element ref="gml:_GeometricPrimitive" />
... ... @@ -326,8 +326,8 @@
326 326  
327 327 <complexType name="TipoSeccionJudicial">
328 328 <sequence>
329   - <element maxOccurs="1" minOccurs="1" name="numero" type="tns:Numerico-2" />
330   - <element maxOccurs="1" minOccurs="0" name="geometria">
  329 + <element maxOccurs="1" minOccurs="1" name="Numero" type="tns:Numerico-2" />
  330 + <element maxOccurs="1" minOccurs="0" name="Geometria">
331 331 <complexType>
332 332 <sequence>
333 333 <element ref="gml:_GeometricPrimitive" />
... ... @@ -357,9 +357,9 @@
357 357  
358 358 <complexType name="TipoEntidadColectiva">
359 359 <sequence>
360   - <element maxOccurs="1" minOccurs="0" name="tipo" type="tns:TipoEntidadColectivaLC" />
361   - <element maxOccurs="1" minOccurs="0" name="nombre" type="tns:Alfanumerico-255" />
362   - <element maxOccurs="1" minOccurs="0" name="geometria">
  360 + <element maxOccurs="1" minOccurs="0" name="Tipo" type="tns:TipoEntidadColectivaLC" />
  361 + <element maxOccurs="1" minOccurs="0" name="Nombre" type="tns:Alfanumerico-255" />
  362 + <element maxOccurs="1" minOccurs="0" name="Geometria">
363 363 <complexType>
364 364 <sequence>
365 365 <element ref="gml:_GeometricPrimitive" />
... ... @@ -371,7 +371,7 @@
371 371  
372 372 <complexType name="TipoVialidad">
373 373 <sequence>
374   - <element maxOccurs="1" minOccurs="0" name="tipo">
  374 + <element maxOccurs="1" minOccurs="0" name="Tipo">
375 375 <simpleType final="list">
376 376 <restriction base="string">
377 377 <enumeration value="AVENIDA" />
378 378  
... ... @@ -400,20 +400,20 @@
400 400  
401 401 <complexType name="TipoViaCirculacion">
402 402 <sequence>
403   - <element maxOccurs="1" minOccurs="0" name="numeroRuta" type="tns:Numerico-3" />
404   - <element maxOccurs="1" minOccurs="0" name="nombre" type="tns:Alfanumerico-150" />
405   - <element maxOccurs="1" minOccurs="0" name="vialidad" type="tns:TipoVialidad" />
406   - <element maxOccurs="unbounded" minOccurs="0" name="tramo" type="tns:TramoVia" />
  403 + <element maxOccurs="1" minOccurs="0" name="NumeroRuta" type="tns:Numerico-3" />
  404 + <element maxOccurs="1" minOccurs="0" name="Nombre" type="tns:Alfanumerico-150" />
  405 + <element maxOccurs="1" minOccurs="0" name="Vialidad" type="tns:TipoVialidad" />
  406 + <element maxOccurs="unbounded" minOccurs="0" name="Tramo" type="tns:TramoVia" />
407 407 </sequence>
408 408 </complexType>
409 409  
410 410 <complexType name="TramoVia">
411 411 <sequence>
412   - <element maxOccurs="1" minOccurs="1" name="via" type="tns:TipoViaCirculacion" />
413   - <element maxOccurs="2" minOccurs="0" name="entrecalles" type="tns:TipoViaCirculacion" />
414   - <element maxOccurs="1" minOccurs="0" name="cabezal1" type="tns:Numerico-5" />
415   - <element maxOccurs="1" minOccurs="0" name="cabezal2" type="tns:Numerico-5" />
416   - <element maxOccurs="1" minOccurs="0" name="geometria">
  412 + <element maxOccurs="1" minOccurs="1" name="Via" type="tns:TipoViaCirculacion" />
  413 + <element maxOccurs="2" minOccurs="0" name="Entrecalles" type="tns:TipoViaCirculacion" />
  414 + <element maxOccurs="1" minOccurs="0" name="Cabezal1" type="tns:Numerico-5" />
  415 + <element maxOccurs="1" minOccurs="0" name="Cabezal2" type="tns:Numerico-5" />
  416 + <element maxOccurs="1" minOccurs="0" name="Geometria">
417 417 <complexType>
418 418 <sequence>
419 419 <element ref="gml:_GeometricPrimitive" />
... ... @@ -423,7 +423,7 @@
423 423 </sequence>
424 424 </complexType>
425 425  
426   - <simpleType name="TipoCriterioGeocodLC">
  426 + <simpleType name="TipoCriterioGeocodificacionLC">
427 427 <restriction base="string">
428 428 <enumeration value="0: Punto de acceso" />
429 429 <enumeration value="1: Punto de entrega del servicio" />
430 430  
431 431  
432 432  
... ... @@ -436,46 +436,46 @@
436 436 </restriction>
437 437 </simpleType>
438 438  
439   - <complexType name="TipoCoordenada">
  439 + <complexType name="TipoCoordenadas">
440 440 <sequence>
441   - <element maxOccurs="1" minOccurs="1" name="valor">
  441 + <element maxOccurs="1" minOccurs="1" name="Geometria">
442 442 <complexType>
443 443 <sequence>
444 444 <element ref="gml:pos" />
445 445 </sequence>
446 446 </complexType>
447 447 </element>
448   - <element maxOccurs="1" minOccurs="0" name="criterioGeocod" type="tns:TipoCriterioGeocodLC" />
  448 + <element maxOccurs="1" minOccurs="0" name="CriterioGeocodificacion" type="tns:TipoCriterioGeocodificacionLC" />
449 449 </sequence>
450 450 </complexType>
451 451  
452 452 <complexType name="TipoDireccion">
453 453 <sequence>
454   - <element maxOccurs="1" minOccurs="0" name="pais" type="tns:TipoPais" />
455   - <element maxOccurs="1" minOccurs="0" name="departamento" type="tns:TipoDepartamento" />
456   - <element maxOccurs="1" minOccurs="0" name="municipio" type="tns:TipoMunicipio" />
457   - <element maxOccurs="1" minOccurs="0" name="localidad" type="tns:TipoLocalidad" />
458   - <element maxOccurs="1" minOccurs="0" name="localidadCatastral" type="tns:TipoLocalidadCatastral" />
459   - <element maxOccurs="1" minOccurs="0" name="barrio" type="tns:TipoBarrio" />
460   - <element maxOccurs="1" minOccurs="0" name="manzana" type="tns:TipoManzana" />
461   - <element maxOccurs="1" minOccurs="0" name="manzanaCatastral" type="tns:TipoManzanaCatastral" />
462   - <element maxOccurs="1" minOccurs="0" name="padron" type="tns:TipoPadron" />
463   - <element maxOccurs="1" minOccurs="0" name="solar" type="tns:TipoSolar" />
464   - <element maxOccurs="1" minOccurs="0" name="solarCatastral" type="tns:TipoSolarCatastral" />
465   - <element maxOccurs="1" minOccurs="0" name="numero" type="tns:Numerico-5" />
466   - <element maxOccurs="1" minOccurs="0" name="letra" type="tns:Alfanumerico-5" />
467   - <element maxOccurs="1" minOccurs="0" name="kilometro" type="tns:Numerico-9" />
468   - <element maxOccurs="1" minOccurs="0" name="nombreInmueble" type="tns:Alfanumerico-100" />
469   - <element maxOccurs="1" minOccurs="0" name="descripcion" type="tns:Alfanumerico-300" />
470   - <element maxOccurs="1" minOccurs="0" name="lado" type="tns:TipoLadoLC" />
471   - <element maxOccurs="unbounded" minOccurs="0" name="direccionInterna" type="tns:TipoDireccionInterna" />
472   - <element maxOccurs="1" minOccurs="1" name="codigoPostal" type="tns:TipoCodigoPostal" />
473   - <element maxOccurs="1" minOccurs="0" name="seccionPolicial" type="tns:TipoSeccionPolicial" />
474   - <element maxOccurs="1" minOccurs="0" name="seccionJudicial" type="tns:TipoSeccionJudicial" />
475   - <element maxOccurs="1" minOccurs="0" name="entidadColectiva" type="tns:TipoEntidadColectiva" />
476   - <element maxOccurs="1" minOccurs="0" name="viaCirculacion" type="tns:TipoViaCirculacion" />
477   - <element maxOccurs="1" minOccurs="0" name="tramoVia" type="tns:TramoVia" />
478   - <element maxOccurs="unbounded" minOccurs="0" name="coordenadas" type="tns:TipoCoordenada" />
  454 + <element maxOccurs="1" minOccurs="0" name="Pais" type="tns:TipoPais" />
  455 + <element maxOccurs="1" minOccurs="0" name="Departamento" type="tns:TipoDepartamento" />
  456 + <element maxOccurs="1" minOccurs="0" name="Municipio" type="tns:TipoMunicipio" />
  457 + <element maxOccurs="1" minOccurs="0" name="Localidad" type="tns:TipoLocalidad" />
  458 + <element maxOccurs="1" minOccurs="0" name="LocalidadCatastral" type="tns:TipoLocalidadCatastral" />
  459 + <element maxOccurs="1" minOccurs="0" name="Barrio" type="tns:TipoBarrio" />
  460 + <element maxOccurs="1" minOccurs="0" name="Manzana" type="tns:TipoManzana" />
  461 + <element maxOccurs="1" minOccurs="0" name="ManzanaCatastral" type="tns:TipoManzanaCatastral" />
  462 + <element maxOccurs="1" minOccurs="0" name="Padron" type="tns:TipoPadron" />
  463 + <element maxOccurs="1" minOccurs="0" name="Solar" type="tns:TipoSolar" />
  464 + <element maxOccurs="1" minOccurs="0" name="SolarCatastral" type="tns:TipoSolarCatastral" />
  465 + <element maxOccurs="1" minOccurs="0" name="Numero" type="tns:Numerico-5" />
  466 + <element maxOccurs="1" minOccurs="0" name="Letra" type="tns:Alfanumerico-5" />
  467 + <element maxOccurs="1" minOccurs="0" name="Kilometro" type="tns:Numerico-9" />
  468 + <element maxOccurs="1" minOccurs="0" name="NombreInmueble" type="tns:Alfanumerico-100" />
  469 + <element maxOccurs="1" minOccurs="0" name="Descripcion" type="tns:Alfanumerico-300" />
  470 + <element maxOccurs="1" minOccurs="0" name="Lado" type="tns:TipoLadoLC" />
  471 + <element maxOccurs="unbounded" minOccurs="0" name="DireccionInterna" type="tns:TipoDireccionInterna" />
  472 + <element maxOccurs="1" minOccurs="1" name="CodigoPostal" type="tns:TipoCodigoPostal" />
  473 + <element maxOccurs="1" minOccurs="0" name="CeccionPolicial" type="tns:TipoSeccionPolicial" />
  474 + <element maxOccurs="1" minOccurs="0" name="CeccionJudicial" type="tns:TipoSeccionJudicial" />
  475 + <element maxOccurs="1" minOccurs="0" name="EntidadColectiva" type="tns:TipoEntidadColectiva" />
  476 + <element maxOccurs="1" minOccurs="0" name="ViaCirculacion" type="tns:TipoViaCirculacion" />
  477 + <element maxOccurs="1" minOccurs="0" name="TramoVia" type="tns:TramoVia" />
  478 + <element maxOccurs="unbounded" minOccurs="0" name="Coordenadas" type="tns:TipoCoordenadas" />
479 479 </sequence>
480 480 </complexType>
481 481 </schema>
direcciones_ejemplo1.xml View file @ baef7e7
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <xsd:Direcciones xmlns:gml="http://www.opengis.net/gml" xmlns:xsd="http://metadatos.pge.red.uy/agesic/datos/direccionesV01p01.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/agesic/datos/direccionesV01p01.xsd direccionesV01p01.xsd">
3 3 <xsd:Direccion>
4   - <xsd:municipio>
5   - <xsd:codigo>CH</xsd:codigo>
6   - <xsd:departamento>
7   - <xsd:codigo>MO</xsd:codigo>
8   - <xsd:pais>
9   - <xsd:codigo>UY</xsd:codigo>
10   - </xsd:pais>
11   - </xsd:departamento>
12   - </xsd:municipio>
13   - <xsd:localidad>
14   - <xsd:codigo>MVD</xsd:codigo>
15   - <xsd:departamento>
16   - <xsd:codigo>MO</xsd:codigo>
17   - <xsd:pais>
18   - <xsd:codigo>UY</xsd:codigo>
19   - </xsd:pais>
20   - </xsd:departamento>
21   - </xsd:localidad>
22   - <xsd:barrio>
  4 + <xsd:Municipio>
  5 + <xsd:Codigo>CH</xsd:Codigo>
  6 + <xsd:Departamento>
  7 + <xsd:Codigo>MO</xsd:Codigo>
  8 + <xsd:Pais>
  9 + <xsd:Codigo>UY</xsd:Codigo>
  10 + </xsd:Pais>
  11 + </xsd:Departamento>
  12 + </xsd:Municipio>
  13 + <xsd:Localidad>
  14 + <xsd:Codigo>MVD</xsd:Codigo>
  15 + <xsd:Departamento>
  16 + <xsd:Codigo>MO</xsd:Codigo>
  17 + <xsd:Pais>
  18 + <xsd:Codigo>UY</xsd:Codigo>
  19 + </xsd:Pais>
  20 + </xsd:Departamento>
  21 + </xsd:Localidad>
  22 + <xsd:Barrio>
23 23 <!-- Fuente: Capa de barrios según INE de montevideo.gub.uy -->
24   - <xsd:nombre>CENTRO</xsd:nombre>
25   - <xsd:geometria>
  24 + <xsd:Nombre>CENTRO</xsd:Nombre>
  25 + <xsd:Geometria>
26 26 <gml:Polygon>
27 27 <gml:outerBoundaryIs>
28 28 <gml:LinearRing>
29 29  
30 30  
... ... @@ -30,73 +30,73 @@
30 30 </gml:LinearRing>
31 31 </gml:outerBoundaryIs>
32 32 </gml:Polygon>
33   - </xsd:geometria>
34   - </xsd:barrio>
35   - <xsd:manzana>
36   - <xsd:numero>0</xsd:numero>
37   - </xsd:manzana>
38   - <xsd:padron>
39   - <xsd:localidadCatastral>
40   - <xsd:codigo>MVD</xsd:codigo>
41   - <xsd:departamento>
42   - <xsd:codigo>MO</xsd:codigo>
43   - <xsd:pais>
44   - <xsd:codigo>UY</xsd:codigo>
45   - </xsd:pais>
46   - </xsd:departamento>
47   - </xsd:localidadCatastral>
48   - <xsd:numero>5019</xsd:numero>
49   - </xsd:padron>
50   - <xsd:solar>
51   - <xsd:manzana>
52   - <xsd:numero>0</xsd:numero>
53   - </xsd:manzana>
54   - <xsd:numero>0</xsd:numero>
55   - </xsd:solar>
56   - <xsd:numero>1365</xsd:numero>
57   - <xsd:direccionInterna>
58   - <xsd:piso>7</xsd:piso>
59   - </xsd:direccionInterna>
60   - <xsd:codigoPostal>
61   - <xsd:numero>11100</xsd:numero>
62   - </xsd:codigoPostal>
63   - <xsd:entidadColectiva>
64   - <xsd:tipo>OTROS</xsd:tipo>
65   - </xsd:entidadColectiva>
66   - <xsd:viaCirculacion>
67   - <xsd:numeroRuta>0</xsd:numeroRuta>
68   - <xsd:nombre>ANDES</xsd:nombre>
69   - <xsd:vialidad>
70   - <xsd:tipo>CALLE</xsd:tipo>
71   - </xsd:vialidad>
72   - </xsd:viaCirculacion>
73   - <xsd:coordenadas>
74   - <xsd:valor>
  33 + </xsd:Geometria>
  34 + </xsd:Barrio>
  35 + <xsd:Manzana>
  36 + <xsd:Numero>0</xsd:Numero>
  37 + </xsd:Manzana>
  38 + <xsd:Padron>
  39 + <xsd:LocalidadCatastral>
  40 + <xsd:Codigo>MVD</xsd:Codigo>
  41 + <xsd:Departamento>
  42 + <xsd:Codigo>MO</xsd:Codigo>
  43 + <xsd:Pais>
  44 + <xsd:Codigo>UY</xsd:Codigo>
  45 + </xsd:Pais>
  46 + </xsd:Departamento>
  47 + </xsd:LocalidadCatastral>
  48 + <xsd:Numero>5019</xsd:Numero>
  49 + </xsd:Padron>
  50 + <xsd:Solar>
  51 + <xsd:Manzana>
  52 + <xsd:Numero>0</xsd:Numero>
  53 + </xsd:Manzana>
  54 + <xsd:Numero>0</xsd:Numero>
  55 + </xsd:Solar>
  56 + <xsd:Numero>1365</xsd:Numero>
  57 + <xsd:DireccionInterna>
  58 + <xsd:Piso>7</xsd:Piso>
  59 + </xsd:DireccionInterna>
  60 + <xsd:CodigoPostal>
  61 + <xsd:Numero>11100</xsd:Numero>
  62 + </xsd:CodigoPostal>
  63 + <xsd:EntidadColectiva>
  64 + <xsd:Tipo>OTROS</xsd:Tipo>
  65 + </xsd:EntidadColectiva>
  66 + <xsd:ViaCirculacion>
  67 + <xsd:NumeroRuta>0</xsd:NumeroRuta>
  68 + <xsd:Nombre>ANDES</xsd:Nombre>
  69 + <xsd:Vialidad>
  70 + <xsd:Tipo>CALLE</xsd:Tipo>
  71 + </xsd:Vialidad>
  72 + </xsd:ViaCirculacion>
  73 + <xsd:Coordenadas>
  74 + <xsd:Geometria>
75 75 <gml:pos>-56.19 -34.90</gml:pos>
76   - </xsd:valor>
77   - <xsd:criterioGeocod>1: Punto de entrega del servicio</xsd:criterioGeocod>
78   - </xsd:coordenadas>
  76 + </xsd:Geometria>
  77 + <xsd:CriterioGeocodificacion>1: Punto de entrega del servicio</xsd:CriterioGeocodificacion>
  78 + </xsd:Coordenadas>
79 79 </xsd:Direccion>
80 80 <xsd:Direccion>
81   - <xsd:localidad>
82   - <xsd:codigo>MVD</xsd:codigo>
83   - <xsd:departamento>
84   - <xsd:codigo>MO</xsd:codigo>
85   - <xsd:pais>
86   - <xsd:codigo>UY</xsd:codigo>
87   - </xsd:pais>
88   - </xsd:departamento>
89   - </xsd:localidad>
90   - <xsd:numero>1366</xsd:numero>
91   - <xsd:codigoPostal>
92   - <xsd:numero>11100</xsd:numero>
93   - </xsd:codigoPostal>
94   - <xsd:viaCirculacion>
95   - <xsd:nombre>ANDES</xsd:nombre>
96   - <xsd:vialidad>
97   - <xsd:tipo>CALLE</xsd:tipo>
98   - </xsd:vialidad>
99   - </xsd:viaCirculacion>
  81 + <xsd:Localidad>
  82 + <xsd:Codigo>MVD</xsd:Codigo>
  83 + <xsd:Departamento>
  84 + <xsd:Codigo>MO</xsd:Codigo>
  85 + <xsd:Pais>
  86 + <xsd:Codigo>UY</xsd:Codigo>
  87 + </xsd:Pais>
  88 + </xsd:Departamento>
  89 + </xsd:Localidad>
  90 + <xsd:Numero>1366</xsd:Numero>
  91 + <xsd:CodigoPostal>
  92 + <xsd:Numero>11100</xsd:Numero>
  93 + </xsd:CodigoPostal>
  94 + <xsd:ViaCirculacion>
  95 + <xsd:Nombre>ANDES</xsd:Nombre>
  96 + <xsd:Vialidad>
  97 + <xsd:Tipo>CALLE</xsd:Tipo>
  98 + </xsd:Vialidad>
  99 + </xsd:ViaCirculacion>
100 100 </xsd:Direccion>
101 101 </xsd:Direcciones>
direcciones_ejemplo2.xml View file @ baef7e7
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <xsd:Direcciones xmlns:gml="http://www.opengis.net/gml" xmlns:xsd="http://metadatos.pge.red.uy/agesic/datos/direccionesV01p01.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/agesic/datos/direccionesV01p01.xsd direccionesV01p01.xsd">
3 3 <xsd:Direccion>
4   - <xsd:localidad>
5   - <xsd:codigo>MVD</xsd:codigo>
6   - <xsd:departamento>
7   - <xsd:codigo>MO</xsd:codigo>
8   - <xsd:pais>
9   - <xsd:codigo>UY</xsd:codigo>
10   - </xsd:pais>
11   - </xsd:departamento>
12   - </xsd:localidad>
13   - <xsd:numero>1365</xsd:numero>
14   - <xsd:codigoPostal>
15   - <xsd:numero>11100</xsd:numero>
16   - </xsd:codigoPostal>
17   - <xsd:viaCirculacion>
18   - <xsd:nombre>ANDES</xsd:nombre>
19   - </xsd:viaCirculacion>
20   - <xsd:coordenadas>
21   - <xsd:valor>
  4 + <xsd:Localidad>
  5 + <xsd:Codigo>MVD</xsd:Codigo>
  6 + <xsd:Departamento>
  7 + <xsd:Codigo>MO</xsd:Codigo>
  8 + <xsd:Pais>
  9 + <xsd:Codigo>UY</xsd:Codigo>
  10 + </xsd:Pais>
  11 + </xsd:Departamento>
  12 + </xsd:Localidad>
  13 + <xsd:Numero>1365</xsd:Numero>
  14 + <xsd:CodigoPostal>
  15 + <xsd:Numero>11100</xsd:Numero>
  16 + </xsd:CodigoPostal>
  17 + <xsd:ViaCirculacion>
  18 + <xsd:Nombre>ANDES</xsd:Nombre>
  19 + </xsd:ViaCirculacion>
  20 + <xsd:Coordenadas>
  21 + <xsd:Geometria>
22 22 <gml:pos>-56.19 -34.90</gml:pos>
23   - </xsd:valor>
24   - </xsd:coordenadas>
  23 + </xsd:Geometria>
  24 + </xsd:Coordenadas>
25 25 </xsd:Direccion>
26 26 </xsd:Direcciones>
modelo_conceptual.xmi View file @ baef7e7
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<XMI verified="false" xmi.version="1.2" timestamp="2012-05-23T14:16:00" xmlns:UML="http://schema.omg.org/spec/UML/1.3">
  2 +<XMI verified="false" xmi.version="1.2" timestamp="2012-06-01T17:16:57" 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>
... ... @@ -55,12 +55,12 @@
55 55 </UML:Package>
56 56 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="tTM8hIy8GNaf" name="Direccion">
57 57 <UML:Classifier.feature>
58   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="EiiDE8l2cBUS" type="gCEBGjygXMqu" name="numero"/>
59   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="qGBTRft3gStt" type="OLmI3FTsVcJv" name="letra"/>
60   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="HAywdppmNMzm" type="0lNUP6kRom2r" name="kilometro"/>
61   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="8pTcPkXhuTbV" type="IOGfkFP0mMfT" name="nombreInmueble"/>
62   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="KVQtfUjIGMo4" type="swYcGBYKkDue" name="descripcion"/>
63   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="CNoeG4DwyQAC" type="0lCIJN1IBOOh" name="lado"/>
  58 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="EiiDE8l2cBUS" type="gCEBGjygXMqu" name="Numero"/>
  59 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="qGBTRft3gStt" type="OLmI3FTsVcJv" name="Letra"/>
  60 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="HAywdppmNMzm" type="0lNUP6kRom2r" name="Kilometro"/>
  61 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="8pTcPkXhuTbV" type="IOGfkFP0mMfT" name="NombreInmueble"/>
  62 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="KVQtfUjIGMo4" type="swYcGBYKkDue" name="Descripcion"/>
  63 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="CNoeG4DwyQAC" type="0lCIJN1IBOOh" name="Lado"/>
64 64 </UML:Classifier.feature>
65 65 </UML:Class>
66 66 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="d3ZqEjji5qNM" name="Numerico"/>
67 67  
68 68  
69 69  
70 70  
71 71  
72 72  
... ... @@ -69,48 +69,48 @@
69 69 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="WhcdEhNGTPXc" name="Geometria"/>
70 70 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="BtctkDrlM8Ug" name="Pais">
71 71 <UML:Classifier.feature>
72   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="YLDm0RUrY2qE" type="5PxxxWWUqjGq" name="codigo"/>
73   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="8ifejVtOoKXN" type="XT9G38k8Vh3T" name="nombre"/>
74   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="CXx2GBqOsV1Z" type="WhcdEhNGTPXc" name="geometria"/>
  72 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="YLDm0RUrY2qE" type="5PxxxWWUqjGq" name="Codigo"/>
  73 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="8ifejVtOoKXN" type="XT9G38k8Vh3T" name="Nombre"/>
  74 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="CXx2GBqOsV1Z" type="WhcdEhNGTPXc" name="Geometria"/>
75 75 </UML:Classifier.feature>
76 76 </UML:Class>
77 77 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="JrepmBDIqpt5" name="Departamento">
78 78 <UML:Classifier.feature>
79   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="yuvmCS9ivIww" type="5PxxxWWUqjGq" name="codigo"/>
80   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="Pf2uK5LWaGWq" type="XT9G38k8Vh3T" name="nombre"/>
81   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="QKCIpDrn5kXG" type="WhcdEhNGTPXc" name="geometria"/>
  79 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="yuvmCS9ivIww" type="5PxxxWWUqjGq" name="Codigo"/>
  80 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="Pf2uK5LWaGWq" type="XT9G38k8Vh3T" name="Nombre"/>
  81 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="QKCIpDrn5kXG" type="WhcdEhNGTPXc" name="Geometria"/>
82 82 </UML:Classifier.feature>
83 83 </UML:Class>
84 84 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="UGLwdsYoj8hU" name="Localidad">
85 85 <UML:Classifier.feature>
86   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="Cgw7xs1MX3Es" type="6aMgotUEBgWz" name="codigo"/>
87   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="sLkv5IBFw5Kr" type="yLDTOQJUye8m" name="nombre"/>
88   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="Vc1gHVf7pQ2s" type="WhcdEhNGTPXc" name="geometria"/>
  86 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="Cgw7xs1MX3Es" type="6aMgotUEBgWz" name="Codigo"/>
  87 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="sLkv5IBFw5Kr" type="yLDTOQJUye8m" name="Nombre"/>
  88 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="Vc1gHVf7pQ2s" type="WhcdEhNGTPXc" name="Geometria"/>
89 89 </UML:Classifier.feature>
90 90 </UML:Class>
91 91 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="JWDdehHvWvjI" name="Manzana">
92 92 <UML:Classifier.feature>
93   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="iC8cHSUDoffC" type="gCEBGjygXMqu" name="numero"/>
94   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="5yf1ano5Opmf" type="WhcdEhNGTPXc" name="geometria"/>
  93 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="iC8cHSUDoffC" type="gCEBGjygXMqu" name="Numero"/>
  94 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="5yf1ano5Opmf" type="WhcdEhNGTPXc" name="Geometria"/>
95 95 </UML:Classifier.feature>
96 96 </UML:Class>
97 97 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="4wYvkPyCfH8G" name="Padron">
98 98 <UML:Classifier.feature>
99   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="IPm7po0Vy88E" type="xJzBOwv8UelF" name="numero"/>
100   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="eZpl5Y1FPjoe" type="j1fAd2kkA44b" name="unidadCatastral"/>
101   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="v8hJvTyEsiJg" type="WhcdEhNGTPXc" name="geometria"/>
  99 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="IPm7po0Vy88E" type="xJzBOwv8UelF" name="Numero"/>
  100 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="eZpl5Y1FPjoe" type="j1fAd2kkA44b" name="UnidadCatastral"/>
  101 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="v8hJvTyEsiJg" type="WhcdEhNGTPXc" name="Geometria"/>
102 102 </UML:Classifier.feature>
103 103 </UML:Class>
104 104 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="7e2rlhJ4EUgq" name="Solar">
105 105 <UML:Classifier.feature>
106   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="VHBTNHhwr7G7" type="gCEBGjygXMqu" name="numero"/>
107   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="DlOEvisprZ8k" type="WhcdEhNGTPXc" name="geometria"/>
  106 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="VHBTNHhwr7G7" type="gCEBGjygXMqu" name="Numero"/>
  107 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="DlOEvisprZ8k" type="WhcdEhNGTPXc" name="Geometria"/>
108 108 </UML:Classifier.feature>
109 109 </UML:Class>
110 110 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="9xmfrTwvPUo7" name="ViaCirculacion">
111 111 <UML:Classifier.feature>
112   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="KIwqTRk2qI4k" type="YLAuThEfBwVf" name="numeroRuta"/>
113   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="cUJ5sugCAc2d" type="2kfs2jaY2kSV" name="nombre"/>
  112 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="KIwqTRk2qI4k" type="YLAuThEfBwVf" name="NumeroRuta"/>
  113 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="cUJ5sugCAc2d" type="2kfs2jaY2kSV" name="Nombre"/>
114 114 </UML:Classifier.feature>
115 115 </UML:Class>
116 116 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="skIV1Qm93oyo" name="Referencia">
117 117  
... ... @@ -121,15 +121,15 @@
121 121 </UML:Class>
122 122 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="UFqijWWsUGXL" name="EntidadColectiva">
123 123 <UML:Classifier.feature>
124   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="YHdHfnmKPbUi" type="8Vu4Hrb8golj" name="tipo"/>
125   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="28i00TJXiwoO" type="PhXZlZ9gs6sF" name="nombre"/>
126   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="hYg77AnFdfKu" type="WhcdEhNGTPXc" name="geometria"/>
  124 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="YHdHfnmKPbUi" type="8Vu4Hrb8golj" name="Tipo"/>
  125 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="28i00TJXiwoO" type="PhXZlZ9gs6sF" name="Nombre"/>
  126 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="hYg77AnFdfKu" type="WhcdEhNGTPXc" name="Geometria"/>
127 127 </UML:Classifier.feature>
128 128 </UML:Class>
129 129 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="jRE7u3EmnWHn" name="Barrio">
130 130 <UML:Classifier.feature>
131   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="eepAIZ1EyozX" type="IOGfkFP0mMfT" name="nombre"/>
132   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="rpFe5DNz0ulL" type="WhcdEhNGTPXc" name="geometria"/>
  131 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="eepAIZ1EyozX" type="IOGfkFP0mMfT" name="Nombre"/>
  132 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="rpFe5DNz0ulL" type="WhcdEhNGTPXc" name="Geometria"/>
133 133 </UML:Classifier.feature>
134 134 </UML:Class>
135 135 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="v3uyqqkK5a0o" name="Alias">
136 136  
137 137  
... ... @@ -233,21 +233,21 @@
233 233 </UML:Association>
234 234 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="nqgOB6HFGZ5m" name="TramoVia">
235 235 <UML:Classifier.feature>
236   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="oedOEKUmOWmm" type="WhcdEhNGTPXc" name="geometria"/>
237   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="uQPm8WJv01t0" type="gCEBGjygXMqu" name="cabezal1"/>
238   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="3UqoX6gQW3Ad" type="gCEBGjygXMqu" name="cabezal2"/>
  236 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="oedOEKUmOWmm" type="WhcdEhNGTPXc" name="Geometria"/>
  237 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="uQPm8WJv01t0" type="gCEBGjygXMqu" name="Cabezal1"/>
  238 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="3UqoX6gQW3Ad" type="gCEBGjygXMqu" name="Cabezal2"/>
239 239 </UML:Classifier.feature>
240 240 </UML:Class>
241 241 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="6wPQBVstQYw3" name="SeccionJudicial">
242 242 <UML:Classifier.feature>
243   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="8pqUKbGQVdqe" type="dncYoY8UkMdy" name="numero"/>
244   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="9iYZGUdJYJUi" type="WhcdEhNGTPXc" name="geometria"/>
  243 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="8pqUKbGQVdqe" type="dncYoY8UkMdy" name="Numero"/>
  244 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="9iYZGUdJYJUi" type="WhcdEhNGTPXc" name="Geometria"/>
245 245 </UML:Classifier.feature>
246 246 </UML:Class>
247 247 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="45gDAFCxsqL4" name="SeccionPolicial">
248 248 <UML:Classifier.feature>
249   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="XefPS0RaoH38" type="dncYoY8UkMdy" name="numero"/>
250   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="qJYMvM044YdI" type="WhcdEhNGTPXc" name="geometria"/>
  249 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="XefPS0RaoH38" type="dncYoY8UkMdy" name="Numero"/>
  250 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="qJYMvM044YdI" type="WhcdEhNGTPXc" name="Geometria"/>
251 251 </UML:Classifier.feature>
252 252 </UML:Class>
253 253 <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="1EZZY1F3gvQ8" name="">
... ... @@ -306,13 +306,13 @@
306 306 </UML:Association>
307 307 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="B6kIvg1gUhU3" name="DireccionInterna">
308 308 <UML:Classifier.feature>
309   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="vfSJ6IxQ2ass" type="4vkGhFBaDyav" name="senda"/>
310   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="ngzobNmAliMT" type="xrosKNLalZGV" name="block"/>
311   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="s8pgTEZeKJuD" type="xrosKNLalZGV" name="torre"/>
312   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="ytuSbMWO2TAb" type="xrosKNLalZGV" name="piso"/>
313   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="rwlcd63VEsBh" type="xrosKNLalZGV" name="unidad"/>
314   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="4jLN0Day7URg" type="swYcGBYKkDue" name="descripcion"/>
315   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="kps2XaWjxILB" type="0lCIJN1IBOOh" name="lado"/>
  309 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="vfSJ6IxQ2ass" type="4vkGhFBaDyav" name="Senda"/>
  310 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="ngzobNmAliMT" type="xrosKNLalZGV" name="Block"/>
  311 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="s8pgTEZeKJuD" type="xrosKNLalZGV" name="Torre"/>
  312 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="ytuSbMWO2TAb" type="xrosKNLalZGV" name="Piso"/>
  313 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="rwlcd63VEsBh" type="xrosKNLalZGV" name="Unidad"/>
  314 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="4jLN0Day7URg" type="swYcGBYKkDue" name="Descripcion"/>
  315 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="kps2XaWjxILB" type="0lCIJN1IBOOh" name="Lado"/>
316 316 </UML:Classifier.feature>
317 317 </UML:Class>
318 318 <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="gj6lBVR0QTon" name="">
... ... @@ -321,7 +321,7 @@
321 321 <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="8F9EiFMMyQ88" type="tTM8hIy8GNaf" name="" aggregation="none"/>
322 322 </UML:Association.connection>
323 323 </UML:Association>
324   - <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="wZ8M1u9f6AQT" name="direccionInterna">
  324 + <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="wZ8M1u9f6AQT" name="DireccionInterna">
325 325 <UML:Association.connection>
326 326 <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="1..N" xmi.id="yv5cdA0jN7x5" type="tTM8hIy8GNaf" name="" aggregation="composite"/>
327 327 <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="*" xmi.id="MJSLiaRe7Zy6" type="B6kIvg1gUhU3" name="" aggregation="none"/>
... ... @@ -371,8 +371,8 @@
371 371 </UML:Association>
372 372 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="dICuM9h6UsS8" name="CodigoPostal">
373 373 <UML:Classifier.feature>
374   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="s7au96N5rPQO" type="gCEBGjygXMqu" name="codigo"/>
375   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="lhQygoTH4eBQ" type="WhcdEhNGTPXc" name="geometria"/>
  374 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="s7au96N5rPQO" type="gCEBGjygXMqu" name="Codigo"/>
  375 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="lhQygoTH4eBQ" type="WhcdEhNGTPXc" name="Geometria"/>
376 376 </UML:Classifier.feature>
377 377 </UML:Class>
378 378 <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="lsVFkxMb4uTB" name="">
... ... @@ -420,7 +420,7 @@
420 420 </UML:Association>
421 421 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="xg2HZ89UTSe9" name="Vialidad">
422 422 <UML:Classifier.feature>
423   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="TT1F82F8gHxU" type="4vkGhFBaDyav" name="tipo"/>
  423 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="TT1F82F8gHxU" type="CTisWh0eVOdb" name="Tipo"/>
424 424 </UML:Classifier.feature>
425 425 </UML:Class>
426 426 <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="oFsAUjbRPciw" name="">
... ... @@ -460,9 +460,9 @@
460 460 </UML:Association>
461 461 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="an76wmD6d9AN" name="Municipio">
462 462 <UML:Classifier.feature>
463   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="kT1UkY4rfa5e" type="5PxxxWWUqjGq" name="codigo"/>
464   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="1Q075SLa2rQm" type="yLDTOQJUye8m" name="nombre"/>
465   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="QbZNzo8zr3jz" type="WhcdEhNGTPXc" name="geometria"/>
  463 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="kT1UkY4rfa5e" type="5PxxxWWUqjGq" name="Codigo"/>
  464 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="1Q075SLa2rQm" type="yLDTOQJUye8m" name="Nombre"/>
  465 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="QbZNzo8zr3jz" type="WhcdEhNGTPXc" name="Geometria"/>
466 466 </UML:Classifier.feature>
467 467 </UML:Class>
468 468 <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="Who6fRzdA1CF" name="">
... ... @@ -485,8 +485,8 @@
485 485 </UML:Association>
486 486 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="SSn60ti0Hi7M" name="Coordenada">
487 487 <UML:Classifier.feature>
488   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="ARwCGMyiGZVP" type="iwXhez2vY6H2" name="coord"/>
489   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="KOJZGgVg6Jk5" type="4i4b5BkoCPyn" name="criterioGeocod"/>
  488 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="ARwCGMyiGZVP" type="iwXhez2vY6H2" name="Geometria"/>
  489 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="KOJZGgVg6Jk5" type="mapZE9I58GDo" name="CriterioGeocodificacion"/>
490 490 </UML:Classifier.feature>
491 491 </UML:Class>
492 492 <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="1yvbfORhpxwl" name="">
... ... @@ -495,7 +495,7 @@
495 495 <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="*" xmi.id="BjjdcwEdtACY" type="SSn60ti0Hi7M" name="" aggregation="none"/>
496 496 </UML:Association.connection>
497 497 </UML:Association>
498   - <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="WdDLZA6Wj9qJ" name="coordenadas">
  498 + <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="WdDLZA6Wj9qJ" name="Coordenadas">
499 499 <UML:Association.connection>
500 500 <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="1" xmi.id="5lVLvQI69zjj" type="B6kIvg1gUhU3" name="" aggregation="none"/>
501 501 <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="*" xmi.id="tyKm6XJc8Wvh" type="SSn60ti0Hi7M" name="" aggregation="none"/>
502 502  
503 503  
... ... @@ -504,21 +504,21 @@
504 504 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="0lCIJN1IBOOh" name="TipoLado"/>
505 505 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="Jft158ximH8y" name="LocalidadCatastral">
506 506 <UML:Classifier.feature>
507   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="nXCm7mwd2bOe" type="6aMgotUEBgWz" name="codigo"/>
508   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="lnLAJP3dec1i" type="yLDTOQJUye8m" name="nombre"/>
509   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="CX1tEZW7yMkj" type="WhcdEhNGTPXc" name="geometria"/>
  507 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="nXCm7mwd2bOe" type="6aMgotUEBgWz" name="Codigo"/>
  508 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="lnLAJP3dec1i" type="yLDTOQJUye8m" name="Nombre"/>
  509 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="CX1tEZW7yMkj" type="WhcdEhNGTPXc" name="Geometria"/>
510 510 </UML:Classifier.feature>
511 511 </UML:Class>
512 512 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="CyAWgunfYOu4" name="ManzanaCatastral">
513 513 <UML:Classifier.feature>
514   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="e9fXkAft9szU" type="gCEBGjygXMqu" name="numero"/>
515   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="2147pQZTbej2" type="WhcdEhNGTPXc" name="geometria"/>
  514 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="e9fXkAft9szU" type="gCEBGjygXMqu" name="Numero"/>
  515 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="2147pQZTbej2" type="WhcdEhNGTPXc" name="Geometria"/>
516 516 </UML:Classifier.feature>
517 517 </UML:Class>
518 518 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="qFnI6mQPRHOU" name="SolarCatastral">
519 519 <UML:Classifier.feature>
520   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="E35x2gPAwjO2" type="gCEBGjygXMqu" name="numero"/>
521   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="39wCXCzZB3g1" type="WhcdEhNGTPXc" name="geometria"/>
  520 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="E35x2gPAwjO2" type="gCEBGjygXMqu" name="Numero"/>
  521 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="39wCXCzZB3g1" type="WhcdEhNGTPXc" name="Geometria"/>
522 522 </UML:Classifier.feature>
523 523 </UML:Class>
524 524 <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="DXZZTFZEkj1p" name="">
525 525  
526 526  
527 527  
528 528  
529 529  
530 530  
... ... @@ -588,29 +588,30 @@
588 588 <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="*" xmi.id="diqcOKPnCSoV" type="4wYvkPyCfH8G" name="" aggregation="none"/>
589 589 </UML:Association.connection>
590 590 </UML:Association>
  591 + <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="mapZE9I58GDo" name="TipoCriterioGeocodificacion"/>
591 592 </UML:Namespace.ownedElement>
592 593 <XMI.extension xmi.extender="umbrello">
593 594 <diagrams>
594   - <diagram showopsig="1" linecolor="#000000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" isopen="1" showpackage="1" showpubliconly="1" showstereotype="1" name="class diagram" font="Sans Serif,9,-1,0,50,0,0,0,0,0" canvasheight="782" canvaswidth="1342" localid="-1" snapcsgrid="0" showgrid="0" showops="1" griddotcolor="#808080" backgroundcolor="#ffffff" usefillcolor="1" fillcolor="#ffffff" zoom="100" xmi.id="LivcEe3649X1" documentation="" showscope="1" snapgrid="0" showatts="1" type="1">
  595 + <diagram showopsig="1" linecolor="#000000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" isopen="1" showpackage="1" showpubliconly="1" showstereotype="1" name="class diagram" font="Sans Serif,9,-1,0,50,0,0,0,0,0" canvasheight="782" canvaswidth="1266" localid="-1" snapcsgrid="0" showgrid="0" showops="1" griddotcolor="#808080" backgroundcolor="#ffffff" usefillcolor="1" fillcolor="#ffffff" zoom="100" xmi.id="LivcEe3649X1" documentation="" showscope="1" snapgrid="0" showatts="1" type="1">
595 596 <widgets>
596 597 <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="523" showattsigs="601" showstereotype="1" y="222" showattributes="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" width="250" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="tTM8hIy8GNaf" showscope="1" height="105" showopsigs="601"/>
597   - <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="248" showattsigs="601" showstereotype="1" y="83" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="176" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="BtctkDrlM8Ug" showscope="1" height="63" showopsigs="601"/>
598   - <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="427" showattsigs="601" showstereotype="1" y="0" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="176" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="JrepmBDIqpt5" showscope="1" height="63" showopsigs="601"/>
599   - <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="851" showattsigs="601" showstereotype="1" y="14" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="196" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="UGLwdsYoj8hU" showscope="1" height="63" showopsigs="601"/>
600   - <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="334" showattsigs="601" showstereotype="1" y="482" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="JWDdehHvWvjI" showscope="1" height="49" showopsigs="601"/>
601   - <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="95" showattsigs="601" showstereotype="1" y="551" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="236" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="4wYvkPyCfH8G" showscope="1" height="63" showopsigs="601"/>
602   - <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="281" showattsigs="601" showstereotype="1" y="357" 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"/>
  598 + <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="248" showattsigs="601" showstereotype="1" y="83" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="176" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="BtctkDrlM8Ug" showscope="1" height="63" showopsigs="601"/>
  599 + <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="427" showattsigs="601" showstereotype="1" y="0" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="176" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="JrepmBDIqpt5" showscope="1" height="63" showopsigs="601"/>
  600 + <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="851" showattsigs="601" showstereotype="1" y="14" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="196" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="UGLwdsYoj8hU" showscope="1" height="63" showopsigs="601"/>
  601 + <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="334" showattsigs="601" showstereotype="1" y="482" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="JWDdehHvWvjI" showscope="1" height="49" showopsigs="601"/>
  602 + <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="22" showattsigs="601" showstereotype="1" y="548" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="236" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="4wYvkPyCfH8G" showscope="1" height="63" showopsigs="601"/>
  603 + <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="281" showattsigs="601" showstereotype="1" y="357" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="7e2rlhJ4EUgq" showscope="1" height="49" showopsigs="601"/>
603 604 <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="1065" showattsigs="601" showstereotype="1" y="281" 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"/>
604 605 <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="733" showattsigs="601" showstereotype="1" y="378" 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"/>
605   - <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="1012" showattsigs="601" showstereotype="1" y="124" 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"/>
  606 + <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="1012" showattsigs="601" showstereotype="1" y="124" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="196" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="jRE7u3EmnWHn" showscope="1" height="49" showopsigs="601"/>
606 607 <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="956" showattsigs="601" showstereotype="1" y="480" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="165" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="nqgOB6HFGZ5m" showscope="1" height="63" showopsigs="601"/>
607   - <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="375" showattsigs="601" showstereotype="1" y="663" 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"/>
608   - <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="396" showattsigs="601" showstereotype="1" y="729" 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"/>
  608 + <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="375" showattsigs="601" showstereotype="1" y="663" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="6wPQBVstQYw3" showscope="1" height="49" showopsigs="601"/>
  609 + <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="396" showattsigs="601" showstereotype="1" y="729" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="45gDAFCxsqL4" showscope="1" height="49" showopsigs="601"/>
609 610 <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="678" showattsigs="601" showstereotype="1" y="496" showattributes="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" width="216" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="B6kIvg1gUhU3" showscope="1" height="119" showopsigs="601"/>
610   - <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="350" showattsigs="601" showstereotype="1" y="593" 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"/>
611   - <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="1107" showattsigs="601" showstereotype="1" y="570" 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"/>
  611 + <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="350" showattsigs="601" showstereotype="1" y="593" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="dICuM9h6UsS8" showscope="1" height="49" showopsigs="601"/>
  612 + <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="1131" showattsigs="601" showstereotype="1" y="576" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="131" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="xg2HZ89UTSe9" showscope="1" height="35" showopsigs="601"/>
612 613 <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="660" showattsigs="601" showstereotype="1" y="107" showattributes="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" width="194" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="an76wmD6d9AN" showscope="1" height="63" showopsigs="601"/>
613   - <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="672" showattsigs="601" showstereotype="1" y="681" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="236" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="SSn60ti0Hi7M" showscope="1" height="49" showopsigs="601"/>
  614 + <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="672" showattsigs="601" showstereotype="1" y="681" showattributes="1" font="Sans Serif,9,-1,0,75,0,0,0,0,0" width="337" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="SSn60ti0Hi7M" showscope="1" height="49" showopsigs="601"/>
614 615 <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="16" showattsigs="601" showstereotype="1" y="128" showattributes="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" width="194" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="Jft158ximH8y" showscope="1" height="63" showopsigs="601"/>
615 616 <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="120" showattsigs="601" showstereotype="1" y="449" showattributes="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="CyAWgunfYOu4" showscope="1" height="49" showopsigs="601"/>
616 617 <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="176" showattsigs="601" showstereotype="1" y="224" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="qFnI6mQPRHOU" showscope="1" height="49" showopsigs="601"/>
... ... @@ -640,7 +641,7 @@
640 641 <assocwidget indexa="1" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="8" xmi.id="zOk2HbQUv3hx" widgetbid="4wYvkPyCfH8G" totalcountb="2" type="501" linewidth="none">
641 642 <linepath>
642 643 <startpoint startx="536" starty="327"/>
643   - <endpoint endx="331" endy="577"/>
  644 + <endpoint endx="258" endy="577"/>
644 645 <point x="536" y="577"/>
645 646 </linepath>
646 647 </assocwidget>
... ... @@ -677,8 +678,8 @@
677 678 <endpoint endx="1121" endy="515"/>
678 679 <point x="1167" y="515"/>
679 680 </linepath>
680   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="1148" showstereotype="1" y="348" text="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="HDhcIIJYLb6h" height="18"/>
681   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="1122" showstereotype="1" y="497" text="*" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="YYs9LNU7yDkH" height="18"/>
  681 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="1148" showstereotype="1" y="348" text="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="c7nHwapZ0ZAG" height="18"/>
  682 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="1122" showstereotype="1" y="497" text="*" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="YJtz6dhYlFRs" height="18"/>
682 683 </assocwidget>
683 684 <assocwidget indexa="3" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="8" xmi.id="u04Qom3cEViN" widgetbid="6wPQBVstQYw3" totalcountb="2" type="501" linewidth="none">
684 685 <linepath>
... ... @@ -706,9 +707,9 @@
706 707 <startpoint startx="692" starty="327"/>
707 708 <endpoint endx="692" endy="496"/>
708 709 </linepath>
709   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="700" showstereotype="1" y="455" 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="yynR23KIE0uU" height="18"/>
710   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="694" showstereotype="1" y="348" text="1..N" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="33" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="ID2cp7HLd9Ty" height="18"/>
711   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="695" showstereotype="1" y="478" 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="Xv5T8nk7lYWo" height="18"/>
  710 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="694" showstereotype="1" y="454" text="DireccionInterna" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="703" width="108" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="VtFseuGHz2Yu" height="18"/>
  711 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="694" showstereotype="1" y="348" text="1..N" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="33" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="cLRdvbtTukSy" height="18"/>
  712 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="693" showstereotype="1" y="479" text="*" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="N8W6NvysmElP" height="18"/>
712 713 </assocwidget>
713 714 <assocwidget indexa="3" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="5" xmi.id="w0Z5ax6axb3g" widgetbid="9xmfrTwvPUo7" totalcountb="2" type="501" linewidth="none">
714 715 <linepath>
... ... @@ -728,9 +729,9 @@
728 729 <startpoint startx="1097" starty="330"/>
729 730 <endpoint endx="1097" endy="480"/>
730 731 </linepath>
731   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="1019" showstereotype="1" y="403" 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="Zo6noyI5AIfx" height="18"/>
732   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="1100" showstereotype="1" y="333" text="0..2" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="32" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="PwG25jyaf23n" height="18"/>
733   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="1098" showstereotype="1" y="459" text="*" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="posbKMNr9Rev" height="18"/>
  732 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="1023" showstereotype="1" y="410" text="Entrecalles" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="703" width="74" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="6zg51CzeYQFR" height="18"/>
  733 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="1100" showstereotype="1" y="333" text="0..2" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="32" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="06usoLr9TLFq" height="18"/>
  734 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="1098" showstereotype="1" y="459" text="*" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="FDh1PQOTP4ZR" height="18"/>
734 735 </assocwidget>
735 736 <assocwidget indexa="1" indexb="1" widgetaid="BtctkDrlM8Ug" linecolor="none" totalcounta="3" xmi.id="ZW1vOR74z6tq" widgetbid="JrepmBDIqpt5" totalcountb="3" type="510" linewidth="none">
736 737 <linepath>
737 738  
738 739  
739 740  
... ... @@ -738,24 +739,24 @@
738 739 <endpoint endx="511" endy="63"/>
739 740 <point x="511" y="109"/>
740 741 </linepath>
741   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="429" showstereotype="1" y="86" text="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="PuyXBdUaZldd" height="18"/>
742   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="495" showstereotype="1" y="66" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="SZD5bHrP3hyL" height="18"/>
  742 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="429" showstereotype="1" y="86" text="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="FW3lvGCtK6l8" height="18"/>
  743 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="495" showstereotype="1" y="66" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="PaHswUhBhOA5" height="18"/>
743 744 </assocwidget>
744 745 <assocwidget indexa="1" indexb="1" widgetaid="JrepmBDIqpt5" linecolor="none" totalcounta="3" xmi.id="wSYw991iByO4" widgetbid="UGLwdsYoj8hU" totalcountb="2" type="510" linewidth="none">
745 746 <linepath>
746 747 <startpoint startx="603" starty="23"/>
747 748 <endpoint endx="851" endy="23"/>
748 749 </linepath>
749   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="619" showstereotype="1" y="5" text="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="4LCBmo69j5fu" height="18"/>
750   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="832" showstereotype="1" y="7" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="i9SGs3tJd6OC" height="18"/>
  750 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="619" showstereotype="1" y="5" text="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="oZYBb5aocbZV" height="18"/>
  751 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="832" showstereotype="1" y="7" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="rlO9s9HHkW8e" height="18"/>
751 752 </assocwidget>
752 753 <assocwidget indexa="1" indexb="3" widgetaid="xg2HZ89UTSe9" linecolor="none" totalcounta="2" xmi.id="33WRqx8ehYyk" widgetbid="9xmfrTwvPUo7" totalcountb="4" type="503" linewidth="none">
753 754 <linepath>
754   - <startpoint startx="1200" starty="570"/>
  755 + <startpoint startx="1200" starty="576"/>
755 756 <endpoint endx="1200" endy="330"/>
756 757 </linepath>
757   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="1202" showstereotype="1" y="550" 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="n5iO94aVGCrB" height="18"/>
758   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="1204" showstereotype="1" y="333" text="*" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="jZ8cSEE8Q0Xg" height="18"/>
  758 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="1202" showstereotype="1" y="556" text="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="0ppgBxlxUH66" height="18"/>
  759 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="1204" showstereotype="1" y="333" text="*" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="NhsxISS8DqH3" height="18"/>
759 760 </assocwidget>
760 761 <assocwidget indexa="4" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="5" xmi.id="3BaBClOzRqz2" widgetbid="an76wmD6d9AN" totalcountb="2" type="501" linewidth="none">
761 762 <linepath>
... ... @@ -769,8 +770,8 @@
769 770 <endpoint endx="753" endy="107"/>
770 771 <point x="753" y="40"/>
771 772 </linepath>
772   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="622" showstereotype="1" y="46" text="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="PoeyYqLLt1j2" height="18"/>
773   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="736" showstereotype="1" y="84" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="3HVJRNUBualK" height="18"/>
  773 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="622" showstereotype="1" y="46" text="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="xXLf3RJ2E6iP" height="18"/>
  774 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="736" showstereotype="1" y="84" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="4RKWgQa37TyO" height="18"/>
774 775 </assocwidget>
775 776 <assocwidget indexa="5" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="8" xmi.id="1yvbfORhpxwl" widgetbid="SSn60ti0Hi7M" totalcountb="2" type="503" linewidth="none">
776 777 <linepath>
777 778  
... ... @@ -778,17 +779,17 @@
778 779 <endpoint endx="672" endy="690"/>
779 780 <point x="619" y="690"/>
780 781 </linepath>
781   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="620" showstereotype="1" y="328" text="1..N" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="33" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="ozTDyytNnVJL" height="18"/>
782   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="654" showstereotype="1" y="672" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="JceCdLEhci04" height="18"/>
  782 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="620" showstereotype="1" y="328" text="1..N" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="33" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="vQW8ElCAIVpK" height="18"/>
  783 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="654" showstereotype="1" y="672" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="u9K8D0VFPpm5" height="18"/>
783 784 </assocwidget>
784 785 <assocwidget indexa="1" indexb="1" widgetaid="B6kIvg1gUhU3" linecolor="none" totalcounta="2" xmi.id="WdDLZA6Wj9qJ" widgetbid="SSn60ti0Hi7M" totalcountb="2" type="503" linewidth="none">
785 786 <linepath>