Merge pull request #19 from zenodallavalle/dev

added cadastral_code to data
zenodallavalle · Apr 7, 2023 · bb83169 · bb83169
2 parents b44b5d6 + 6b12f54
commit bb83169
Show file tree

Hide file tree

Showing 16 changed files with 190 additions and 1,020 deletions.
diff --git a/README.md b/README.md
@@ -55,21 +55,21 @@ ISTAT codes can be found [here](https://it.wikipedia.org/wiki/Codice_ISTAT) or [
 >>> pd.Series(["Torino", "Agliè", "Airasca"]).italy_geopop.from_municipality(population_limits='total')
 ```
 
-|     | municipality_code | municipality | province_code | province | province_short | region   | region_code | geometry     | population_F | population_M | population |
-| --- | ----------------- | ------------ | ------------- | -------- | -------------- | -------- | ----------- | ------------ | ------------ | ------------ | ---------- |
-| 0   | 1272              | Torino       | 1             | Torino   | TO             | Piemonte | 1           | MULTIPOLYGON | 441686.0     | 407062.0     | 848748.0   |
-| 1   | 1001              | Agliè        | 1             | Torino   | TO             | Piemonte | 1           | MULTIPOLYGON | 1347.0       | 1215.0       | 2562.0     |
-| 2   | 1002              | Airasca      | 1             | Torino   | TO             | Piemonte | 1           | MULTIPOLYGON | 1793.0       | 1867.0       | 3660.0     |
+|     | municipality_code | municipality | province_code | province | province_short | region   | region_code | cadastral_code | geometry     | population_F | population_M | population |
+| --- | ----------------- | ------------ | ------------- | -------- | -------------- | -------- | ----------- | -------------- | ------------ | ------------ | ------------ | ---------- |
+| 0   | 1272              | Torino       | 1             | Torino   | TO             | Piemonte | 1           | L219           | MULTIPOLYGON | 441686.0     | 407062.0     | 848748.0   |
+| 1   | 1001              | Agliè        | 1             | Torino   | TO             | Piemonte | 1           | A074           | MULTIPOLYGON | 1347.0       | 1215.0       | 2562.0     |
+| 2   | 1002              | Airasca      | 1             | Torino   | TO             | Piemonte | 1           | A109           | MULTIPOLYGON | 1793.0       | 1867.0       | 3660.0     |
 
 ```
 >>> pd.Series(["Torino", "Milano", "Venezia"]).italy_geopop.from_province(population_limits=[50], population_labels=['below_50', 'above_equal_50'])
 ```
 
-|     | province_code | province | province_short | municipalities            | region    | region_code | geometry     | below_50_F | above_equal_50_F | below_50_M | above_equal_50_M | below_50  | above_equal_50 |
-| --- | ------------- | -------- | -------------- | ------------------------- | --------- | ----------- | ------------ | ---------- | ---------------- | ---------- | ---------------- | --------- | -------------- |
-| 0   | 1             | Torino   | TO             | [{'municipality_code': 10 | Piemonte  | 1           | POLYGON      | 550793.0   | 586366.0         | 572143.0   | 499068.0         | 1122936.0 | 1085434.0      |
-| 1   | 15            | Milano   | MI             | [{'municipality_code': 15 | Lombardia | 3           | MULTIPOLYGON | 857481.0   | 792711.0         | 898004.0   | 666434.0         | 1755485.0 | 1459145.0      |
-| 2   | 27            | Venezia  | VE             | [{'municipality_code': 27 | Veneto    | 5           | POLYGON      | 205100.0   | 224401.0         | 214116.0   | 193299.0         | 419216.0  | 417700.0       |
+|     | province_code | province | province_short | municipalities             | region    | region_code | geometry     | below_50_F | above_equal_50_F | below_50_M | above_equal_50_M | below_50  | above_equal_50 |
+| --- | ------------- | -------- | -------------- | -------------------------- | --------- | ----------- | ------------ | ---------- | ---------------- | ---------- | ---------------- | --------- | -------------- |
+| 0   | 1             | Torino   | TO             | [{'cadastral_code': 'A074' | Piemonte  | 1           | POLYGON      | 550793.0   | 586366.0         | 572143.0   | 499068.0         | 1122936.0 | 1085434.0      |
+| 1   | 15            | Milano   | MI             | [{'cadastral_code': 'A010' | Lombardia | 3           | MULTIPOLYGON | 857481.0   | 792711.0         | 898004.0   | 666434.0         | 1755485.0 | 1459145.0      |
+| 2   | 27            | Venezia  | VE             | [{'cadastral_code': 'A302' | Veneto    | 5           | POLYGON      | 205100.0   | 224401.0         | 214116.0   | 193299.0         | 419216.0  | 417700.0       |
 
 ```
 
@@ -79,9 +79,9 @@ ISTAT codes can be found [here](https://it.wikipedia.org/wiki/Codice_ISTAT) or [
 
 |     | region_code | region    | provinces                 | geometry     | <3_F     | 3-11_F   | 11-19_F  | 19-25_F  | 25-50_F   | 50-65_F   | 65-75_F  | >=75_F   | <3_M     | 3-11_M   | 11-19_M  | 19-25_M  | 25-50_M   | 50-65_M   | 65-75_M  | >=75_M   | <3       | 3-11     | 11-19    | 19-25    | 25-50     | 50-65     | 65-75     | >=75      |
 | --- | ----------- | --------- | ------------------------- | ------------ | -------- | -------- | -------- | -------- | --------- | --------- | -------- | -------- | -------- | -------- | -------- | -------- | --------- | --------- | -------- | -------- | -------- | -------- | -------- | -------- | --------- | --------- | --------- | --------- |
-| 0   | 1           | Piemonte  | [{'province_code': 1, 'pr | POLYGON      | 40122.0  | 131269.0 | 149768.0 | 112474.0 | 614252.0  | 506764.0  | 279224.0 | 348632.0 | 42361.0  | 138788.0 | 159618.0 | 123911.0 | 629878.0  | 490464.0  | 251918.0 | 236907.0 | 82483.0  | 270057.0 | 309386.0 | 236385.0 | 1244130.0 | 997228.0  | 531142.0  | 585539.0  |
-| 1   | 3           | Lombardia | [{'province_code': 12, 'p | MULTIPOLYGON | 103867.0 | 336353.0 | 378153.0 | 274455.0 | 1520576.0 | 1144338.0 | 586818.0 | 716916.0 | 109087.0 | 356547.0 | 403719.0 | 303888.0 | 1572013.0 | 1135834.0 | 524720.0 | 475720.0 | 212954.0 | 692900.0 | 781872.0 | 578343.0 | 3092589.0 | 2280172.0 | 1111538.0 | 1192636.0 |
-| 2   | 5           | Veneto    | [{'province_code': 23, 'p | POLYGON      | 48285.0  | 157284.0 | 182441.0 | 136850.0 | 718105.0  | 578543.0  | 291166.0 | 354328.0 | 51390.0  | 166176.0 | 194064.0 | 149055.0 | 737009.0  | 573454.0  | 267403.0 | 242192.0 | 99675.0  | 323460.0 | 376505.0 | 285905.0 | 1455114.0 | 1151997.0 | 558569.0  | 596520.0  |
+| 0   | 1           | Piemonte  | [{'municipalities': array | POLYGON      | 40122.0  | 131269.0 | 149768.0 | 112474.0 | 614252.0  | 506764.0  | 279224.0 | 348632.0 | 42361.0  | 138788.0 | 159618.0 | 123911.0 | 629878.0  | 490464.0  | 251918.0 | 236907.0 | 82483.0  | 270057.0 | 309386.0 | 236385.0 | 1244130.0 | 997228.0  | 531142.0  | 585539.0  |
+| 1   | 3           | Lombardia | [{'municipalities': array | MULTIPOLYGON | 103867.0 | 336353.0 | 378153.0 | 274455.0 | 1520576.0 | 1144338.0 | 586818.0 | 716916.0 | 109087.0 | 356547.0 | 403719.0 | 303888.0 | 1572013.0 | 1135834.0 | 524720.0 | 475720.0 | 212954.0 | 692900.0 | 781872.0 | 578343.0 | 3092589.0 | 2280172.0 | 1111538.0 | 1192636.0 |
+| 2   | 5           | Veneto    | [{'municipalities': array | POLYGON      | 48285.0  | 157284.0 | 182441.0 | 136850.0 | 718105.0  | 578543.0  | 291166.0 | 354328.0 | 51390.0  | 166176.0 | 194064.0 | 149055.0 | 737009.0  | 573454.0  | 267403.0 | 242192.0 | 99675.0  | 323460.0 | 376505.0 | 285905.0 | 1455114.0 | 1151997.0 | 558569.0  | 596520.0  |
 
 ```
 
@@ -91,10 +91,10 @@ ISTAT codes can be found [here](https://it.wikipedia.org/wiki/Codice_ISTAT) or [
 
 |     | region_code | region    | provinces                 | geometry     | <3_F     | 3-11_F   | 11-19_F  | 19-25_F  | 25-50_F   | 50-65_F   | 65-75_F  | >=75_F   | <3_M     | 3-11_M   | 11-19_M  | 19-25_M  | 25-50_M   | 50-65_M   | 65-75_M  | >=75_M   | <3       | 3-11     | 11-19    | 19-25    | 25-50     | 50-65     | 65-75     | >=75      |
 | --- | ----------- | --------- | ------------------------- | ------------ | -------- | -------- | -------- | -------- | --------- | --------- | -------- | -------- | -------- | -------- | -------- | -------- | --------- | --------- | -------- | -------- | -------- | -------- | -------- | -------- | --------- | --------- | --------- | --------- |
-| 0   | 3.0         | Lombardia | [{'province_code': 12, 'p | MULTIPOLYGON | 103867.0 | 336353.0 | 378153.0 | 274455.0 | 1520576.0 | 1144338.0 | 586818.0 | 716916.0 | 109087.0 | 356547.0 | 403719.0 | 303888.0 | 1572013.0 | 1135834.0 | 524720.0 | 475720.0 | 212954.0 | 692900.0 | 781872.0 | 578343.0 | 3092589.0 | 2280172.0 | 1111538.0 | 1192636.0 |
-| 1   | 5.0         | Veneto    | [{'province_code': 23, 'p | POLYGON      | 48285.0  | 157284.0 | 182441.0 | 136850.0 | 718105.0  | 578543.0  | 291166.0 | 354328.0 | 51390.0  | 166176.0 | 194064.0 | 149055.0 | 737009.0  | 573454.0  | 267403.0 | 242192.0 | 99675.0  | 323460.0 | 376505.0 | 285905.0 | 1455114.0 | 1151997.0 | 558569.0  | 596520.0  |
+| 0   | 3.0         | Lombardia | [{'municipalities': array | MULTIPOLYGON | 103867.0 | 336353.0 | 378153.0 | 274455.0 | 1520576.0 | 1144338.0 | 586818.0 | 716916.0 | 109087.0 | 356547.0 | 403719.0 | 303888.0 | 1572013.0 | 1135834.0 | 524720.0 | 475720.0 | 212954.0 | 692900.0 | 781872.0 | 578343.0 | 3092589.0 | 2280172.0 | 1111538.0 | 1192636.0 |
+| 1   | 5.0         | Veneto    | [{'municipalities': array | POLYGON      | 48285.0  | 157284.0 | 182441.0 | 136850.0 | 718105.0  | 578543.0  | 291166.0 | 354328.0 | 51390.0  | 166176.0 | 194064.0 | 149055.0 | 737009.0  | 573454.0  | 267403.0 | 242192.0 | 99675.0  | 323460.0 | 376505.0 | 285905.0 | 1455114.0 | 1151997.0 | 558569.0  | 596520.0  |
 | 2   | nan         | nan       | nan                       | nan          | nan      | nan      | nan      | nan      | nan       | nan       | nan      | nan      | nan      | nan      | nan      | nan      | nan       | nan       | nan      | nan      | nan      | nan      | nan      | nan      | nan       | nan       | nan       | nan       |
-| 3   | 15.0        | Campania  | [{'province_code': 61, 'p | MULTIPOLYGON | 65798.0  | 201345.0 | 239653.0 | 185798.0 | 909861.0  | 641838.0  | 320637.0 | 311913.0 | 69298.0  | 213525.0 | 253444.0 | 200452.0 | 907541.0  | 602405.0  | 288497.0 | 212415.0 | 135096.0 | 414870.0 | 493097.0 | 386250.0 | 1817402.0 | 1244243.0 | 609134.0  | 524328.0  |
+| 3   | 15.0        | Campania  | [{'municipalities': array | MULTIPOLYGON | 65798.0  | 201345.0 | 239653.0 | 185798.0 | 909861.0  | 641838.0  | 320637.0 | 311913.0 | 69298.0  | 213525.0 | 253444.0 | 200452.0 | 907541.0  | 602405.0  | 288497.0 | 212415.0 | 135096.0 | 414870.0 | 493097.0 | 386250.0 | 1817402.0 | 1244243.0 | 609134.0  | 524328.0  |
 
 ## 📖 License
 

diff --git a/docs/source/_static/assets/quick_usage_01.csv b/docs/source/_static/assets/quick_usage_01.csv
@@ -1,4 +1,4 @@
-,municipality_code,municipality,province_code,province,province_short,region,region_code,geometry,population_F,population_M,population
-0,1272,Torino,1,Torino,TO,Piemonte,1,MULTIPOLYGON ,441686.0,407062.0,848748.0
-1,1001,Agliè,1,Torino,TO,Piemonte,1,MULTIPOLYGON ,1347.0,1215.0,2562.0
-2,1002,Airasca,1,Torino,TO,Piemonte,1,MULTIPOLYGON ,1793.0,1867.0,3660.0
+,municipality_code,municipality,cadastral_code,province_code,province,province_short,region,region_code,geometry,population_F,population_M,population
+0,1272,Torino,L219,1,Torino,TO,Piemonte,1,MULTIPOLYGON ,441686.0,407062.0,848748.0
+1,1001,Agliè,A074,1,Torino,TO,Piemonte,1,MULTIPOLYGON ,1347.0,1215.0,2562.0
+2,1002,Airasca,A109,1,Torino,TO,Piemonte,1,MULTIPOLYGON ,1793.0,1867.0,3660.0
diff --git a/docs/source/_static/assets/quick_usage_02.csv b/docs/source/_static/assets/quick_usage_02.csv
@@ -1,4 +1,4 @@
 ,province_code,province,province_short,municipalities,region,region_code,geometry,below_50_F,above_equal_50_F,below_50_M,above_equal_50_M,below_50,above_equal_50
-0,1,Torino,TO,[{'municipality_code': 10,Piemonte,1,POLYGON ,550793.0,586366.0,572143.0,499068.0,1122936.0,1085434.0
-1,15,Milano,MI,[{'municipality_code': 15,Lombardia,3,MULTIPOLYGON ,857481.0,792711.0,898004.0,666434.0,1755485.0,1459145.0
-2,27,Venezia,VE,[{'municipality_code': 27,Veneto,5,POLYGON ,205100.0,224401.0,214116.0,193299.0,419216.0,417700.0
+0,1,Torino,TO,[{'cadastral_code': 'A074,Piemonte,1,POLYGON ,550793.0,586366.0,572143.0,499068.0,1122936.0,1085434.0
+1,15,Milano,MI,[{'cadastral_code': 'A010,Lombardia,3,MULTIPOLYGON ,857481.0,792711.0,898004.0,666434.0,1755485.0,1459145.0
+2,27,Venezia,VE,[{'cadastral_code': 'A302,Veneto,5,POLYGON ,205100.0,224401.0,214116.0,193299.0,419216.0,417700.0
diff --git a/docs/source/_static/assets/quick_usage_03.csv b/docs/source/_static/assets/quick_usage_03.csv
@@ -1,4 +1,4 @@
 ,region_code,region,provinces,geometry,<3_F,3-11_F,11-19_F,19-25_F,25-50_F,50-65_F,65-75_F,>=75_F,<3_M,3-11_M,11-19_M,19-25_M,25-50_M,50-65_M,65-75_M,>=75_M,<3,3-11,11-19,19-25,25-50,50-65,65-75,>=75
-0,1,Piemonte,"[{'province_code': 1, 'pr",POLYGON ,40122.0,131269.0,149768.0,112474.0,614252.0,506764.0,279224.0,348632.0,42361.0,138788.0,159618.0,123911.0,629878.0,490464.0,251918.0,236907.0,82483.0,270057.0,309386.0,236385.0,1244130.0,997228.0,531142.0,585539.0
-1,3,Lombardia,"[{'province_code': 12, 'p",MULTIPOLYGON ,103867.0,336353.0,378153.0,274455.0,1520576.0,1144338.0,586818.0,716916.0,109087.0,356547.0,403719.0,303888.0,1572013.0,1135834.0,524720.0,475720.0,212954.0,692900.0,781872.0,578343.0,3092589.0,2280172.0,1111538.0,1192636.0
-2,5,Veneto,"[{'province_code': 23, 'p",POLYGON ,48285.0,157284.0,182441.0,136850.0,718105.0,578543.0,291166.0,354328.0,51390.0,166176.0,194064.0,149055.0,737009.0,573454.0,267403.0,242192.0,99675.0,323460.0,376505.0,285905.0,1455114.0,1151997.0,558569.0,596520.0
+0,1,Piemonte,[{'municipalities': array,POLYGON ,40122.0,131269.0,149768.0,112474.0,614252.0,506764.0,279224.0,348632.0,42361.0,138788.0,159618.0,123911.0,629878.0,490464.0,251918.0,236907.0,82483.0,270057.0,309386.0,236385.0,1244130.0,997228.0,531142.0,585539.0
+1,3,Lombardia,[{'municipalities': array,MULTIPOLYGON ,103867.0,336353.0,378153.0,274455.0,1520576.0,1144338.0,586818.0,716916.0,109087.0,356547.0,403719.0,303888.0,1572013.0,1135834.0,524720.0,475720.0,212954.0,692900.0,781872.0,578343.0,3092589.0,2280172.0,1111538.0,1192636.0
+2,5,Veneto,[{'municipalities': array,POLYGON ,48285.0,157284.0,182441.0,136850.0,718105.0,578543.0,291166.0,354328.0,51390.0,166176.0,194064.0,149055.0,737009.0,573454.0,267403.0,242192.0,99675.0,323460.0,376505.0,285905.0,1455114.0,1151997.0,558569.0,596520.0
diff --git a/docs/source/_static/assets/quick_usage_04.csv b/docs/source/_static/assets/quick_usage_04.csv
@@ -1,5 +1,5 @@
 ,region_code,region,provinces,geometry,<3_F,3-11_F,11-19_F,19-25_F,25-50_F,50-65_F,65-75_F,>=75_F,<3_M,3-11_M,11-19_M,19-25_M,25-50_M,50-65_M,65-75_M,>=75_M,<3,3-11,11-19,19-25,25-50,50-65,65-75,>=75
-0,3.0,Lombardia,"[{'province_code': 12, 'p",MULTIPOLYGON ,103867.0,336353.0,378153.0,274455.0,1520576.0,1144338.0,586818.0,716916.0,109087.0,356547.0,403719.0,303888.0,1572013.0,1135834.0,524720.0,475720.0,212954.0,692900.0,781872.0,578343.0,3092589.0,2280172.0,1111538.0,1192636.0
-1,5.0,Veneto,"[{'province_code': 23, 'p",POLYGON ,48285.0,157284.0,182441.0,136850.0,718105.0,578543.0,291166.0,354328.0,51390.0,166176.0,194064.0,149055.0,737009.0,573454.0,267403.0,242192.0,99675.0,323460.0,376505.0,285905.0,1455114.0,1151997.0,558569.0,596520.0
+0,3.0,Lombardia,[{'municipalities': array,MULTIPOLYGON ,103867.0,336353.0,378153.0,274455.0,1520576.0,1144338.0,586818.0,716916.0,109087.0,356547.0,403719.0,303888.0,1572013.0,1135834.0,524720.0,475720.0,212954.0,692900.0,781872.0,578343.0,3092589.0,2280172.0,1111538.0,1192636.0
+1,5.0,Veneto,[{'municipalities': array,POLYGON ,48285.0,157284.0,182441.0,136850.0,718105.0,578543.0,291166.0,354328.0,51390.0,166176.0,194064.0,149055.0,737009.0,573454.0,267403.0,242192.0,99675.0,323460.0,376505.0,285905.0,1455114.0,1151997.0,558569.0,596520.0
 2,nan,nan,nan,nan,nan,nan,nan,nan,nan,nan,nan,nan,nan,nan,nan,nan,nan,nan,nan,nan,nan,nan,nan,nan,nan,nan,nan,nan
-3,15.0,Campania,"[{'province_code': 61, 'p",MULTIPOLYGON ,65798.0,201345.0,239653.0,185798.0,909861.0,641838.0,320637.0,311913.0,69298.0,213525.0,253444.0,200452.0,907541.0,602405.0,288497.0,212415.0,135096.0,414870.0,493097.0,386250.0,1817402.0,1244243.0,609134.0,524328.0
+3,15.0,Campania,[{'municipalities': array,MULTIPOLYGON ,65798.0,201345.0,239653.0,185798.0,909861.0,641838.0,320637.0,311913.0,69298.0,213525.0,253444.0,200452.0,907541.0,602405.0,288497.0,212415.0,135096.0,414870.0,493097.0,386250.0,1817402.0,1244243.0,609134.0,524328.0
diff --git a/docs/source/api.rst b/docs/source/api.rst
@@ -59,6 +59,7 @@ Municipality data
 
 - ``municipality: str`` - municipality name, capitalized, available only if data is retrieved using :py:meth:`italy_goepop.pandas_extension.ItalyGeopop.from_municipality`.
 - ``municipality_code: int`` - municipality istat code, available only if data is retrieved using :py:meth:`italy_goepop.pandas_extension.ItalyGeopop.from_municipality`.
+- ``cadastral_code: str`` - municipality cadastral code (cadastral code), available only if data is retrieved using :py:meth:`italy_goepop.pandas_extension.ItalyGeopop.from_municipality`.
 - ``municipalities: list`` - a list of dictionaries with the following structure ``{'municipality_code': <municipality code:int>, 'municipality': <municipality name:str}``, available only if data is retrieved using :py:meth:`italy_goepop.pandas_extension.ItalyGeopop.from_province`.
 
 .. _province-data:

diff --git a/italy_geopop/__version__.py b/italy_geopop/__version__.py
@@ -1 +1 @@
-__version__ = "0.4.2"
+__version__ = "0.5.0"
diff --git a/italy_geopop/data/italy_municipalities_2022.feather b/italy_geopop/data/italy_municipalities_2022.feather
diff --git a/italy_geopop/data/italy_provinces_2022.feather b/italy_geopop/data/italy_provinces_2022.feather
diff --git a/italy_geopop/data/italy_regions_2022.feather b/italy_geopop/data/italy_regions_2022.feather
diff --git a/italy_geopop/pandas_extension.py b/italy_geopop/pandas_extension.py
@@ -64,7 +64,9 @@ def _generate_municipality_dfs(
         str_indexed = temp_df.set_index('_index')
         temp_df['_index'] = temp_df.municipality_code
         code_indexed = temp_df.set_index('_index')
-        return str_indexed, code_indexed
+        temp_df['_index'] = temp_df.cadastral_code.str.lower()
+        cadastral_indexed = temp_df.set_index('_index')
+        return str_indexed, code_indexed, cadastral_indexed
 
     def from_municipality(
         self,
@@ -74,7 +76,7 @@ def from_municipality(
         population_labels: list | None = None,
     ) -> pd.DataFrame:
         """Get data for municipalities.
-        Input series can contain municipalities names or municipalities istat codes; *data types can also be mixed*.
+        Input series can contain municipalities names, municipalities istat codes or municipalities cadastral code (also known as Belfiore's code); *data types can also be mixed*.
         If input data is not found in italian data, a row of NaNs is returned, *this behaviour may change in the future.*
 
         :param return_cols: used to subset the returned data in order to provide the requested fields. If None, all available fields are returned. If is an instance of re.Pattern or is a string and regex param is True columns will be filtered and returned only if their names match the regular expression. The available fields are listed above, defaults to None.
@@ -91,23 +93,28 @@ def from_municipality(
         :return: Requested data in a 2-dimensional dataframe that has the same index of input data.
         :rtype: pandas.DataFrame
         """
-        str_indexed, code_indexed = self._generate_municipality_dfs(
+        str_indexed, code_indexed, cadastral_indexed = self._generate_municipality_dfs(
             population_limits=population_limits,
             population_labels=population_labels,
             include_geometry=self.include_geometry,
         )
         empty_serie = self._generate_empty_serie(str_indexed.columns.to_list())
         str_indexed = dict(str_indexed.iterrows())
         code_indexed = dict(code_indexed.iterrows())
+        cadastral_indexed = dict(cadastral_indexed.iterrows())
 
         @cache
         def get_data(x) -> pd.Series:
             x = str(x).strip().lower()
             try:
                 x = int(float(x))
+                print('x is int', x)
                 return code_indexed.get(x, empty_serie)
             except Exception:
-                return str_indexed.get(x, empty_serie)
+                if re.fullmatch('[a-z][0-9]{3}', x):
+                    return cadastral_indexed.get(x, empty_serie)
+                else:
+                    return str_indexed.get(x, empty_serie)
 
         return handle_return_cols(self._obj.apply(get_data), return_cols, regex)
 

diff --git a/tests/test_geopop.py b/tests/test_geopop.py
@@ -7,6 +7,7 @@
 
 _municipality_columns = [
     'municipality',
+    'cadastral_code',
     'province',
     'province_code',
     'province_short',