Commit 0a67d76c0052b617b39f22311b6fb8073cbddbd8

Authored by Anibal Pacheco
1 parent e55d47b93d
Exists in master

Cambios realizados durante la reunión de hoy

Showing 2 changed files with 64 additions and 62 deletions Side-by-side Diff

direccionesV01p01.xsd View file @ 0a67d76
... ... @@ -33,15 +33,15 @@
33 33 <import schemaLocation="paisesV01p01.xsd" namespace="http://metadatos.pge.red.uy/agesic/datos/paisesV01p01.xsd" />
34 34 <import schemaLocation="departamentosV01p01.xsd" namespace="http://metadatos.pge.red.uy/agesic/datos/departamentosV01p01.xsd" />
35 35  
36   - <element name="Direcciones" type="tns:DireccionList" />
  36 + <element name="Direcciones" type="tns:TipoDireccionList" />
37 37  
38   - <complexType name="DireccionList">
  38 + <complexType name="TipoDireccionList">
39 39 <sequence>
40 40 <element maxOccurs="unbounded" minOccurs="0" name="Direccion" type="tns:TipoDireccion" />
41 41 </sequence>
42 42 </complexType>
43 43  
44   - <complexType name="Pais">
  44 + <complexType name="TipoPais">
45 45 <sequence>
46 46 <element maxOccurs="1" minOccurs="1" name="codigo" type="paises:ISOCountryCode" />
47 47 <element maxOccurs="1" minOccurs="0" name="nombre" type="string" />
48 48  
... ... @@ -55,10 +55,10 @@
55 55 </sequence>
56 56 </complexType>
57 57  
58   - <complexType name="Departamento">
  58 + <complexType name="TipoDepartamento">
59 59 <sequence>
60 60 <element minOccurs="1" maxOccurs="1" name="codigo" type="departamentos:CodigoDepartamentoLC" />
61   - <element maxOccurs="1" minOccurs="1" name="pais" type="tns:Pais" />
  61 + <element maxOccurs="1" minOccurs="1" name="pais" type="tns:TipoPais" />
62 62 <element maxOccurs="1" minOccurs="0" name="nombre" type="string" />
63 63 <element maxOccurs="1" minOccurs="0" name="geometria">
64 64 <complexType>
65 65  
66 66  
67 67  
... ... @@ -148,18 +148,18 @@
148 148 </restriction>
149 149 </simpleType>
150 150  
151   - <complexType name="Municipio">
  151 + <complexType name="TipoMunicipio">
152 152 <sequence>
153 153 <element maxOccurs="1" minOccurs="1" name="codigo" type="tns:Alfa-2" />
154   - <element maxOccurs="1" minOccurs="1" name="departamento" type="tns:Departamento" />
  154 + <element maxOccurs="1" minOccurs="1" name="departamento" type="tns:TipoDepartamento" />
155 155 <element maxOccurs="1" minOccurs="0" name="nombre" type="string" />
156 156 </sequence>
157 157 </complexType>
158 158  
159   - <complexType name="Localidad">
  159 + <complexType name="TipoLocalidad">
160 160 <sequence>
161 161 <element maxOccurs="1" minOccurs="1" name="codigo" type="tns:Alfa-3" />
162   - <element maxOccurs="1" minOccurs="1" name="departamento" type="tns:Departamento" />
  162 + <element maxOccurs="1" minOccurs="1" name="departamento" type="tns:TipoDepartamento" />
163 163 <element maxOccurs="1" minOccurs="0" name="nombre" type="string" />
164 164 <element maxOccurs="unbounded" minOccurs="0" name="alias" type="string" />
165 165 <element maxOccurs="1" minOccurs="0" name="geometria">
166 166  
167 167  
... ... @@ -172,12 +172,12 @@
172 172 </sequence>
173 173 </complexType>
174 174  
175   - <complexType name="LocalidadCatastral">
  175 + <complexType name="TipoLocalidadCatastral">
176 176 <sequence>
177   - <element maxOccurs="unbounded" minOccurs="0" name="manzanasCatastrales" type="tns:ManzanaCatastral" />
178   - <element maxOccurs="unbounded" minOccurs="0" name="padrones" type="tns:Padron" />
  177 + <element maxOccurs="unbounded" minOccurs="0" name="manzanasCatastrales" type="tns:TipoManzanaCatastral" />
  178 + <element maxOccurs="unbounded" minOccurs="0" name="padrones" type="tns:TipoPadron" />
