refactoring: #845 rename constant "crs.CRS_CHOICES" to "crs.CHOICES"

geometalab · May 22, 2017 · 80817b8 · 80817b8
1 parent f3ea192
commit 80817b8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/osmaxx/conversion/constants/coordinate_reference_systems.py b/osmaxx/conversion/constants/coordinate_reference_systems.py
@@ -150,7 +150,7 @@
     (32760, _('UTM Zone 60, southern hemisphere')),
 )
 
-CRS_CHOICES = (
+CHOICES = (
     (_('Global coordinate reference systems'), GLOBAL_CHOICES),
     (_('UTM zones'), UTM_ZONE_CHOICES),
 )
diff --git a/osmaxx/conversion/models.py b/osmaxx/conversion/models.py
@@ -22,7 +22,7 @@ class Parametrization(models.Model):
     out_format = models.CharField(verbose_name=_("out format"), choices=output_format.CHOICES, max_length=100)
     out_srs = models.IntegerField(
         verbose_name=_("output SRS"), help_text=_("EPSG code of the output spatial reference system"),
-        null=True, blank=True, default=4326, choices=crs.CRS_CHOICES
+        null=True, blank=True, default=4326, choices=crs.CHOICES
     )
     clipping_area = models.ForeignKey(ClippingArea, verbose_name=_('Clipping Area'), on_delete=models.CASCADE)
     detail_level = models.IntegerField(verbose_name=_('detail level'), choices=DETAIL_LEVEL_CHOICES, default=DETAIL_LEVEL_ALL)

diff --git a/osmaxx/excerptexport/forms/order_options_mixin.py b/osmaxx/excerptexport/forms/order_options_mixin.py
@@ -16,7 +16,7 @@ class OrderOptionsMixin(forms.Form):
     )
     coordinate_reference_system = forms.ChoiceField(
         label=_('Coordinate system'),
-        choices=crs.CRS_CHOICES,
+        choices=crs.CHOICES,
         required=True,
     )
     detail_level = forms.ChoiceField(

diff --git a/osmaxx/excerptexport/models/extraction_order.py b/osmaxx/excerptexport/models/extraction_order.py
@@ -13,7 +13,7 @@
 
 class ExtractionOrder(models.Model):
     coordinate_reference_system = models.IntegerField(
-        verbose_name=_('CRS'), choices=crs.CRS_CHOICES, default=crs.WGS_84
+        verbose_name=_('CRS'), choices=crs.CHOICES, default=crs.WGS_84
     )
     detail_level = models.IntegerField(
         verbose_name=_('detail level'), choices=DETAIL_LEVEL_CHOICES, default=DETAIL_LEVEL_ALL