Commit d17f110e007dd7773ba25e8095833994b208990d

Authored by Aníbal Pacheco
1 parent 4775e5d352
Exists in master

Se vuelven a quitar los prefijos 'Tipo'

Showing 1 changed file with 80 additions and 164 deletions Side-by-side Diff

direccionesV01p01.xsd View file @ d17f110
... ... @@ -33,40 +33,34 @@
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:TipoDireccionList" />
  36 + <element name="Direcciones" type="tns:DireccionList" />
37 37  
38   - <complexType name="TipoDireccionList">
  38 + <complexType name="DireccionList">
39 39 <sequence>
40   - <element maxOccurs="unbounded" minOccurs="0" name="Direccion" type="tns:TipoDireccion" />
  40 + <element maxOccurs="unbounded" minOccurs="0" name="Direccion" type="tns:Direccion" />
41 41 </sequence>
42 42 </complexType>
43 43  
44   - <complexType name="TipoPais">
  44 + <complexType name="Geometria">
45 45 <sequence>
  46 + <element ref="gml:_GeometricPrimitive" />
  47 + </sequence>
  48 + </complexType>
  49 +
  50 + <complexType name="Pais">
  51 + <sequence>
46 52 <element maxOccurs="1" minOccurs="1" name="Codigo" type="paises:ISOCountryCode" />
47 53 <element maxOccurs="1" minOccurs="0" name="Nombre" type="string" />
48   - <element maxOccurs="1" minOccurs="0" name="Geometria">
49   - <complexType>
50   - <sequence>
51   - <element ref="gml:_GeometricPrimitive" />
52   - </sequence>
53   - </complexType>
54   - </element>
  54 + <element maxOccurs="1" minOccurs="0" name="Geometria" type="tns:Geometria" />
55 55 </sequence>
56 56 </complexType>
57 57  
58   - <complexType name="TipoDepartamento">
  58 + <complexType name="Departamento">
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:TipoPais" />
  61 + <element maxOccurs="1" minOccurs="1" name="Pais" type="tns:Pais" />
62 62 <element maxOccurs="1" minOccurs="0" name="Nombre" type="string" />
63   - <element maxOccurs="1" minOccurs="0" name="Geometria">
64   - <complexType>
65   - <sequence>
66   - <element ref="gml:_GeometricPrimitive" />
67   - </sequence>
68   - </complexType>
69   - </element>
  63 + <element maxOccurs="1" minOccurs="0" name="Geometria" type="tns:Geometria" />
70 64 </sequence>
71 65 </complexType>
72 66  
73 67  
74 68  
75 69  
76 70  
77 71  
78 72  
79 73  
80 74  
81 75  
82 76  
83 77  
84 78  
85 79  
86 80  
87 81  
88 82  
89 83  
90 84  
91 85  
92 86  
93 87  
94 88  
95 89  
96 90  
97 91  
98 92  
... ... @@ -148,134 +142,86 @@
148 142 </restriction>
149 143 </simpleType>
150 144  
151   - <simpleType name="TipoCodigoMunicipio">
  145 + <simpleType name="CodigoMunicipio">
152 146 <restriction base="string">
153 147 <pattern value="[A-ZÑ][HL]?" />
154 148 </restriction>
155 149 </simpleType>
156 150  
157   - <complexType name="TipoMunicipio">
  151 + <complexType name="Municipio">
158 152 <sequence>
159   - <element maxOccurs="1" minOccurs="1" name="Codigo" type="tns:TipoCodigoMunicipio" />
160   - <element maxOccurs="1" minOccurs="1" name="Departamento" type="tns:TipoDepartamento" />
  153 + <element maxOccurs="1" minOccurs="1" name="Codigo" type="tns:CodigoMunicipio" />
  154 + <element maxOccurs="1" minOccurs="1" name="Departamento" type="tns:Departamento" />
161 155 <element maxOccurs="1" minOccurs="0" name="Nombre" type="string" />
162 156 </sequence>
163 157 </complexType>
164 158  
165   - <complexType name="TipoLocalidad">
  159 + <complexType name="Localidad">
166 160 <sequence>
167 161 <element maxOccurs="1" minOccurs="1" name="Codigo" type="tns:Alfa-3" />
168   - <element maxOccurs="1" minOccurs="1" name="Departamento" type="tns:TipoDepartamento" />
  162 + <element maxOccurs="1" minOccurs="1" name="Departamento" type="tns:Departamento" />