179 179 <element maxOccurs="1" minOccurs="1" name="codigo" type="tns:Alfa-3" />
180   - <element maxOccurs="1" minOccurs="1" name="departamento" type="tns:Departamento" />
  180 + <element maxOccurs="1" minOccurs="1" name="departamento" type="tns:TipoDepartamento" />
181 181 <element maxOccurs="1" minOccurs="0" name="nombre" type="string" />
182 182 <element maxOccurs="1" minOccurs="0" name="geometria">
183 183 <complexType>
... ... @@ -189,7 +189,7 @@
189 189 </sequence>
190 190 </complexType>
191 191  
192   - <complexType name="Barrio">
  192 + <complexType name="TipoBarrio">
193 193 <sequence>
194 194 <element maxOccurs="1" minOccurs="0" name="nombre" type="tns:Alfanumerico-100" />
195 195 <element maxOccurs="unbounded" minOccurs="0" name="alias" type="string" />
196 196  
... ... @@ -203,9 +203,9 @@
203 203 </sequence>
204 204 </complexType>
205 205  
206   - <complexType name="Manzana">
  206 + <complexType name="TipoManzana">
207 207 <sequence>
208   - <element maxOccurs="unbounded" minOccurs="0" name="solares" type="tns:Solar" />
  208 + <element maxOccurs="unbounded" minOccurs="0" name="solares" type="tns:TipoSolar" />
209 209 <element maxOccurs="1" minOccurs="1" name="numero" type="tns:Numerico-5" />
210 210 <element maxOccurs="1" minOccurs="0" name="geometria">
211 211 <complexType>
212 212  
... ... @@ -217,10 +217,10 @@
217 217 </sequence>
218 218 </complexType>
219 219  
220   - <complexType name="ManzanaCatastral">
  220 + <complexType name="TipoManzanaCatastral">
221 221 <sequence>
222   - <element maxOccurs="unbounded" minOccurs="0" name="solaresCatastrales" type="tns:SolarCatastral" />
223   - <element maxOccurs="1" minOccurs="1" name="localidadCatastral" type="tns:LocalidadCatastral" />
  222 + <element maxOccurs="unbounded" minOccurs="0" name="solaresCatastrales" type="tns:TipoSolarCatastral" />
  223 + <element maxOccurs="1" minOccurs="1" name="localidadCatastral" type="tns:TipoLocalidadCatastral" />
224 224 <element maxOccurs="1" minOccurs="1" name="numero" type="int" />
225 225 <element maxOccurs="1" minOccurs="0" name="geometria">
226 226 <complexType>
227 227  
... ... @@ -232,9 +232,9 @@
232 232 </sequence>
233 233 </complexType>
234 234  
235   - <complexType name="Padron">
  235 + <complexType name="TipoPadron">
236 236 <sequence>
237   - <element maxOccurs="1" minOccurs="1" name="localidadCatastral" type="tns:LocalidadCatastral" />
  237 + <element maxOccurs="1" minOccurs="1" name="localidadCatastral" type="tns:TipoLocalidadCatastral" />
238 238 <element maxOccurs="1" minOccurs="1" name="numero" type="tns:Alfanumerico-30" />
239 239 <element maxOccurs="1" minOccurs="0" name="unidadCatastral" type="string" />
240 240 <element maxOccurs="1" minOccurs="0" name="geometria">
241 241  
... ... @@ -247,9 +247,9 @@
247 247 </sequence>
248 248 </complexType>
249 249  
250   - <complexType name="Solar">
  250 + <complexType name="TipoSolar">
251 251 <sequence>
252   - <element maxOccurs="1" minOccurs="1" name="manzana" type="tns:Manzana" />
  252 + <element maxOccurs="1" minOccurs="1" name="manzana" type="tns:TipoManzana" />
253 253 <element maxOccurs="1" minOccurs="1" name="numero" type="tns:Numerico-5" />
254 254 <element maxOccurs="1" minOccurs="0" name="geometria">
255 255 <complexType>
256 256  
... ... @@ -261,9 +261,9 @@
261 261 </sequence>
262 262 </complexType>
263 263  
264   - <complexType name="SolarCatastral">
  264 + <complexType name="TipoSolarCatastral">
265 265 <sequence>
266   - <element maxOccurs="1" minOccurs="1" name="manzanaCatastral" type="tns:ManzanaCatastral" />
  266 + <element maxOccurs="1" minOccurs="1" name="manzanaCatastral" type="tns:TipoManzanaCatastral" />
