-
Notifications
You must be signed in to change notification settings - Fork 93
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
ocd for 'November 2019 Spanish general election' and existing parliament #173
Merged
jpmckinney
merged 7 commits into
opencivicdata:master
from
sguenther85:feature/country-es
Oct 17, 2019
Merged
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
2f41b1d
ocd for 'November 2019 Spanish general election' and existing parliament
acb9efc
Update country-es.csv
sguenther85 2312bd4
Update country-es.csv
sguenther85 6113cb4
Update provincia.csv
sguenther85 92e2339
Update comunidad_autonoma.csv
sguenther85 dd4d8bc
Update ciudad_autonoma.csv
sguenther85 ea5bb7c
Update country-es.csv
sguenther85 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| id,name | ||
| ocd-division/country:es,España | ||
| ocd-division/country:es/autonomous_region:ce,Ceuta | ||
| ocd-division/country:es/autonomous_region:ml,Melilla | ||
| ocd-division/country:es/state:an,Andalucía | ||
| ocd-division/country:es/state:an/cd:almería,Almería | ||
| ocd-division/country:es/state:an/cd:cádiz,Cádiz | ||
| ocd-division/country:es/state:an/cd:córdoba,Córdoba | ||
| ocd-division/country:es/state:an/cd:granada,Granada | ||
| ocd-division/country:es/state:an/cd:huelva,Huelva | ||
| ocd-division/country:es/state:an/cd:jaén,Jaén | ||
| ocd-division/country:es/state:an/cd:málaga,Málaga | ||
| ocd-division/country:es/state:an/cd:sevilla,Sevilla | ||
| ocd-division/country:es/state:ar,Aragón | ||
| ocd-division/country:es/state:ar/cd:huesca,Huesca | ||
| ocd-division/country:es/state:ar/cd:teruel,Teruel | ||
| ocd-division/country:es/state:ar/cd:zaragoza,Zaragoza | ||
| ocd-division/country:es/state:as,Principado de Asturias | ||
| ocd-division/country:es/state:as/cd:asturias,Asturias | ||
| ocd-division/country:es/state:cb,Cantabria | ||
| ocd-division/country:es/state:cb/cd:cantabria,Cantabria | ||
| ocd-division/country:es/state:cl,Castilla Y León | ||
| ocd-division/country:es/state:cl/cd:burgos,Burgos | ||
| ocd-division/country:es/state:cl/cd:león,León | ||
| ocd-division/country:es/state:cl/cd:palencia,Palencia | ||
| ocd-division/country:es/state:cl/cd:salamanca,Salamanca | ||
| ocd-division/country:es/state:cl/cd:segovia,Segovia | ||
| ocd-division/country:es/state:cl/cd:soria,Soria | ||
| ocd-division/country:es/state:cl/cd:valladolid,Valladolid | ||
| ocd-division/country:es/state:cl/cd:zamora,Zamora | ||
| ocd-division/country:es/state:cl/cd:ávila,Ávila | ||
| ocd-division/country:es/state:cm,Castilla-La Mancha | ||
| ocd-division/country:es/state:cm/cd:albacete,Albacete | ||
| ocd-division/country:es/state:cm/cd:ciudad_real,Ciudad Real | ||
| ocd-division/country:es/state:cm/cd:cuenca,Cuenca | ||
| ocd-division/country:es/state:cm/cd:guadalajara,Guadalajara | ||
| ocd-division/country:es/state:cm/cd:toledo,Toledo | ||
| ocd-division/country:es/state:cn,Canarias | ||
| ocd-division/country:es/state:cn/cd:las_palmas,Las Palmas | ||
| ocd-division/country:es/state:cn/cd:santa_cruz_de_tenerife,Santa Cruz de Tenerife | ||
| ocd-division/country:es/state:ct,Cataluña | ||
| ocd-division/country:es/state:ct/cd:barcelona,Barcelona | ||
| ocd-division/country:es/state:ct/cd:girona,Girona | ||
| ocd-division/country:es/state:ct/cd:lleida,Lleida | ||
| ocd-division/country:es/state:ct/cd:tarragona,Tarragona | ||
| ocd-division/country:es/state:ex,Extremadura | ||
| ocd-division/country:es/state:ex/cd:badajoz,Badajoz | ||
| ocd-division/country:es/state:ex/cd:cáceres,Cáceres | ||
| ocd-division/country:es/state:ga,Galicia | ||
| ocd-division/country:es/state:ga/cd:a_coruña,A Coruña | ||
| ocd-division/country:es/state:ga/cd:lugo,Lugo | ||
| ocd-division/country:es/state:ga/cd:ourense,Ourense | ||
| ocd-division/country:es/state:ga/cd:pontevedra,Pontevedra | ||
| ocd-division/country:es/state:lo,La Rioja | ||
| ocd-division/country:es/state:lo/cd:la_rioja,La Rioja | ||
| ocd-division/country:es/state:md,Comunidad de Madrid | ||
| ocd-division/country:es/state:md/cd:madrid,Madrid | ||
| ocd-division/country:es/state:mu,Región de Murcia | ||
| ocd-division/country:es/state:mu/cd:murcia,Murcia | ||
| ocd-division/country:es/state:na,Comunidad Floral de Navarra | ||
| ocd-division/country:es/state:na/cd:navarra,Navarra | ||
| ocd-division/country:es/state:pm,Illes Balears | ||
| ocd-division/country:es/state:pm/cd:baleares,Baleares | ||
| ocd-division/country:es/state:pv,País Vasco | ||
| ocd-division/country:es/state:pv/cd:bizkaia,Bizkaia | ||
| ocd-division/country:es/state:pv/cd:gipuzkoa,Gipuzkoa | ||
| ocd-division/country:es/state:pv/cd:álava,Álava | ||
| ocd-division/country:es/state:vc,Comunidad Valenciana | ||
| ocd-division/country:es/state:vc/cd:alicante,Alicante | ||
| ocd-division/country:es/state:vc/cd:castellón_de_la_plana,Castellón de la Plana | ||
| ocd-division/country:es/state:vc/cd:valencia,Valencia |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| ocd-division/country:es/autonomous_region:ce,Ceuta | ||
| ocd-division/country:es/autonomous_region:ml,Melilla | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| id,name | ||
jpmckinney marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| ocd-division/country:es,España | ||
| ocd-division/country:es/state:an,Andalucía | ||
| ocd-division/country:es/state:ar,Aragón | ||
| ocd-division/country:es/state:as,Principado de Asturias | ||
| ocd-division/country:es/state:pm,Illes Balears | ||
| ocd-division/country:es/state:pv,País Vasco | ||
| ocd-division/country:es/state:cn,Canarias | ||
| ocd-division/country:es/state:cb,Cantabria | ||
| ocd-division/country:es/state:cl,Castilla Y León | ||
| ocd-division/country:es/state:cm,Castilla-La Mancha | ||
| ocd-division/country:es/state:ct,Cataluña | ||
| ocd-division/country:es/state:ex,Extremadura | ||
| ocd-division/country:es/state:ga,Galicia | ||
| ocd-division/country:es/state:lo,La Rioja | ||
| ocd-division/country:es/state:md,Comunidad de Madrid | ||
| ocd-division/country:es/state:mu,Región de Murcia | ||
| ocd-division/country:es/state:na,Comunidad Floral de Navarra | ||
| ocd-division/country:es/state:vc,Comunidad Valenciana | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| ocd-division/country:es/state:ga/cd:a_coruña,A Coruña | ||
jpmckinney marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| ocd-division/country:es/state:pv/cd:álava,Álava | ||
| ocd-division/country:es/state:cm/cd:albacete,Albacete | ||
| ocd-division/country:es/state:vc/cd:alicante,Alicante | ||
| ocd-division/country:es/state:an/cd:almería,Almería | ||
| ocd-division/country:es/state:as/cd:asturias,Asturias | ||
| ocd-division/country:es/state:cl/cd:ávila,Ávila | ||
| ocd-division/country:es/state:ex/cd:badajoz,Badajoz | ||
| ocd-division/country:es/state:pm/cd:baleares,Baleares | ||
| ocd-division/country:es/state:ct/cd:barcelona,Barcelona | ||
| ocd-division/country:es/state:pv/cd:bizkaia,Bizkaia | ||
| ocd-division/country:es/state:cl/cd:burgos,Burgos | ||
| ocd-division/country:es/state:ex/cd:cáceres,Cáceres | ||
| ocd-division/country:es/state:an/cd:cádiz,Cádiz | ||
| ocd-division/country:es/state:cb/cd:cantabria,Cantabria | ||
| ocd-division/country:es/state:vc/cd:castellón_de_la_plana,Castellón de la Plana | ||
| ocd-division/country:es/state:cm/cd:ciudad_real,Ciudad Real | ||
| ocd-division/country:es/state:an/cd:córdoba,Córdoba | ||
| ocd-division/country:es/state:cm/cd:cuenca,Cuenca | ||
| ocd-division/country:es/state:pv/cd:gipuzkoa,Gipuzkoa | ||
| ocd-division/country:es/state:ct/cd:girona,Girona | ||
| ocd-division/country:es/state:an/cd:granada,Granada | ||
| ocd-division/country:es/state:cm/cd:guadalajara,Guadalajara | ||
| ocd-division/country:es/state:an/cd:huelva,Huelva | ||
| ocd-division/country:es/state:ar/cd:huesca,Huesca | ||
| ocd-division/country:es/state:an/cd:jaén,Jaén | ||
| ocd-division/country:es/state:lo/cd:la_rioja,La Rioja | ||
| ocd-division/country:es/state:cn/cd:las_palmas,Las Palmas | ||
| ocd-division/country:es/state:cl/cd:león,León | ||
| ocd-division/country:es/state:ct/cd:lleida,Lleida | ||
| ocd-division/country:es/state:ga/cd:lugo,Lugo | ||
| ocd-division/country:es/state:md/cd:madrid,Madrid | ||
| ocd-division/country:es/state:an/cd:málaga,Málaga | ||
| ocd-division/country:es/state:mu/cd:murcia,Murcia | ||
| ocd-division/country:es/state:na/cd:navarra,Navarra | ||
| ocd-division/country:es/state:ga/cd:ourense,Ourense | ||
| ocd-division/country:es/state:cl/cd:palencia,Palencia | ||
| ocd-division/country:es/state:ga/cd:pontevedra,Pontevedra | ||
| ocd-division/country:es/state:cl/cd:salamanca,Salamanca | ||
| ocd-division/country:es/state:cn/cd:santa_cruz_de_tenerife,Santa Cruz de Tenerife | ||
| ocd-division/country:es/state:cl/cd:segovia,Segovia | ||
| ocd-division/country:es/state:an/cd:sevilla,Sevilla | ||
| ocd-division/country:es/state:cl/cd:soria,Soria | ||
| ocd-division/country:es/state:ct/cd:tarragona,Tarragona | ||
| ocd-division/country:es/state:ar/cd:teruel,Teruel | ||
| ocd-division/country:es/state:cm/cd:toledo,Toledo | ||
| ocd-division/country:es/state:vc/cd:valencia,Valencia | ||
| ocd-division/country:es/state:cl/cd:valladolid,Valladolid | ||
| ocd-division/country:es/state:cl/cd:zamora,Zamora | ||
| ocd-division/country:es/state:ar/cd:zaragoza,Zaragoza | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd lean towards "region" here instead of "autonomous_region" but I won't block on that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i used "autonomous_region" because of the portugal PR.
Where we have a difference between i.e Lisboa and Acores
ocd-division/country:pt/region:li - Lisboa
ocd-division/country:pt/autonomous_region:ac - Acores
Lisboa is a region in Portugal, but Acores is a autonomous region (no normal region).
So I'd suggest to use "autonomous_region" in this special cases.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
SGTM.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see Ceuta and Melilla listed as autonomous cities on the Wikipedia page about autonomous communities, which suggests to me that they are autonomous communities like the other 'states'. Shouldn't they then all have the same OCD type?
I got confused because your comment is about Portugal, but this PR is about Spain.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I changes both now to "autonomous_city".
Sorry for confusion. I used portugal as an example for spain, because of the similar problem.
Ceute and Melilla have in spain an other "political status". So my suggestion would be to have a difference to the other communities, but if you both say "we should use the same ocd type", I can change that again.
@jpmckinney @jdmgoogle
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't know the details for Portugal, so I defer to you, @sguenther85.