169 163 <element maxOccurs="1" minOccurs="0" name="Nombre" type="string" />
170   - <element maxOccurs="1" minOccurs="0" name="Geometria">
171   - <complexType>
172   - <sequence>
173   - <element ref="gml:_GeometricPrimitive" />
174   - </sequence>
175   - </complexType>
176   - </element>
  164 + <element maxOccurs="1" minOccurs="0" name="Geometria" type="tns:Geometria" />
177 165 </sequence>
178 166 </complexType>
179 167  
180   - <complexType name="TipoLocalidadCatastral">
  168 + <complexType name="LocalidadCatastral">
181 169 <sequence>
182   - <element maxOccurs="unbounded" minOccurs="0" name="ManzanasCatastrales" type="tns:TipoManzanaCatastral" />
183   - <element maxOccurs="unbounded" minOccurs="0" name="Padrones" type="tns:TipoPadron" />
  170 + <element maxOccurs="unbounded" minOccurs="0" name="ManzanasCatastrales" type="tns:ManzanaCatastral" />
  171 + <element maxOccurs="unbounded" minOccurs="0" name="Padrones" type="tns:Padron" />
184 172 <element maxOccurs="1" minOccurs="1" name="Codigo" type="tns:Alfa-3" />
185   - <element maxOccurs="1" minOccurs="1" name="Departamento" type="tns:TipoDepartamento" />
  173 + <element maxOccurs="1" minOccurs="1" name="Departamento" type="tns:Departamento" />
186 174 <element maxOccurs="1" minOccurs="0" name="Nombre" type="string" />
187   - <element maxOccurs="1" minOccurs="0" name="Geometria">
188   - <complexType>
189   - <sequence>
190   - <element ref="gml:_GeometricPrimitive" />
191   - </sequence>
192   - </complexType>
193   - </element>
  175 + <element maxOccurs="1" minOccurs="0" name="Geometria" type="tns:Geometria" />
194 176 </sequence>
195 177 </complexType>
196 178  
197   - <complexType name="TipoBarrio">
  179 + <complexType name="Barrio">
198 180 <sequence>
199 181 <element maxOccurs="1" minOccurs="0" name="Nombre" type="tns:Alfanumerico-100" />
200   - <element maxOccurs="1" minOccurs="0" name="Geometria">
201   - <complexType>
202   - <sequence>
203   - <element ref="gml:_GeometricPrimitive" />
204   - </sequence>
205   - </complexType>
206   - </element>
  182 + <element maxOccurs="1" minOccurs="0" name="Geometria" type="tns:Geometria" />
207 183 </sequence>
208 184 </complexType>
209 185  
210   - <complexType name="TipoManzana">
  186 + <complexType name="Manzana">
211 187 <sequence>
212   - <element maxOccurs="unbounded" minOccurs="0" name="Solares" type="tns:TipoSolar" />
  188 + <element maxOccurs="unbounded" minOccurs="0" name="Solares" type="tns:Solar" />
213 189 <element maxOccurs="1" minOccurs="1" name="Numero" type="tns:Numerico-5" />
214   - <element maxOccurs="1" minOccurs="0" name="Geometria">
215   - <complexType>
216   - <sequence>
217   - <element ref="gml:_GeometricPrimitive" />
218   - </sequence>
219   - </complexType>
220   - </element>
  190 + <element maxOccurs="1" minOccurs="0" name="Geometria" type="tns:Geometria" />
221 191 </sequence>
222 192 </complexType>
223 193  
224   - <complexType name="TipoManzanaCatastral">
  194 + <complexType name="ManzanaCatastral">
225 195 <sequence>
226   - <element maxOccurs="unbounded" minOccurs="0" name="SolaresCatastrales" type="tns:TipoSolarCatastral" />
227   - <element maxOccurs="1" minOccurs="1" name="LocalidadCatastral" type="tns:TipoLocalidadCatastral" />
  196 + <element maxOccurs="unbounded" minOccurs="0" name="SolaresCatastrales" type="tns:SolarCatastral" />
  197 + <element maxOccurs="1" minOccurs="1" name="LocalidadCatastral" type="tns:LocalidadCatastral" />