267 267 <element maxOccurs="1" minOccurs="1" name="numero" type="int" />
268 268 <element maxOccurs="1" minOccurs="0" name="geometria">
269 269 <complexType>
270 270  
271 271  
272 272  
273 273  
... ... @@ -275,27 +275,26 @@
275 275 </sequence>
276 276 </complexType>
277 277  
278   - <simpleType final="list" name="TipoParidadLC">
  278 + <simpleType final="list" name="TipoLadoLC">
279 279 <restriction base="string">
280 280 <enumeration value="Izquierda" />
281 281 <enumeration value="Derecha" />
282 282 </restriction>
283 283 </simpleType>
284 284  
285   - <complexType name="DireccionInterna">
  285 + <complexType name="TipoDireccionInterna">
286 286 <sequence>
287   - <element maxOccurs="unbounded" minOccurs="1" name="direcciones" type="tns:TipoDireccion" />
288 287 <element maxOccurs="1" minOccurs="0" name="senda" type="string" />
289 288 <element maxOccurs="1" minOccurs="0" name="block" type="tns:Alfanumerico-50" />
290 289 <element maxOccurs="1" minOccurs="0" name="torre" type="tns:Alfanumerico-50" />
291 290 <element maxOccurs="1" minOccurs="0" name="piso" type="tns:Alfanumerico-50" />
292 291 <element maxOccurs="1" minOccurs="0" name="unidad" type="tns:Alfanumerico-50" />
293 292 <element maxOccurs="1" minOccurs="0" name="descripcion" type="tns:Alfanumerico-300" />
294   - <element maxOccurs="1" minOccurs="0" name="coordenadas" type="tns:Coordenada" />
  293 + <element maxOccurs="unbounded" minOccurs="0" name="coordenadas" type="tns:TipoCoordenada" />
295 294 </sequence>
296 295 </complexType>
297 296  
298   - <complexType name="CodigoPostal">
  297 + <complexType name="TipoCodigoPostal">
299 298 <sequence>
300 299 <element maxOccurs="1" minOccurs="1" name="numero" type="tns:Numerico-5" />
301 300 <element maxOccurs="1" minOccurs="0" name="geometria">
... ... @@ -308,7 +307,7 @@
308 307 </sequence>
309 308 </complexType>
310 309  
311   - <complexType name="SeccionPolicial">
  310 + <complexType name="TipoSeccionPolicial">
312 311 <sequence>
313 312 <element maxOccurs="1" minOccurs="1" name="numero" type="tns:Numerico-2" />
314 313 <element maxOccurs="1" minOccurs="0" name="geometria">
... ... @@ -321,7 +320,7 @@
321 320 </sequence>
322 321 </complexType>
323 322  
324   - <complexType name="SeccionJudicial">
  323 + <complexType name="TipoSeccionJudicial">
325 324 <sequence>
326 325 <element maxOccurs="1" minOccurs="1" name="numero" type="tns:Numerico-2" />
327 326 <element maxOccurs="1" minOccurs="0" name="geometria">
... ... @@ -334,7 +333,7 @@
334 333 </sequence>
335 334 </complexType>
336 335  
337   - <simpleType final="list" name="TipoEntidadColectiva">
  336 + <simpleType final="list" name="TipoEntidadColectivaLC">
338 337 <restriction base="string">
339 338 <enumeration value="AEROPUERTO" />
340 339 <enumeration value="ASENTAMIENTO IRREGULAR" />
341 340  
... ... @@ -352,9 +351,9 @@
352 351 </restriction>
353 352 </simpleType>
354 353  
355   - <complexType name="EntidadColectiva">
  354 + <complexType name="TipoEntidadColectiva">
356 355 <sequence>
357   - <element maxOccurs="1" minOccurs="0" name="tipo" type="tns:TipoEntidadColectiva" />
  356 + <element maxOccurs="1" minOccurs="0" name="tipo" type="tns:TipoEntidadColectivaLC" />
358 357 <element maxOccurs="1" minOccurs="0" name="nombre" type="tns:Alfanumerico-255" />
359 358 <element maxOccurs="1" minOccurs="0" name="geometria">
360 359 <complexType>
... ... @@ -366,7 +365,7 @@
366 365 </sequence>
367 366 </complexType>
368 367  
369   - <complexType name="Vialidad">
  368 + <complexType name="TipoVialidad">
