feat(icherche): add bike and road rest areas(#1163)

infra-geo-ouverte · Jan 17, 2023 · b615d50 · b615d50
1 parent 78664b2
commit b615d50
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 59 deletions.
diff --git a/packages/geo/src/lib/search/shared/sources/icherche.ts b/packages/geo/src/lib/search/shared/sources/icherche.ts
@@ -153,17 +153,60 @@ export class IChercheSearchSource extends SearchSource implements TextSearch {
               enabled: types.indexOf('anciennes-adresses') !== -1,
               hashtags: ['anciennes-adresses']
             },
+            {
+              title: 'igo.geo.search.icherche.type.oldCity',
+              value: 'anciennes-municipalites',
+              enabled: types.indexOf('anciennes-municipalites') !== -1,
+              hashtags: ['anciennes-municipalites']
+            },
+            {
+              title: 'igo.geo.search.icherche.type.cn',
+              value: 'bornes-cn',
+              enabled: types.indexOf('bornes-cn') !== -1,
+              hashtags: ['borne', 'bornes', 'cn']
+            },
+            {
+              title: 'igo.geo.search.icherche.type.sumi',
+              value: 'bornes-sumi',
+              enabled: types.indexOf('bornes-sumi') !== -1,
+              hashtags: ['borne', 'bornes', 'sumi']
+            },
+            {
+              title: 'igo.geo.search.icherche.type.cadastre',
+              value: 'cadastre',
+              enabled: types.indexOf('cadastre') !== -1,
+              hashtags: ['cadastre']
+            },
             {
               title: 'igo.geo.search.icherche.type.postalCode',
               value: 'codes-postaux',
               enabled: types.indexOf('codes-postaux') !== -1,
               hashtags: ['code-postal']
             },
             {
-              title: 'igo.geo.search.icherche.type.road',
-              value: 'routes',
-              enabled: types.indexOf('routes') !== -1,
-              hashtags: ['route']
+              title: 'igo.geo.search.icherche.type.entreprise',
+              value: 'entreprises',
+              enabled: types.indexOf('entreprises') !== -1,
+              available: false,
+              hashtags: ['entreprise']
+            },
+            {
+              title: 'igo.geo.search.icherche.type.cycleStop',
+              value: 'haltes_cyclables',
+              enabled: types.indexOf('haltes_cyclables') !== -1,
+              hashtags: ['haltevelo','haltes_cyclables']
+            },
+            {
+              title: 'igo.geo.search.icherche.type.restArea',
+              value: 'haltes_routieres',
+              enabled: types.indexOf('haltes_routieres') !== -1,
+              hashtags: ['halteroute','haltes_routieres']
+            },
+            {
+              title: 'igo.geo.search.icherche.type.hq',
+              value: 'hq',
+              enabled: types.indexOf('hq') !== -1,
+              hashtags: ['hq']
             },
             {
               title: 'igo.geo.search.icherche.type.intersection',
@@ -172,83 +215,52 @@ export class IChercheSearchSource extends SearchSource implements TextSearch {
               hashtags: ['intersection', '+']
             },
             {
-              title: 'igo.geo.search.icherche.type.city',
-              value: 'municipalites',
-              enabled: types.indexOf('municipalites') !== -1,
-              hashtags: ['municipalité', 'mun']
-            },
-            {
-              title: 'igo.geo.search.icherche.type.oldCity',
-              value: 'anciennes-municipalites',
-              enabled: types.indexOf('anciennes-municipalites') !== -1,
-              hashtags: ['anciennes-municipalites']
+              title: 'igo.geo.search.icherche.type.place',
+              value: 'lieux',
+              enabled: types.indexOf('lieux') !== -1,
+              hashtags: ['lieu']
             },
             {
               title: 'igo.geo.search.icherche.type.mrc',
               value: 'mrc',
               enabled: types.indexOf('mrc') !== -1,
               hashtags: ['mrc']
             },
+            {
+              title: 'igo.geo.search.icherche.type.city',
+              value: 'municipalites',
+              enabled: types.indexOf('municipalites') !== -1,
+              hashtags: ['municipalité', 'mun']
+            },
             {
               title: 'igo.geo.search.icherche.type.regadmin',
               value: 'regadmin',
               enabled: types.indexOf('regadmin') !== -1,
               hashtags: ['région-administrative', 'regadmin']
             },
-            {
-              title: 'igo.geo.search.icherche.type.entreprise',
-              value: 'entreprises',
-              enabled: types.indexOf('entreprises') !== -1,
-              available: false,
-              hashtags: ['entreprise']
-            },
-            {
-              title: 'igo.geo.search.icherche.type.place',
-              value: 'lieux',
-              enabled: types.indexOf('lieux') !== -1,
-              hashtags: ['lieu']
-            },
-            {
-              title: 'igo.geo.search.icherche.type.exit',
-              value: 'sorties-autoroute',
-              enabled: types.indexOf('sorties-autoroute') !== -1,
-              hashtags: ['sortie', 'sorties', 'exit']
-            },
-            {
-              title: 'igo.geo.search.icherche.type.km',
-              value: 'bornes-km',
-              enabled: types.indexOf('bornes-km') !== -1,
-              hashtags: ['borne', 'bornes', 'repère', 'km']
-            },
             {
               title: 'igo.geo.search.icherche.type.gcc',
               value: 'bornes-gcc',
               enabled: types.indexOf('bornes-gcc') !== -1,
               hashtags: ['borne', 'bornes', 'repère', 'gcc', 'ccg']
             },
             {
-              title: 'igo.geo.search.icherche.type.cn',
-              value: 'bornes-cn',
-              enabled: types.indexOf('bornes-cn') !== -1,
-              hashtags: ['borne', 'bornes', 'cn']
-            },
-            {
-              title: 'igo.geo.search.icherche.type.sumi',
-              value: 'bornes-sumi',
-              enabled: types.indexOf('bornes-sumi') !== -1,
-              hashtags: ['borne', 'bornes', 'sumi']
+              title: 'igo.geo.search.icherche.type.km',
+              value: 'bornes-km',
+              enabled: types.indexOf('bornes-km') !== -1,
+              hashtags: ['borne', 'bornes', 'repère', 'km']
             },
             {
-              title: 'igo.geo.search.icherche.type.hq',
-              value: 'hq',
-              enabled: types.indexOf('hq') !== -1,
-              hashtags: ['hq']
+              title: 'igo.geo.search.icherche.type.road',
+              value: 'routes',
+              enabled: types.indexOf('routes') !== -1,
+              hashtags: ['route']
             },
             {
-              title: 'igo.geo.search.icherche.type.cadastre',
-              value: 'cadastre',
-              enabled: types.indexOf('cadastre') !== -1,
-              hashtags: ['cadastre']
+              title: 'igo.geo.search.icherche.type.exit',
+              value: 'sorties-autoroute',
+              enabled: types.indexOf('sorties-autoroute') !== -1,
+              hashtags: ['sortie', 'sorties', 'exit']
             }
           ]
         },

diff --git a/packages/geo/src/locale/en.geo.json b/packages/geo/src/locale/en.geo.json
@@ -475,7 +475,9 @@
             "km": "Mileage mark",
             "hq": "Hydro-Quebec",
             "entreprise": "Entreprise",
-            "cadastre": "Cadastre"
+            "cadastre": "Cadastre",
+            "restArea": "Rest area",
+            "cycleStop": "Cycle stop"
           },
           "restrictExtent": {
             "map": "À l'étendue de la carte",

diff --git a/packages/geo/src/locale/fr.geo.json b/packages/geo/src/locale/fr.geo.json
@@ -474,7 +474,9 @@
             "km": "Repère kilométrique",
             "hq": "Hydro-Québec",
             "entreprise": "Entreprise",
-            "cadastre": "Cadastre"
+            "cadastre": "Cadastre",
+            "restArea": "Halte routière",
+            "cycleStop": "Halte cyclable"
           },
           "restrictExtent": {
             "map": "À l'étendue de la carte",