228 198 <element maxOccurs="1" minOccurs="1" name="Numero" type="tns:Alfanumerico-5" />
229   - <element maxOccurs="1" minOccurs="0" name="Geometria">
230   - <complexType>
231   - <sequence>
232   - <element ref="gml:_GeometricPrimitive" />
233   - </sequence>
234   - </complexType>
235   - </element>
  199 + <element maxOccurs="1" minOccurs="0" name="Geometria" type="tns:Geometria" />
236 200 </sequence>
237 201 </complexType>
238 202  
239   - <complexType name="TipoPadron">
  203 + <complexType name="Padron">
240 204 <sequence>
241   - <element maxOccurs="1" minOccurs="1" name="LocalidadCatastral" type="tns:TipoLocalidadCatastral" />
  205 + <element maxOccurs="1" minOccurs="1" name="LocalidadCatastral" type="tns:LocalidadCatastral" />
242 206 <element maxOccurs="1" minOccurs="1" name="Numero" type="tns:Alfanumerico-30" />
243 207 <element maxOccurs="1" minOccurs="0" name="UnidadCatastral" type="string" />
244   - <element maxOccurs="1" minOccurs="0" name="Geometria">
245   - <complexType>
246   - <sequence>
247   - <element ref="gml:_GeometricPrimitive" />
248   - </sequence>
249   - </complexType>
250   - </element>
  208 + <element maxOccurs="1" minOccurs="0" name="Geometria" type="tns:Geometria" />
251 209 </sequence>
252 210 </complexType>
253 211  
254   - <complexType name="TipoSolar">
  212 + <complexType name="Solar">
255 213 <sequence>
256   - <element maxOccurs="1" minOccurs="1" name="Manzana" type="tns:TipoManzana" />
  214 + <element maxOccurs="1" minOccurs="1" name="Manzana" type="tns:Manzana" />
257 215 <element maxOccurs="1" minOccurs="1" name="Numero" type="tns:Numerico-5" />
258   - <element maxOccurs="1" minOccurs="0" name="Geometria">
259   - <complexType>
260   - <sequence>
261   - <element ref="gml:_GeometricPrimitive" />
262   - </sequence>
263   - </complexType>
264   - </element>
  216 + <element maxOccurs="1" minOccurs="0" name="Geometria" type="tns:Geometria" />
265 217 </sequence>
266 218 </complexType>
267 219  
268   - <complexType name="TipoSolarCatastral">
  220 + <complexType name="SolarCatastral">
269 221 <sequence>
270   - <element maxOccurs="1" minOccurs="1" name="ManzanaCatastral" type="tns:TipoManzanaCatastral" />
  222 + <element maxOccurs="1" minOccurs="1" name="ManzanaCatastral" type="tns:ManzanaCatastral" />
271 223 <element maxOccurs="1" minOccurs="1" name="Numero" type="int" />
272   - <element maxOccurs="1" minOccurs="0" name="Geometria">
273   - <complexType>
274   - <sequence>
275   - <element ref="gml:_GeometricPrimitive" />
276   - </sequence>
277   - </complexType>
278   - </element>
  224 + <element maxOccurs="1" minOccurs="0" name="Geometria" type="tns:Geometria" />
279 225 </sequence>
280 226 </complexType>
281 227  
... ... @@ -286,7 +232,7 @@
286 232 </restriction>
287 233 </simpleType>
288 234  
289   - <complexType name="TipoDireccionInterna">
  235 + <complexType name="DireccionInterna">
290 236 <sequence>
291 237 <element maxOccurs="1" minOccurs="0" name="Senda" type="string" />
292 238 <element maxOccurs="1" minOccurs="0" name="Bloque" type="tns:Alfanumerico-50" />
293 239  
294 240  
295 241  
296 242  
297 243  
298 244  
... ... @@ -294,46 +240,28 @@
294 240 <element maxOccurs="1" minOccurs="0" name="Piso" type="tns:Alfanumerico-50" />
295 241 <element maxOccurs="1" minOccurs="0" name="Unidad" type="tns:Alfanumerico-50" />
296 242 <element maxOccurs="1" minOccurs="0" name="Descripcion" type="tns:Alfanumerico-300" />
297   - <element maxOccurs="unbounded" minOccurs="0" name="Coordenadas" type="tns:TipoCoordenadas" />
  243 + <element maxOccurs="unbounded" minOccurs="0" name="Coordenadas" type="tns:Coordenadas" />
298 244 </sequence>
299 245 </complexType>
300 246  
301   - <complexType name="TipoCodigoPostal">
  247 + <complexType name="CodigoPostal">