370 369 <sequence>
371 370 <element maxOccurs="1" minOccurs="0" name="tipo">
372 371 <simpleType final="list">
373 372  
374 373  
... ... @@ -395,20 +394,20 @@
395 394 </sequence>
396 395 </complexType>
397 396  
398   - <complexType name="ViaCirculacion">
  397 + <complexType name="TipoViaCirculacion">
399 398 <sequence>
400 399 <element maxOccurs="1" minOccurs="0" name="numeroRuta" type="tns:Numerico-3" />
401 400 <element maxOccurs="1" minOccurs="0" name="nombre" type="tns:Alfanumerico-150" />
402 401 <element maxOccurs="unbounded" minOccurs="0" name="alias" type="tns:Alfanumerico-150" />
403   - <element maxOccurs="1" minOccurs="0" name="vialidad" type="tns:Vialidad" />
  402 + <element maxOccurs="1" minOccurs="0" name="vialidad" type="tns:TipoVialidad" />
404 403 <element maxOccurs="unbounded" minOccurs="0" name="tramo" type="tns:TramoVia" />
405 404 </sequence>
406 405 </complexType>
407 406  
408 407 <complexType name="TramoVia">
409 408 <sequence>
410   - <element maxOccurs="1" minOccurs="0" name="via" type="tns:ViaCirculacion" />
411   - <element maxOccurs="2" minOccurs="0" name="entrecalles" type="tns:ViaCirculacion" />
  409 + <element maxOccurs="1" minOccurs="1" name="via" type="tns:TipoViaCirculacion" />
  410 + <element maxOccurs="2" minOccurs="0" name="entrecalles" type="tns:TipoViaCirculacion" />
412 411 <element maxOccurs="1" minOccurs="0" name="cabezal1" type="tns:Numerico-5" />
413 412 <element maxOccurs="1" minOccurs="0" name="cabezal2" type="tns:Numerico-5" />
414 413 <element maxOccurs="1" minOccurs="0" name="geometria">
... ... @@ -421,7 +420,7 @@
421 420 </sequence>
422 421 </complexType>
423 422  
424   - <simpleType name="TipoCriterioGeocod">
  423 + <simpleType name="TipoCriterioGeocodLC">
425 424 <restriction base="string">
426 425 <enumeration value="0: Punto de acceso" />
427 426 <enumeration value="1: Punto de entrega del servicio" />
... ... @@ -434,7 +433,7 @@
434 433 </restriction>
435 434 </simpleType>
436 435  
437   - <complexType name="Coordenada">
  436 + <complexType name="TipoCoordenada">
438 437 <sequence>
439 438 <element maxOccurs="1" minOccurs="1" name="valor">
440 439 <complexType>
441 440  
442 441  
443 442  
... ... @@ -443,37 +442,37 @@
443 442 </sequence>
444 443 </complexType>
445 444 </element>
446   - <element maxOccurs="1" minOccurs="0" name="criterioGeocod" type="tns:TipoCriterioGeocod" />
  445 + <element maxOccurs="1" minOccurs="0" name="criterioGeocod" type="tns:TipoCriterioGeocodLC" />
447 446 </sequence>
448 447 </complexType>
449 448  
450 449 <complexType name="TipoDireccion">
451 450 <sequence>
452   - <element maxOccurs="1" minOccurs="0" name="pais" type="tns:Pais" />
453   - <element maxOccurs="1" minOccurs="0" name="departamento" type="tns:Departamento" />
454   - <element maxOccurs="1" minOccurs="0" name="municipio" type="tns:Municipio" />
455   - <element maxOccurs="1" minOccurs="0" name="localidad" type="tns:Localidad" />
456   - <element maxOccurs="1" minOccurs="0" name="localidadCatastral" type="tns:LocalidadCatastral" />
457   - <element maxOccurs="1" minOccurs="0" name="barrio" type="tns:Barrio" />
458   - <element maxOccurs="1" minOccurs="0" name="manzana" type="tns:Manzana" />
459   - <element maxOccurs="1" minOccurs="0" name="manzanaCatastral" type="tns:ManzanaCatastral" />
460   - <element maxOccurs="1" minOccurs="0" name="padron" type="tns:Padron" />
461   - <element maxOccurs="1" minOccurs="0" name="solar" type="tns:Solar" />
462   - <element maxOccurs="1" minOccurs="0" name="solarCatastral" type="tns:SolarCatastral" />
  451 + <element maxOccurs="1" minOccurs="0" name="pais" type="tns:TipoPais" />
  452 + <element maxOccurs="1" minOccurs="0" name="departamento" type="tns:TipoDepartamento" />
  453 + <element maxOccurs="1" minOccurs="0" name="municipio" type="tns:TipoMunicipio" />
  454 + <element maxOccurs="1" minOccurs="0" name="localidad" type="tns:TipoLocalidad" />
  455 + <element maxOccurs="1" minOccurs="0" name="localidadCatastral" type="tns:TipoLocalidadCatastral" />
  456 + <element maxOccurs="1" minOccurs="0" name="barrio" type="tns:TipoBarrio" />
  457 + <element maxOccurs="1" minOccurs="0" name="manzana" type="tns:TipoManzana" />
  458 + <element maxOccurs="1" minOccurs="0" name="manzanaCatastral" type="tns:TipoManzanaCatastral" />
  459 + <element maxOccurs="1" minOccurs="0" name="padron" type="tns:TipoPadron" />
  460 + <element maxOccurs="1" minOccurs="0" name="solar" type="tns:TipoSolar" />
  461 + <element maxOccurs="1" minOccurs="0" name="solarCatastral" type="tns:TipoSolarCatastral" />
