Skip to content

Commit

Permalink
Renamed ProvinciaWIFI synchronizer to ProvinciaWifi for consistency
Browse files Browse the repository at this point in the history
  • Loading branch information
nemesifier committed Sep 22, 2014
1 parent 8384724 commit 114cc87
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 12 deletions.
2 changes: 1 addition & 1 deletion nodeshot/interoperability/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
('nodeshot.interoperability.synchronizers.GeoRss', 'GeoRSS'),
('nodeshot.interoperability.synchronizers.OpenWisp', 'OpenWisp'),
('nodeshot.interoperability.synchronizers.OpenWispCitySdkTourism', 'OpenWispCitySdkTourism'),
('nodeshot.interoperability.synchronizers.ProvinciaWIFI', 'Provincia WiFi'),
('nodeshot.interoperability.synchronizers.ProvinciaWifi', 'Provincia WiFi'),
('nodeshot.interoperability.synchronizers.ProvinciaWIFICitySDK', 'ProvinciaWIFICitySDK'),
('nodeshot.interoperability.synchronizers.ProvinciaWifiCitySdkMobility', 'Synchronize Provincia Wifi with CitySDK Mobility'),
('nodeshot.interoperability.synchronizers.CitySdkMobility', 'CitySDK Mobility (event driven)'),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from .ProvinciaWIFI import ProvinciaWIFI
from .ProvinciaWifi import ProvinciaWifi
from .CitySdkTourism import CitySdkTourismMixin


class ProvinciaWIFICitySDK(CitySdkTourismMixin, ProvinciaWIFI):
class ProvinciaWIFICitySDK(CitySdkTourismMixin, ProvinciaWifi):
"""
ProvinciaWIFICitySDK interoperability class
Imports data from Provincia WIFI Open Data and then exports the data to the CitySDK database
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@
from django.conf import settings

from nodeshot.core.nodes.models import Node, Status

from nodeshot.interoperability.synchronizers.base import XmlSynchronizer


class ProvinciaWIFI(XmlSynchronizer):
""" ProvinciaWIFI interoperability class """
class ProvinciaWifi(XmlSynchronizer):
""" ProvinciaWifi interoperability class """

def save(self):
""" synchronize DB """
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
from .ProvinciaWIFI import ProvinciaWIFI
from .ProvinciaWifi import ProvinciaWifi
from .CitySdkMobility import CitySdkMobilityMixin


class ProvinciaWifiCitySdkMobility(CitySdkMobilityMixin, ProvinciaWIFI):
class ProvinciaWifiCitySdkMobility(CitySdkMobilityMixin, ProvinciaWifi):
"""
ProvinciaWIFICitySDK interoperability class
Imports data from Provincia WIFI Open Data and then exports the data to the CitySDK Mobility API database
"""

REQUIRED_CONFIG_KEYS = [
'url',
'citysdk_url',
'citysdk_layer',
'citysdk_username',
'citysdk_password'
]
]
4 changes: 2 additions & 2 deletions nodeshot/interoperability/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ def test_openwisp(self):
self.assertEqual(node.added.strftime('%Y-%m-%d'), '2013-06-14')

def test_provinciawifi(self):
""" test ProvinciaWIFI converter """
""" test ProvinciaWifi synchronizer """
layer = Layer.objects.external()[0]
layer.minimum_distance = 0
layer.area = None
Expand All @@ -227,7 +227,7 @@ def test_provinciawifi(self):
xml_url = '%s/provincia-wifi.xml' % TEST_FILES_PATH

external = LayerExternal(layer=layer)
external.interoperability = 'nodeshot.interoperability.synchronizers.ProvinciaWIFI'
external.interoperability = 'nodeshot.interoperability.synchronizers.ProvinciaWifi'
external.config = '{ "url": "%s" }' % xml_url
external.save()

Expand Down

0 comments on commit 114cc87

Please sign in to comment.