302 248 <sequence>
303 249 <element maxOccurs="1" minOccurs="1" name="Numero" type="tns:Numerico-5" />
304   - <element maxOccurs="1" minOccurs="0" name="Geometria">
305   - <complexType>
306   - <sequence>
307   - <element ref="gml:_GeometricPrimitive" />
308   - </sequence>
309   - </complexType>
310   - </element>
  250 + <element maxOccurs="1" minOccurs="0" name="Geometria" type="tns:Geometria" />
311 251 </sequence>
312 252 </complexType>
313 253  
314   - <complexType name="TipoSeccionPolicial">
  254 + <complexType name="SeccionPolicial">
315 255 <sequence>
316 256 <element maxOccurs="1" minOccurs="1" name="Numero" type="tns:Numerico-2" />
317   - <element maxOccurs="1" minOccurs="0" name="Geometria">
318   - <complexType>
319   - <sequence>
320   - <element ref="gml:_GeometricPrimitive" />
321   - </sequence>
322   - </complexType>
323   - </element>
  257 + <element maxOccurs="1" minOccurs="0" name="Geometria" type="tns:Geometria" />
324 258 </sequence>
325 259 </complexType>
326 260  
327   - <complexType name="TipoSeccionJudicial">
  261 + <complexType name="SeccionJudicial">
328 262 <sequence>
329 263 <element maxOccurs="1" minOccurs="1" name="Numero" type="tns:Numerico-2" />
330   - <element maxOccurs="1" minOccurs="0" name="Geometria">
331   - <complexType>
332   - <sequence>
333   - <element ref="gml:_GeometricPrimitive" />
334   - </sequence>
335   - </complexType>
336   - </element>
  264 + <element maxOccurs="1" minOccurs="0" name="Geometria" type="tns:Geometria" />
337 265 </sequence>
338 266 </complexType>
339 267  
340 268  
341 269  
... ... @@ -355,21 +283,15 @@
355 283 </restriction>
356 284 </simpleType>
357 285  
358   - <complexType name="TipoEntidadColectiva">
  286 + <complexType name="EntidadColectiva">
359 287 <sequence>
360 288 <element maxOccurs="1" minOccurs="0" name="Tipo" type="tns:TipoEntidadColectivaLC" />
361 289 <element maxOccurs="1" minOccurs="0" name="Nombre" type="tns:Alfanumerico-255" />
362   - <element maxOccurs="1" minOccurs="0" name="Geometria">
363   - <complexType>
364   - <sequence>
365   - <element ref="gml:_GeometricPrimitive" />
366   - </sequence>
367   - </complexType>
368   - </element>
  290 + <element maxOccurs="1" minOccurs="0" name="Geometria" type="tns:Geometria" />
369 291 </sequence>
370 292 </complexType>
371 293  
372   - <complexType name="TipoVialidad">
  294 + <complexType name="TipoVialidadLC">
373 295 <sequence>
374 296 <element maxOccurs="1" minOccurs="0" name="Tipo">
375 297 <simpleType final="list">
376 298  
377 299  
378 300  
... ... @@ -398,28 +320,22 @@
398 320 </sequence>
399 321 </complexType>
400 322  
401   - <complexType name="TipoViaCirculacion">
  323 + <complexType name="ViaCirculacion">
402 324 <sequence>
403 325 <element maxOccurs="1" minOccurs="0" name="NumeroRuta" type="tns:Numerico-3" />
404 326 <element maxOccurs="1" minOccurs="0" name="Nombre" type="tns:Alfanumerico-150" />
405   - <element maxOccurs="1" minOccurs="0" name="Vialidad" type="tns:TipoVialidad" />
  327 + <element maxOccurs="1" minOccurs="0" name="Vialidad" type="tns:TipoVialidadLC" />
406 328 <element maxOccurs="unbounded" minOccurs="0" name="Tramo" type="tns:TramoVia" />
407 329 </sequence>
408 330 </complexType>
409 331  
410 332 <complexType name="TramoVia">
411 333 <sequence>
412   - <element maxOccurs="1" minOccurs="1" name="Via" type="tns:TipoViaCirculacion" />
413   - <element maxOccurs="2" minOccurs="0" name="Entrecalles" type="tns:TipoViaCirculacion" />
  334 + <element maxOccurs="1" minOccurs="1" name="Via" type="tns:ViaCirculacion" />
  335 + <element maxOccurs="2" minOccurs="0" name="Entrecalles" type="tns:ViaCirculacion" />
