Skip to content

Commit

Permalink
Merge branch 'master' into uk-update
Browse files Browse the repository at this point in the history
  • Loading branch information
swcraig authored Aug 23, 2018
2 parents a44f40b + c708e4c commit 58fbbe4
Show file tree
Hide file tree
Showing 27 changed files with 533 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
### master (unreleased)

##### Geographic Modifications
* [#267](https://github.com/carmen-ruby/carmen/pull/267) Update Moroccan regions and subregions to match the new standard (after 2015), because of the absence of the new iso codes, I used the last two digit of the non-official [HASC](http://www.statoids.com/ihasc.html) codes.
([@kainio](https://github.com/kainio))
* [#268](https://github.com/carmen-ruby/carmen/pull/268) Remove UK overlays for Middlesex and Wiltshire ([@manewitz](https://github.com/manewitz))

### 1.1.1 (May 7, 2018)
Expand Down
33 changes: 33 additions & 0 deletions iso_data/overlay/world/ma.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
---
- code: '01'
type: economic region
- code: '02'
type: economic region
- code: '03'
type: economic region
- code: '04'
type: economic region
- code: '05'
type: economic region
- code: '06'
type: economic region
- code: '07'
type: economic region
- code: '08'
type: economic region
- code: '09'
type: economic region
- code: '10'
type: economic region
- code: '11'
type: economic region
- code: '12'
type: economic region
- code: '13'
_enabled: false
- code: '14'
_enabled: false
- code: '15'
_enabled: false
- code: '16'
_enabled: false
27 changes: 27 additions & 0 deletions iso_data/overlay/world/ma/01.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
- code: CHE
_enabled: false
- code: FAH
_enabled: false
- code: LAR
_enabled: false
- code: TET
_enabled: false
- code: TNG
_enabled: false
- code: TA
type: prefecture
- code: MF
type: prefecture
- code: TE
type: province
- code: FB
type: province
- code: LA
type: province
- code: AH
type: province
- code: CH
type: province
- code: OU
type: province
21 changes: 21 additions & 0 deletions iso_data/overlay/world/ma/02.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
- code: KEN
_enabled: false
- code: SIK
_enabled: false
- code: OA
type: prefecture
- code: NA
type: province
- code: DR
type: province
- code: JE
type: province
- code: BE
type: province
- code: TA
type: province
- code: GU
type: province
- code: FI
type: province
25 changes: 25 additions & 0 deletions iso_data/overlay/world/ma/03.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
---
- code: HOC
_enabled: false
- code: TAO
_enabled: false
- code: TAZ
_enabled: false
- code: FS
type: prefecture
- code: ME
type: prefecture
- code: EH
type: province
- code: IF
type: province
- code: ZM
type: province
- code: SE
type: province
- code: BO
type: province
- code: TN
type: province
- code: TZ
type: province
27 changes: 27 additions & 0 deletions iso_data/overlay/world/ma/04.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
- code: BER
_enabled: false
- code: FIG
_enabled: false
- code: JRA
_enabled: false
- code: NAD
_enabled: false
- code: OUJ
_enabled: false
- code: TAI
_enabled: false
- code: RA
type: prefecture
- code: SA
type: prefecture
- code: ST
type: prefecture
- code: KE
type: province
- code: KH
type: province
- code: SK
type: province
- code: SS
type: province
19 changes: 19 additions & 0 deletions iso_data/overlay/world/ma/05.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
- code: BOM
_enabled: false
- code: FES
_enabled: false
- code: MOU
_enabled: false
- code: SEF
_enabled: false
- code: BM
type: province
- code: AZ
type: province
- code: FB
type: province
- code: KF
type: province
- code: KB
type: province
30 changes: 30 additions & 0 deletions iso_data/overlay/world/ma/06.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
- code: ERR
_enabled: false
- code: HAJ
_enabled: false
- code: IFR
_enabled: false
- code: KHN
_enabled: false
- code: MEK
_enabled: false
- code: CB
type: prefecture
- code: MH
type: prefecture
- code: EJ
type: province
- code: NC
type: province
- code: ME
type: province
- code: BS
type: province
- code: BR
type: province
- code: SE
type: province
- code: SB
type: province

26 changes: 26 additions & 0 deletions iso_data/overlay/world/ma/07.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
- code: KHE
_enabled: false
- code: RAB
_enabled: false
- code: SAL
_enabled: false
- code: SKH
_enabled: false
- code: MR
type: prefecture
- code: CH
type: province
- code: AH
type: province
- code: EK
type: province
- code: ES
type: province
- code: RE
type: province
- code: SA
type: province
- code: YO
type: province

19 changes: 19 additions & 0 deletions iso_data/overlay/world/ma/08.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
- code: CAS
_enabled: false
- code: MED
_enabled: false
- code: MOH
_enabled: false
- code: NOU
_enabled: false
- code: ER
type: province
- code: OU
type: province
- code: MI
type: province
- code: TI
type: province
- code: ZA
type: province
19 changes: 19 additions & 0 deletions iso_data/overlay/world/ma/09.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
- code: BES
_enabled: false
- code: KHO
_enabled: false
- code: SET
_enabled: false
- code: AI
type: prefecture
- code: IA
type: prefecture
- code: CA
type: province
- code: TR
type: province
- code: TI
type: province
- code: TT
type: province
13 changes: 13 additions & 0 deletions iso_data/overlay/world/ma/10.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
- code: JDI
_enabled: false
- code: SAF
_enabled: false
- code: GU
type: province
- code: AZ
type: province
- code: TN
type: province
- code: SI
type: province
23 changes: 23 additions & 0 deletions iso_data/overlay/world/ma/11.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---
- code: CHI
_enabled: false
- code: ESI
_enabled: false
- code: HAO
_enabled: false
- code: KES
_enabled: false
- code: MMD
_enabled: false
- code: MMN
_enabled: false
- code: SYB
_enabled: false
- code: LA
type: province
- code: BO
type: province
- code: TA
type: province
- code: ES
type: province
9 changes: 9 additions & 0 deletions iso_data/overlay/world/ma/12.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
- code: AZI
_enabled: false
- code: BEM
_enabled: false
- code: OE
type: province
- code: AO
type: province
28 changes: 28 additions & 0 deletions locale/overlay/en/world/ma.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
---
en:
world:
ma:
'01':
name: Tanger-Tétouan-Al Hoceïma
'02':
name: L'Oriental
'03':
name: Fès-Meknès
'04':
name: Rabat-Salé-Kénitra
'05':
name: Béni Mellal-Khénifra
'06':
name: Casablanca-Settat
'07':
name: Marrakech-Safi
'08':
name: Drâa-Tafilalet
'09':
name: Souss-Massa
'10':
name: Guelmim-Oued Noun
'11':
name: Laâyoune-Sakia El Hamra
'12':
name: Dakhla-Oued Ed Dahab
22 changes: 22 additions & 0 deletions locale/overlay/en/world/ma/01.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
en:
world:
ma:
'01':
ch:
name: Chefchaouen
ou:
name: Ouezzane
la:
name: Larache
te:
name: Tétouan
ta:
name: Tanger-Assilah
mf:
name: M'diq-Fnideq
fb:
name: Fahs-Anjra
ah:
name: Al Hoceïma

21 changes: 21 additions & 0 deletions locale/overlay/en/world/ma/02.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
en:
world:
ma:
'02':
oa:
name: Oujda-Angad
na:
name: Nador
dr:
name: Driouch
je:
name: Jerada
be:
name: Berkane
ta:
name: Taourirt
gu:
name: Guercif
fi:
name: Figuig
Loading

0 comments on commit 58fbbe4

Please sign in to comment.