463 462 <element maxOccurs="1" minOccurs="0" name="numero" type="tns:Numerico-5" />
464 463 <element maxOccurs="1" minOccurs="0" name="letra" type="tns:Alfanumerico-5" />
465 464 <element maxOccurs="1" minOccurs="0" name="kilometro" type="tns:Numerico-9" />
466 465 <element maxOccurs="1" minOccurs="0" name="nombreInmueble" type="tns:Alfanumerico-100" />
467 466 <element maxOccurs="1" minOccurs="0" name="descripcion" type="tns:Alfanumerico-300" />
468   - <element maxOccurs="1" minOccurs="0" name="paridad" type="tns:TipoParidadLC" />
469   - <element maxOccurs="unbounded" minOccurs="0" name="direccionInterna" type="tns:DireccionInterna" />
470   - <element maxOccurs="1" minOccurs="1" name="codigoPostal" type="tns:CodigoPostal" />
471   - <element maxOccurs="1" minOccurs="0" name="seccionPolicial" type="tns:SeccionPolicial" />
472   - <element maxOccurs="1" minOccurs="0" name="seccionJudicial" type="tns:SeccionJudicial" />
473   - <element maxOccurs="1" minOccurs="0" name="entidadColectiva" type="tns:EntidadColectiva" />
474   - <element maxOccurs="1" minOccurs="0" name="viaCirculacion" type="tns:ViaCirculacion" />
  467 + <element maxOccurs="1" minOccurs="0" name="lado" type="tns:TipoLadoLC" />
  468 + <element maxOccurs="unbounded" minOccurs="0" name="direccionInterna" type="tns:TipoDireccionInterna" />
  469 + <element maxOccurs="1" minOccurs="1" name="codigoPostal" type="tns:TipoCodigoPostal" />
  470 + <element maxOccurs="1" minOccurs="0" name="seccionPolicial" type="tns:TipoSeccionPolicial" />
  471 + <element maxOccurs="1" minOccurs="0" name="seccionJudicial" type="tns:TipoSeccionJudicial" />
  472 + <element maxOccurs="1" minOccurs="0" name="entidadColectiva" type="tns:TipoEntidadColectiva" />
  473 + <element maxOccurs="1" minOccurs="0" name="viaCirculacion" type="tns:TipoViaCirculacion" />
475 474 <element maxOccurs="1" minOccurs="0" name="tramoVia" type="tns:TramoVia" />
476   - <element maxOccurs="unbounded" minOccurs="0" name="coordenadas" type="tns:Coordenada" />
  475 + <element maxOccurs="unbounded" minOccurs="0" name="coordenadas" type="tns:TipoCoordenada" />
477 476 </sequence>
478 477 </complexType>
479 478 </schema>
direcciones_ejemplo1.xml View file @ 0a67d76
... ... @@ -55,6 +55,9 @@
55 55 <xsd:numero>0</xsd:numero>
56 56 </xsd:solar>
57 57 <xsd:numero>1365</xsd:numero>
  58 + <xsd:direccionInterna>
  59 + <xsd:piso>7</xsd:piso>
  60 + </xsd:direccionInterna>
58 61 <xsd:codigoPostal>
59 62 <xsd:numero>11100</xsd:numero>
60 63 </xsd:codigoPostal>