Skip to content
Snippets Groups Projects
Commit 650cce19 authored by lukas leufen's avatar lukas leufen
Browse files

update to v0.5.0

Closes #26, #34

See merge request toar/toar-location-services!19
parents 484dc247 cea08c11
Branches
Tags v0.5.0
1 merge request!19update to v0.5.0
Pipeline #24168 passed
Showing
with 28 additions and 23 deletions
......@@ -14,10 +14,10 @@ from .serializers import NearestSerializer, NearestDirectionSerializer, NearestB
class MajorRoadsView(APIView, CommonViews):
def __init__(self):
CommonViews.__init__(self, service_type="major-roads")
CommonViews.__init__(self, service_type="major_roads")
def get(self, request, format=None):
"""process GET requests for major-roads app
"""process GET requests for major_roads app
returns a Geo-JSON response with information about the nearest major road
......@@ -33,7 +33,7 @@ class MajorRoadsView(APIView, CommonViews):
by_direction: if true, then results are returned as array
(or dict??) for all wind directions.
optional arguments specific to major-roads service:
optional arguments specific to major_roads service:
highway_types: string with road types according to Overpass syntax.
Default is motorway,trunk,primary,secondary.
For additional options see https://wiki.openstreetmap.org/wiki/Key:highway
......@@ -78,13 +78,13 @@ class MajorRoadsView(APIView, CommonViews):
class MajorRoadsMapView(APIView, CommonViews):
def __init__(self):
CommonViews.__init__(self, service_type="major-roads")
CommonViews.__init__(self, service_type="major_roads")
renderer_classes = [TemplateHTMLRenderer]
template_name = 'map_view.html'
def get(self, request, format=None):
"""process GET requests for major-roads app
"""process GET requests for major_roads app
Works similar to MajorRoadsView but display a template HTML view with a map
"""
lat, lon, radius, direction, by_direction, highway_types = self.get_query_params(
......
from django.apps import AppConfig
class NoxEmissionConfig(AppConfig):
class NoxEmissionConfig(AppConfig): # pragma: no cover
name = 'nox_emissions'
from django.apps import AppConfig
class OmiNo2Config(AppConfig):
class OmiNo2Config(AppConfig): # pragma: no cover
name = 'omi_no2'
from django.apps import AppConfig
class PopulationConfig(AppConfig):
name = 'population-density'
File moved
File moved
from django.apps import AppConfig
class PopulationConfig(AppConfig): # pragma: no cover
name = 'population_density'
File moved
File moved
from django.apps import AppConfig
class RiceProductionConfig(AppConfig):
class RiceProductionConfig(AppConfig): # pragma: no cover
name = 'rice_production'
from django.apps import AppConfig
class StableNightLightsConfig(AppConfig):
class StableNightLightsConfig(AppConfig): # pragma: no cover
name = 'stable_night_lights'
......@@ -41,9 +41,9 @@ INSTALLED_APPS = [
'django.contrib.staticfiles',
'django.contrib.gis',
'rest_framework',
'major-roads',
'population-density',
'topography-tandem-x',
'major_roads',
'population_density',
'topography_tandem_x',
'stable_night_lights',
'wheat_production',
'rice_production',
......
......@@ -6,9 +6,9 @@ from toar_location_services.settings import DEBUG
urlpatterns = [
url(r'^$', LocationServicesRootView.as_view()),
url('admin/', admin.site.urls),
url(r'major-roads/', include('major-roads.urls'), name='major-roads'),
url(r'population-density/', include('population-density.urls'), name='population-density-density'),
url(r'topography-tandem-x/', include('topography-tandem-x.urls'), name='topography-tandem-x'),
url(r'major_roads/', include('major_roads.urls'), name='major_roads'),
url(r'population_density/', include('population_density.urls'), name='population_density'),
url(r'topography_tandem_x/', include('topography_tandem_x.urls'), name='topography_tandem_x'),
url(r'stable_night_lights/', include('stable_night_lights.urls'), name='stable_night_lights'),
url(r'wheat_production/', include('wheat_production.urls'), name='wheat_production'),
url(r'rice_production/', include('rice_production.urls'), name='rice_production'),
......
......@@ -11,9 +11,9 @@ class LocationServicesRootView(APIView):
data = [
'User interface APIs:',
OrderedDict([
('major-roads', request.build_absolute_uri()+'major-roads/'),
('population-density', request.build_absolute_uri()+'population-density/'),
('topography-tandem-x', request.build_absolute_uri()+'topography-tandem-x/'),
('major_roads', request.build_absolute_uri()+'major_roads/'),
('population_density', request.build_absolute_uri()+'population_density/'),
('topography_tandem_x', request.build_absolute_uri()+'topography_tandem_x/'),
('stable_night_lights', request.build_absolute_uri()+'stable_night_lights/'),
('wheat_production', request.build_absolute_uri()+'wheat_production/'),
('rice_production', request.build_absolute_uri()+'rice_production/'),
......
File moved
File moved
from django.apps import AppConfig
class TopographyTandemXConfig(AppConfig): # pragma: no cover
name = 'topography_tandem_x'
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment