PR #22 for #19/#17

Merge for the issue of #17 and #19 The following cities_id has to been replace by their replacement in your database foreign_keys | Cities name | Previous id | Replacement id | | :---------- | :---------- | :------------- | | Port-la-Nouvelle | 3931 | 3900 | | Isles-sur-Suippe | 18996 | 18749 | | Hénin-sur-Cojeul | 24683 | 24682 |
Stanislas-Poisson · Apr 21, 2018 · 31b331f · 31b331f
2 parents fe71df8 + 78e0800
commit 31b331f
Show file tree

Hide file tree

Showing 4 changed files with 86 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,77 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [1.3.0] - 2018-04-21
+### Added
+- Add this changelog
+
+### Changed
+- Fixing the format of postal_code in the cities (_sql, json, csv_) for:
+  - Montrevault-sur-Èvre
+  - Amiens
+
+### Removed
+- Remove the following id in the cities for duplicate:
+  - 3931 : Port-la-Nouvelle
+  - 18996 : Isles-sur-Suippe
+  - 24683 : Hénin-sur-Cojeul
+
+## [1.2.0] - 2018-03-14
+### Changed
+- Fixing the missing **ü** in the cities:
+  - slug
+  - pattern
+
+## [1.1.0] - 2018-01-06
+### Added
+- The following cities are missing in the list:
+  - Aurseulles
+  - Crolles
+  - Mazé-Milon
+
+### Changed
+- Fixing the format of name in the regions (_sql_) for:
+  - Provence-Alpes-Côte d'Azur
+- Fixing the format of name in the cities (_sql, json, csv_) for:
+  - L'Aiguillon-sur-Mer
+  - L'Aiguillon-sur-Vie
+  - Château-d'Olonne
+  - L'Épine
+  - Grand'Landes
+  - L'Herbergement
+  - L'Hermenault
+  - L'Île-d'Elle
+  - L'Île-d'Olonne
+  - L'Île-d'Yeu
+  - Nieul-sur-l'Autise
+  - Noirmoutier-en-l'Île
+  - L'Orbrie
+  - Rives-de-l'Yon
+  - Les Sables-d'Olonne
+  - Saint-André-Goule-d'Oie
+  - Saint-Michel-en-l'Herm
+  - Ville-d'Avray
+- Fixing the format of postal_code in the cities (_sql, json, csv_) for:
+  - Aurseulles
+  - La Chapelle-Saint-Géraud
+  - Palisse
+  - Crolles
+  - Férolles
+  - Saint-Firmin-sur-Loire
+  - Mazé-Milon
+  - Amiens
+
+## [1.0.1] - 2017-12-08
+### Changed
+- Fixing the export for creating the sql cities:
+  - **gps_lat** passed from _double(8,2)_ to _double(9,4)_
+  - **gps_lon** passed from _double(8,2)_ to _double(9,4)_
+
+## [1.0] - 2017-12-04
+### Added
+- The first release of the data.
diff --git a/CSV/cities.csv b/CSV/cities.csv
@@ -3929,7 +3929,6 @@
 3928;11;"Pomas";"pomas";"pomas";"11250";43.1125;2.2928
 3929;11;"Pomy";"pomy";"pomy";"11300";43.0594;2.0644
 3930;11;"Portel-des-Corbières";"portel-des-corbieres";"portel des corbieres";"11490";43.0553;2.9228
-3931;11;"Port-la-Nouvelle";"port-la-nouvelle";"port la nouvelle";"11210";43.0206;3.0433
 3932;11;"Pouzols-Minervois";"pouzols-minervois";"pouzols minervois";"11120";43.2872;2.825
 3933;11;"Pradelles-Cabardès";"pradelles-cabardes";"pradelles cabardes";"11380";43.4094;2.4472
 3934;11;"Pradelles-en-Val";"pradelles-en-val";"pradelles en val";"11220";43.1464;2.515
@@ -18089,7 +18088,7 @@
 18088;50;"Montreuil-Bellay";"montreuil-bellay";"montreuil bellay";"49260";47.1322;-0.1522
 18089;50;"Montreuil-sur-Loir";"montreuil-sur-loir";"montreuil sur loir";"49140";47.6086;-0.403
 18090;50;"Montrevault-sur-Èvre";"montrevault-sur-evre";"montrevault sur evre";"49110";47.2611;-1.0458
-18091;50;"Montrevault-sur-Èvre";"montrevault-sur-evre";"montrevault sur evre";"49600";47.2611;-1.0458
+18091;50;"Montrevault-sur-Èvre";"montrevault-sur-evre";"montrevault sur evre";"49270";47.2611;-1.0458
 18092;50;"Montrevault-sur-Èvre";"montrevault-sur-evre";"montrevault sur evre";"49600";47.2611;-1.0458
 18093;50;"Montsoreau";"montsoreau";"montsoreau";"49730";47.2172;0.0577
 18094;50;"Morannes sur Sarthe-Daumeray";"morannes-sur-sarthe-daumeray";"morannes sur sarthe daumeray";"49640";47.7464;-0.4155
@@ -18994,7 +18993,6 @@
 18993;52;"Hourges";"hourges";"hourges";"51140";49.2825;3.7702
 18994;52;"Huiron";"huiron";"huiron";"51300";48.7028;4.5419
 18995;52;"Humbauville";"humbauville";"humbauville";"51320";48.6592;4.4164
-18996;52;"Isles-sur-Suippe";"isles-sur-suippe";"isles sur suippe";"51110";49.3572;4.2014
 18997;52;"Jâlons";"jalons";"jalons";"51150";49.0114;4.1858
 18998;52;"Janvilliers";"janvilliers";"janvilliers";"51210";48.895;3.6492
 18999;52;"Janvry";"janvry";"janvry";"51390";49.2458;3.8769
@@ -24233,7 +24231,7 @@
 24232;62;"Tanville";"tanville";"tanville";"61500";48.5683;0.008
 24233;62;"Tellières-le-Plessis";"tellieres-le-plessis";"tellieres le plessis";"61390";48.6272;0.3925
 24234;62;"Tessé-Froulay";"tesse-froulay";"tesse froulay";"61410";48.5269;-0.4311
-24235;62;"Le Theil";"le-theil";"le theil";"61P19";48.2639;0.688
+24235;62;"Le Theil";"le-theil";"le theil";"61260";48.2639;0.688
 24236;62;"Ticheville";"ticheville";"ticheville";"61120";48.9092;0.2652
 24237;62;"Tinchebray-Bocage";"tinchebray-bocage";"tinchebray bocage";"61800";48.7628;-0.7341
 24238;62;"Torchamp";"torchamp";"torchamp";"61330";48.5467;-0.6977
@@ -24681,7 +24679,6 @@
 24680;63;"Hénin-Beaumont";"henin-beaumont";"henin beaumont";"62110";50.4217;2.9508
 24681;63;"Héninel";"heninel";"heninel";"62128";50.2389;2.8644
 24682;63;"Hénin-sur-Cojeul";"henin-sur-cojeul";"henin sur cojeul";"62128";50.2256;2.8352
-24683;63;"Hénin-sur-Cojeul";"henin-sur-cojeul";"henin sur cojeul";"62128";50.2256;2.8352
 24684;63;"Hénu";"henu";"henu";"62760";50.155;2.5255
 24685;63;"Herbinghen";"herbinghen";"herbinghen";"62850";50.7736;1.9125
 24686;63;"Héricourt";"hericourt";"hericourt";"62130";50.3461;2.255
@@ -32000,7 +31997,7 @@
 31999;81;"Allonville";"allonville";"allonville";"80260";49.9414;2.3633
 32000;81;"Amiens";"amiens";"amiens";"80000";49.8943;2.2957
 32001;81;"Amiens";"amiens";"amiens";"80080";49.8943;2.2957
-32002;81;"Amiens";"amiens";"amiens";"80000";49.8943;2.2957
+32002;81;"Amiens";"amiens";"amiens";"80090";49.8943;2.2957
 32003;81;"Andainville";"andainville";"andainville";"80140";49.8933;1.7858
 32004;81;"Andechy";"andechy";"andechy";"80700";49.7156;2.71
 32005;81;"Argœuves";"arguves";"arguves";"80470";49.9308;2.2275

diff --git a/JSON/cities.json b/JSON/cities.json
@@ -3928,7 +3928,6 @@
  {"id":3928, "departments_id":11, "name":"Pomas", "slug":"pomas", "pattern":"pomas", "postal_code":"11250", "gps_lat":43.1125, "gps_lon":2.2928},
  {"id":3929, "departments_id":11, "name":"Pomy", "slug":"pomy", "pattern":"pomy", "postal_code":"11300", "gps_lat":43.0594, "gps_lon":2.0644},
  {"id":3930, "departments_id":11, "name":"Portel-des-Corbi\u00e8res", "slug":"portel-des-corbieres", "pattern":"portel des corbieres", "postal_code":"11490", "gps_lat":43.0553, "gps_lon":2.9228},
- {"id":3931, "departments_id":11, "name":"Port-la-Nouvelle", "slug":"port-la-nouvelle", "pattern":"port la nouvelle", "postal_code":"11210", "gps_lat":43.0206, "gps_lon":3.0433},
  {"id":3932, "departments_id":11, "name":"Pouzols-Minervois", "slug":"pouzols-minervois", "pattern":"pouzols minervois", "postal_code":"11120", "gps_lat":43.2872, "gps_lon":2.825},
  {"id":3933, "departments_id":11, "name":"Pradelles-Cabard\u00e8s", "slug":"pradelles-cabardes", "pattern":"pradelles cabardes", "postal_code":"11380", "gps_lat":43.4094, "gps_lon":2.4472},
  {"id":3934, "departments_id":11, "name":"Pradelles-en-Val", "slug":"pradelles-en-val", "pattern":"pradelles en val", "postal_code":"11220", "gps_lat":43.1464, "gps_lon":2.515},
@@ -18088,7 +18087,7 @@
  {"id":18088, "departments_id":50, "name":"Montreuil-Bellay", "slug":"montreuil-bellay", "pattern":"montreuil bellay", "postal_code":"49260", "gps_lat":47.1322, "gps_lon":-0.1522},
  {"id":18089, "departments_id":50, "name":"Montreuil-sur-Loir", "slug":"montreuil-sur-loir", "pattern":"montreuil sur loir", "postal_code":"49140", "gps_lat":47.6086, "gps_lon":-0.403},
  {"id":18090, "departments_id":50, "name":"Montrevault-sur-\u00c8vre", "slug":"montrevault-sur-evre", "pattern":"montrevault sur evre", "postal_code":"49110", "gps_lat":47.2611, "gps_lon":-1.0458},
- {"id":18091, "departments_id":50, "name":"Montrevault-sur-\u00c8vre", "slug":"montrevault-sur-evre", "pattern":"montrevault sur evre", "postal_code":"49600", "gps_lat":47.2611, "gps_lon":-1.0458},
+ {"id":18091, "departments_id":50, "name":"Montrevault-sur-\u00c8vre", "slug":"montrevault-sur-evre", "pattern":"montrevault sur evre", "postal_code":"49270", "gps_lat":47.2611, "gps_lon":-1.0458},
  {"id":18092, "departments_id":50, "name":"Montrevault-sur-\u00c8vre", "slug":"montrevault-sur-evre", "pattern":"montrevault sur evre", "postal_code":"49600", "gps_lat":47.2611, "gps_lon":-1.0458},
  {"id":18093, "departments_id":50, "name":"Montsoreau", "slug":"montsoreau", "pattern":"montsoreau", "postal_code":"49730", "gps_lat":47.2172, "gps_lon":0.0577},
  {"id":18094, "departments_id":50, "name":"Morannes sur Sarthe-Daumeray", "slug":"morannes-sur-sarthe-daumeray", "pattern":"morannes sur sarthe daumeray", "postal_code":"49640", "gps_lat":47.7464, "gps_lon":-0.4155},
@@ -18993,7 +18992,6 @@
  {"id":18993, "departments_id":52, "name":"Hourges", "slug":"hourges", "pattern":"hourges", "postal_code":"51140", "gps_lat":49.2825, "gps_lon":3.7702},
  {"id":18994, "departments_id":52, "name":"Huiron", "slug":"huiron", "pattern":"huiron", "postal_code":"51300", "gps_lat":48.7028, "gps_lon":4.5419},
  {"id":18995, "departments_id":52, "name":"Humbauville", "slug":"humbauville", "pattern":"humbauville", "postal_code":"51320", "gps_lat":48.6592, "gps_lon":4.4164},
- {"id":18996, "departments_id":52, "name":"Isles-sur-Suippe", "slug":"isles-sur-suippe", "pattern":"isles sur suippe", "postal_code":"51110", "gps_lat":49.3572, "gps_lon":4.2014},
  {"id":18997, "departments_id":52, "name":"J\u00e2lons", "slug":"jalons", "pattern":"jalons", "postal_code":"51150", "gps_lat":49.0114, "gps_lon":4.1858},
  {"id":18998, "departments_id":52, "name":"Janvilliers", "slug":"janvilliers", "pattern":"janvilliers", "postal_code":"51210", "gps_lat":48.895, "gps_lon":3.6492},
  {"id":18999, "departments_id":52, "name":"Janvry", "slug":"janvry", "pattern":"janvry", "postal_code":"51390", "gps_lat":49.2458, "gps_lon":3.8769},
@@ -24232,7 +24230,7 @@
  {"id":24232, "departments_id":62, "name":"Tanville", "slug":"tanville", "pattern":"tanville", "postal_code":"61500", "gps_lat":48.5683, "gps_lon":0.008},
  {"id":24233, "departments_id":62, "name":"Telli\u00e8res-le-Plessis", "slug":"tellieres-le-plessis", "pattern":"tellieres le plessis", "postal_code":"61390", "gps_lat":48.6272, "gps_lon":0.3925},
  {"id":24234, "departments_id":62, "name":"Tess\u00e9-Froulay", "slug":"tesse-froulay", "pattern":"tesse froulay", "postal_code":"61410", "gps_lat":48.5269, "gps_lon":-0.4311},
- {"id":24235, "departments_id":62, "name":"Le Theil", "slug":"le-theil", "pattern":"le theil", "postal_code":"61P19", "gps_lat":48.2639, "gps_lon":0.688},
+ {"id":24235, "departments_id":62, "name":"Le Theil", "slug":"le-theil", "pattern":"le theil", "postal_code":"61260", "gps_lat":48.2639, "gps_lon":0.688},
  {"id":24236, "departments_id":62, "name":"Ticheville", "slug":"ticheville", "pattern":"ticheville", "postal_code":"61120", "gps_lat":48.9092, "gps_lon":0.2652},
  {"id":24237, "departments_id":62, "name":"Tinchebray-Bocage", "slug":"tinchebray-bocage", "pattern":"tinchebray bocage", "postal_code":"61800", "gps_lat":48.7628, "gps_lon":-0.7341},
  {"id":24238, "departments_id":62, "name":"Torchamp", "slug":"torchamp", "pattern":"torchamp", "postal_code":"61330", "gps_lat":48.5467, "gps_lon":-0.6977},
@@ -24680,7 +24678,6 @@
  {"id":24680, "departments_id":63, "name":"H\u00e9nin-Beaumont", "slug":"henin-beaumont", "pattern":"henin beaumont", "postal_code":"62110", "gps_lat":50.4217, "gps_lon":2.9508},
  {"id":24681, "departments_id":63, "name":"H\u00e9ninel", "slug":"heninel", "pattern":"heninel", "postal_code":"62128", "gps_lat":50.2389, "gps_lon":2.8644},
  {"id":24682, "departments_id":63, "name":"H\u00e9nin-sur-Cojeul", "slug":"henin-sur-cojeul", "pattern":"henin sur cojeul", "postal_code":"62128", "gps_lat":50.2256, "gps_lon":2.8352},
- {"id":24683, "departments_id":63, "name":"H\u00e9nin-sur-Cojeul", "slug":"henin-sur-cojeul", "pattern":"henin sur cojeul", "postal_code":"62128", "gps_lat":50.2256, "gps_lon":2.8352},
  {"id":24684, "departments_id":63, "name":"H\u00e9nu", "slug":"henu", "pattern":"henu", "postal_code":"62760", "gps_lat":50.155, "gps_lon":2.5255},
  {"id":24685, "departments_id":63, "name":"Herbinghen", "slug":"herbinghen", "pattern":"herbinghen", "postal_code":"62850", "gps_lat":50.7736, "gps_lon":1.9125},
  {"id":24686, "departments_id":63, "name":"H\u00e9ricourt", "slug":"hericourt", "pattern":"hericourt", "postal_code":"62130", "gps_lat":50.3461, "gps_lon":2.255},
@@ -31999,7 +31996,7 @@
  {"id":31999, "departments_id":81, "name":"Allonville", "slug":"allonville", "pattern":"allonville", "postal_code":"80260", "gps_lat":49.9414, "gps_lon":2.3633},
  {"id":32000, "departments_id":81, "name":"Amiens", "slug":"amiens", "pattern":"amiens", "postal_code":"80000", "gps_lat":49.8943, "gps_lon":2.2957},
  {"id":32001, "departments_id":81, "name":"Amiens", "slug":"amiens", "pattern":"amiens", "postal_code":"80080", "gps_lat":49.8943, "gps_lon":2.2957},
- {"id":32002, "departments_id":81, "name":"Amiens", "slug":"amiens", "pattern":"amiens", "postal_code":"80000", "gps_lat":49.8943, "gps_lon":2.2957},
+ {"id":32002, "departments_id":81, "name":"Amiens", "slug":"amiens", "pattern":"amiens", "postal_code":"80090", "gps_lat":49.8943, "gps_lon":2.2957},
  {"id":32003, "departments_id":81, "name":"Andainville", "slug":"andainville", "pattern":"andainville", "postal_code":"80140", "gps_lat":49.8933, "gps_lon":1.7858},
  {"id":32004, "departments_id":81, "name":"Andechy", "slug":"andechy", "pattern":"andechy", "postal_code":"80700", "gps_lat":49.7156, "gps_lon":2.71},
  {"id":32005, "departments_id":81, "name":"Arg\u0153uves", "slug":"arguves", "pattern":"arguves", "postal_code":"80470", "gps_lat":49.9308, "gps_lon":2.2275},

diff --git a/SQL/cities.sql b/SQL/cities.sql
@@ -3944,7 +3944,6 @@ INSERT INTO `cities` VALUES
 (3928,11,'Pomas','pomas','pomas','11250',43.1125,2.2928),
 (3929,11,'Pomy','pomy','pomy','11300',43.0594,2.0644),
 (3930,11,'Portel-des-Corbières','portel-des-corbieres','portel des corbieres','11490',43.0553,2.9228),
-(3931,11,'Port-la-Nouvelle','port-la-nouvelle','port la nouvelle','11210',43.0206,3.0433),
 (3932,11,'Pouzols-Minervois','pouzols-minervois','pouzols minervois','11120',43.2872,2.8250),
 (3933,11,'Pradelles-Cabardès','pradelles-cabardes','pradelles cabardes','11380',43.4094,2.4472),
 (3934,11,'Pradelles-en-Val','pradelles-en-val','pradelles en val','11220',43.1464,2.5150),
@@ -18104,7 +18103,7 @@ INSERT INTO `cities` VALUES
 (18088,50,'Montreuil-Bellay','montreuil-bellay','montreuil bellay','49260',47.1322,-0.1522),
 (18089,50,'Montreuil-sur-Loir','montreuil-sur-loir','montreuil sur loir','49140',47.6086,-0.4030),
 (18090,50,'Montrevault-sur-Èvre','montrevault-sur-evre','montrevault sur evre','49110',47.2611,-1.0458),
-(18091,50,'Montrevault-sur-Èvre','montrevault-sur-evre','montrevault sur evre','49600',47.2611,-1.0458),
+(18091,50,'Montrevault-sur-Èvre','montrevault-sur-evre','montrevault sur evre','49270',47.2611,-1.0458),
 (18092,50,'Montrevault-sur-Èvre','montrevault-sur-evre','montrevault sur evre','49600',47.2611,-1.0458),
 (18093,50,'Montsoreau','montsoreau','montsoreau','49730',47.2172,0.0577),
 (18094,50,'Morannes sur Sarthe-Daumeray','morannes-sur-sarthe-daumeray','morannes sur sarthe daumeray','49640',47.7464,-0.4155),
@@ -19009,7 +19008,6 @@ INSERT INTO `cities` VALUES
 (18993,52,'Hourges','hourges','hourges','51140',49.2825,3.7702),
 (18994,52,'Huiron','huiron','huiron','51300',48.7028,4.5419),
 (18995,52,'Humbauville','humbauville','humbauville','51320',48.6592,4.4164),
-(18996,52,'Isles-sur-Suippe','isles-sur-suippe','isles sur suippe','51110',49.3572,4.2014),
 (18997,52,'Jâlons','jalons','jalons','51150',49.0114,4.1858),
 (18998,52,'Janvilliers','janvilliers','janvilliers','51210',48.8950,3.6492),
 (18999,52,'Janvry','janvry','janvry','51390',49.2458,3.8769),
@@ -24248,7 +24246,7 @@ INSERT INTO `cities` VALUES
 (24232,62,'Tanville','tanville','tanville','61500',48.5683,0.0080),
 (24233,62,'Tellières-le-Plessis','tellieres-le-plessis','tellieres le plessis','61390',48.6272,0.3925),
 (24234,62,'Tessé-Froulay','tesse-froulay','tesse froulay','61410',48.5269,-0.4311),
-(24235,62,'Le Theil','le-theil','le theil','61P19',48.2639,0.6880),
+(24235,62,'Le Theil','le-theil','le theil','61260',48.2639,0.6880),
 (24236,62,'Ticheville','ticheville','ticheville','61120',48.9092,0.2652),
 (24237,62,'Tinchebray-Bocage','tinchebray-bocage','tinchebray bocage','61800',48.7628,-0.7341),
 (24238,62,'Torchamp','torchamp','torchamp','61330',48.5467,-0.6977),
@@ -24696,7 +24694,6 @@ INSERT INTO `cities` VALUES
 (24680,63,'Hénin-Beaumont','henin-beaumont','henin beaumont','62110',50.4217,2.9508),
 (24681,63,'Héninel','heninel','heninel','62128',50.2389,2.8644),
 (24682,63,'Hénin-sur-Cojeul','henin-sur-cojeul','henin sur cojeul','62128',50.2256,2.8352),
-(24683,63,'Hénin-sur-Cojeul','henin-sur-cojeul','henin sur cojeul','62128',50.2256,2.8352),
 (24684,63,'Hénu','henu','henu','62760',50.1550,2.5255),
 (24685,63,'Herbinghen','herbinghen','herbinghen','62850',50.7736,1.9125),
 (24686,63,'Héricourt','hericourt','hericourt','62130',50.3461,2.2550),
@@ -32015,7 +32012,7 @@ INSERT INTO `cities` VALUES
 (31999,81,'Allonville','allonville','allonville','80260',49.9414,2.3633),
 (32000,81,'Amiens','amiens','amiens','80000',49.8943,2.2957),
 (32001,81,'Amiens','amiens','amiens','80080',49.8943,2.2957),
-(32002,81,'Amiens','amiens','amiens','80000',49.8943,2.2957),
+(32002,81,'Amiens','amiens','amiens','80090',49.8943,2.2957),
 (32003,81,'Andainville','andainville','andainville','80140',49.8933,1.7858),
 (32004,81,'Andechy','andechy','andechy','80700',49.7156,2.7100),
 (32005,81,'Argœuves','arguves','arguves','80470',49.9308,2.2275),