414 336 <element maxOccurs="1" minOccurs="0" name="Cabezal1" type="tns:Numerico-5" />
415 337 <element maxOccurs="1" minOccurs="0" name="Cabezal2" type="tns:Numerico-5" />
416   - <element maxOccurs="1" minOccurs="0" name="Geometria">
417   - <complexType>
418   - <sequence>
419   - <element ref="gml:_GeometricPrimitive" />
420   - </sequence>
421   - </complexType>
422   - </element>
  338 + <element maxOccurs="1" minOccurs="0" name="Geometria" type="tns:Geometria" />
423 339 </sequence>
424 340 </complexType>
425 341  
... ... @@ -436,7 +352,7 @@
436 352 </restriction>
437 353 </simpleType>
438 354  
439   - <complexType name="TipoCoordenadas">
  355 + <complexType name="Coordenadas">
440 356 <sequence>
441 357 <element maxOccurs="1" minOccurs="1" name="Geometria">
442 358 <complexType>
443 359  
444 360  
445 361  
... ... @@ -449,33 +365,33 @@
449 365 </sequence>
450 366 </complexType>
451 367  
452   - <complexType name="TipoDireccion">
  368 + <complexType name="Direccion">
453 369 <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" />
  370 + <element maxOccurs="1" minOccurs="0" name="Pais" type="tns:Pais" />
  371 + <element maxOccurs="1" minOccurs="0" name="Departamento" type="tns:Departamento" />
  372 + <element maxOccurs="1" minOccurs="0" name="Municipio" type="tns:Municipio" />
  373 + <element maxOccurs="1" minOccurs="0" name="Localidad" type="tns:Localidad" />
  374 + <element maxOccurs="1" minOccurs="0" name="LocalidadCatastral" type="tns:LocalidadCatastral" />
  375 + <element maxOccurs="1" minOccurs="0" name="Barrio" type="tns:Barrio" />
  376 + <element maxOccurs="1" minOccurs="0" name="Manzana" type="tns:Manzana" />
  377 + <element maxOccurs="1" minOccurs="0" name="ManzanaCatastral" type="tns:ManzanaCatastral" />
  378 + <element maxOccurs="1" minOccurs="0" name="Padron" type="tns:Padron" />
  379 + <element maxOccurs="1" minOccurs="0" name="Solar" type="tns:Solar" />
  380 + <element maxOccurs="1" minOccurs="0" name="SolarCatastral" type="tns:SolarCatastral" />
465 381 <element maxOccurs="1" minOccurs="0" name="Numero" type="tns:Numerico-5" />
466 382 <element maxOccurs="1" minOccurs="0" name="Letra" type="tns:Alfanumerico-5" />
467 383 <element maxOccurs="1" minOccurs="0" name="Kilometro" type="tns:Numerico-9" />
468 384 <element maxOccurs="1" minOccurs="0" name="NombreInmueble" type="tns:Alfanumerico-100" />
469 385 <element maxOccurs="1" minOccurs="0" name="Descripcion" type="tns:Alfanumerico-300" />
470 386 <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" />
  387 + <element maxOccurs="unbounded" minOccurs="0" name="DireccionInterna" type="tns:DireccionInterna" />
  388 + <element maxOccurs="1" minOccurs="1" name="CodigoPostal" type="tns:CodigoPostal" />
  389 + <element maxOccurs="1" minOccurs="0" name="CeccionPolicial" type="tns:SeccionPolicial" />
  390 + <element maxOccurs="1" minOccurs="0" name="CeccionJudicial" type="tns:SeccionJudicial" />
  391 + <element maxOccurs="1" minOccurs="0" name="EntidadColectiva" type="tns:EntidadColectiva" />
  392 + <element maxOccurs="1" minOccurs="0" name="ViaCirculacion" type="tns:ViaCirculacion" />
477 393 <element maxOccurs="1" minOccurs="0" name="TramoVia" type="tns:TramoVia" />
478   - <element maxOccurs="unbounded" minOccurs="0" name="Coordenadas" type="tns:TipoCoordenadas" />
  394 + <element maxOccurs="unbounded" minOccurs="0" name="Coordenadas" type="tns:Coordenadas" />
479 395 </sequence>
480 396 </complexType>
481 397 </schema>