Merge branch 'master' into sync_rando_url_options

GeotrekCE · Sep 7, 2018 · 5dd3731 · 5dd3731
2 parents a8dd7f1 + 56dbedc
commit 5dd3731
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 116 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -12,6 +12,7 @@ CHANGELOG
 **Minor changes**
 
 - Save column sort by module
+- Rename SITRA to APIDAE
 
 
 2.21.0 (2018-09-04)

diff --git a/docs/import.rst b/docs/import.rst
@@ -12,9 +12,9 @@ To import touristic content from APIDAE (ex-SITRA), create a ``bulkimport/parser
 
     # -*- coding: utf8 -*-
 
-    from geotrek.tourism.parsers import TouristicContentSitraParser
+    from geotrek.tourism.parsers import TouristicContentApidaeParser
 
-    class HebergementParser(TouristicContentSitraParser):
+    class HebergementParser(TouristicContentApidaeParser):
         label = u"Hébergements"
         api_key = 'xxxxxxxx'
         project_id = 9999

diff --git a/geotrek/common/parsers.py b/geotrek/common/parsers.py
@@ -701,10 +701,10 @@ def next_row(self):
         self.root = ET.fromstring(response.content).find('Resultat').find('Objets')
         self.nb = len(self.root)
         for row in self.root:
-            id_sitra = row.find('ObjetCle').find('Cle').text
+            id_apidae = row.find('ObjetCle').find('Cle').text
             for liaison in row.find('Liaisons'):
                 yield {
-                    'id_sitra': id_sitra,
+                    'id_apidae': id_apidae,
                     'id_opensystem': liaison.find('ObjetOS').find('CodeUI').text,
                 }
 

diff --git a/geotrek/common/tests/test_utils.py b/geotrek/common/tests/test_utils.py
@@ -54,7 +54,7 @@ def test_subclasses(self):
                 'ExcelParser',
                 'OpenSystemParser',
                 'ShapeParser',
-                'SitraParser',
+                'ApidaeParser',
                 'TourismSystemParser'):
             self.assert_(classname not in class_list)
 

diff --git a/geotrek/tourism/helpers.py b/geotrek/tourism/helpers.py
diff --git a/geotrek/tourism/locale/en/LC_MESSAGES/django.po b/geotrek/tourism/locale/en/LC_MESSAGES/django.po
@@ -41,7 +41,7 @@ msgstr ""
 msgid "TourInFrance"
 msgstr ""
 
-msgid "Sitra"
+msgid "Apidae"
 msgstr ""
 
 msgid "Public website"

diff --git a/geotrek/tourism/locale/fr/LC_MESSAGES/django.po b/geotrek/tourism/locale/fr/LC_MESSAGES/django.po
@@ -43,8 +43,8 @@ msgstr "GeoJSON"
 msgid "TourInFrance"
 msgstr "TourInFrance"
 
-msgid "Sitra"
-msgstr "Sitra"
+msgid "Apidae"
+msgstr "Apidae"
 
 msgid "Public website"
 msgstr "Site web public"

diff --git a/geotrek/tourism/models.py b/geotrek/tourism/models.py
@@ -32,12 +32,6 @@
 
 logger = logging.getLogger(__name__)
 
-DATA_SOURCE_TYPES = Choices(
-    ('GEOJSON', 'GEOJSON', _("GeoJSON")),
-    ('TOURINFRANCE', 'TOURINFRANCE', _("TourInFrance")),
-    ('SITRA', 'SITRA', _("Sitra")),
-)
-
 
 def _get_target_choices():
     """ Populate choices using installed apps names.

diff --git a/geotrek/tourism/parsers.py b/geotrek/tourism/parsers.py
@@ -13,8 +13,8 @@
 from geotrek.tourism.models import TouristicContent, TouristicContentType1, TouristicContentType2
 
 
-class TouristicContentSitraParser(AttachmentParserMixin, Parser):
-    """Parser to import touristic contents from SITRA"""
+class TouristicContentApidaeParser(AttachmentParserMixin, Parser):
+    """Parser to import touristic contents from APIDAE"""
     separator = None
     api_key = None
     project_id = None
@@ -75,7 +75,7 @@ class TouristicContentSitraParser(AttachmentParserMixin, Parser):
     }
 
     def __init__(self, *args, **kwargs):
-        super(TouristicContentSitraParser, self).__init__(*args, **kwargs)
+        super(TouristicContentApidaeParser, self).__init__(*args, **kwargs)
         if self.category:
             self.constant_fields['category'] = self.category
         if self.type1 is not None:
@@ -219,7 +219,7 @@ def filter_geom(self, src, val):
         return geom
 
 
-class HebergementsSitraParser(TouristicContentSitraParser):
+class HebergementsApidaeParser(TouristicContentApidaeParser):
     category = u"Hébergements"
     m2m_fields = {
         'type1': 'informationsHebergementCollectif.hebergementCollectifType.libelleFr',
@@ -355,3 +355,8 @@ def filter_type2(self, src, val):
                 self.add_warning(_(u"Type 2 '{subval}' does not exist for category '{cat}'. Please add it").format(
                     subval=subval, cat=self.obj.category.label))
         return dst
+
+
+# Deprecated: for compatibility only
+TouristicContentSitraParser = TouristicContentApidaeParser
+HebergementsSitraParser = HebergementsApidaeParser
diff --git a/geotrek/tourism/tests/data/sitra.json → geotrek/tourism/tests/data/apidae.json b/geotrek/tourism/tests/data/sitra.json → geotrek/tourism/tests/data/apidae.json
diff --git a/geotrek/tourism/tests/test_parsers.py b/geotrek/tourism/tests/test_parsers.py
@@ -12,10 +12,10 @@
 from geotrek.common.tests import TranslationResetMixin
 from geotrek.tourism.factories import TouristicContentCategoryFactory, TouristicContentTypeFactory
 from geotrek.tourism.models import TouristicContent
-from geotrek.tourism.parsers import TouristicContentSitraParser, EspritParcParser
+from geotrek.tourism.parsers import TouristicContentApidaeParser, EspritParcParser
 
 
-class EauViveParser(TouristicContentSitraParser):
+class EauViveParser(TouristicContentApidaeParser):
     category = u"Eau vive"
     type1 = [u"Type A", u"Type B"]
     type2 = []
@@ -31,7 +31,7 @@ class ParserTests(TranslationResetMixin, TestCase):
     @mock.patch('requests.get')
     def test_create(self, mocked):
         def mocked_json():
-            filename = os.path.join(os.path.dirname(__file__), 'data', 'sitra.json')
+            filename = os.path.join(os.path.dirname(__file__), 'data', 'apidae.json')
             with io.open(filename, 'r', encoding='utf8') as f:
                 return json.load(f)
         mocked.return_value.status_code = 200