Add use-case, endpoint and migration step for Namur list of streets

This commit is contained in:
Christophe Boulanger 2017-07-20 14:53:15 +02:00
parent d31988bb4b
commit 49383991dc
3 changed files with 72 additions and 9 deletions

View File

@ -0,0 +1,24 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('passerelle_imio_liege_lisrue', '0003_imioliegelisrue_include_all_of_belgium'),
]
operations = [
migrations.AddField(
model_name='imioliegelisrue',
name='profile',
field=models.CharField(default=b'Liege', max_length=100, choices=[(b'LIEGE', b'Liege'), (b'NAMUR', b'Namur')]),
),
migrations.AlterField(
model_name='imioliegelisrue',
name='log_level',
field=models.CharField(default=b'INFO', max_length=10, verbose_name='Log Level', choices=[(b'NOTSET', b'NOTSET'), (b'DEBUG', b'DEBUG'), (b'INFO', b'INFO'), (b'WARNING', b'WARNING'), (b'ERROR', b'ERROR'), (b'CRITICAL', b'CRITICAL'), (b'FATAL', b'FATAL')]),
),
]

View File

@ -27,9 +27,14 @@ from passerelle.utils.api import endpoint
class ImioLiegeLisrue(BaseResource):
PROFILE_CHOICES = (
('LIEGE','Liege'),
('NAMUR','Namur'),
)
service_url = models.CharField(max_length=128, blank=False,
verbose_name=_('Service URL'),
help_text=_('SIG Web Service URL (ex: https://e-services.liege.be:8443/)'))
profile = models.CharField(max_length=100, choices=PROFILE_CHOICES, default='Liege')
include_all_of_belgium = models.BooleanField(default=True,
verbose_name=_('Include all of Belgium'))
verify_cert = models.BooleanField(default=True,
@ -94,3 +99,22 @@ class ImioLiegeLisrue(BaseResource):
'text': street_label.strip(),
})
return {'data': streets}
@endpoint()
def voies_namur(self, request, q=None, **kwargs):
url = self.service_url
if q:
q = unicodedata.normalize('NFKD', request.GET['q']).encode('ascii', 'ignore')
# outSrid = unicodedata.normalize('NFKD', request.GET['outSrid']).encode('ascii', 'ignore')
url = "{}?q={}&outSrid=31370".format(url, q.lower())
result = requests.get(url, headers={'Accept': 'application/json'},
verify=self.verify_cert).json()
# return {'data':[{'id':'1','text':result,'url':url}]}
streets = []
for item in result:
street_label = item.get('rueNom')
streets.append({
'id':item.get('rueCode'),
'text':street_label,
})
return {'data': streets}

View File

@ -2,15 +2,30 @@
{% load i18n passerelle %}
{% block endpoints %}
{% url "generic-endpoint" connector="imio-liege-lisrue" slug=object.slug endpoint="voies" as voies_url %}
<ul>
<li>{% trans 'Listing streets:' %}
<a href="{{voies_url}}">{{ site_base_uri }}{{voies_url}}</a>
</li>
<li>{% trans 'Listing streets containing string:' %}
<a href="{{voies_url}}?q=com">{{ site_base_uri }}{{voies_url}}?q=com</a>
</li>
</ul>
{% for field, value in object.get_description_fields %}
{% if field.verbose_name == 'profile' and value == 'NAMUR' %}
{% url "generic-endpoint" connector="imio-liege-lisrue" slug=object.slug endpoint="voies_namur" as voies_url %}
<ul>
<li>{% trans 'Listing streets:' %}
<a href="{{voies_url}}">{{ site_base_uri }}{{voies_url}}</a>
</li>
<li>{% trans 'Listing streets containing string:' %}
<a href="{{voies_url}}?q=fer">{{ site_base_uri }}{{voies_url}}?q=fer </a>
</li>
</ul>
{% elif field.verbose_name == 'profile' and value != 'NAMUR' %}
{% url "generic-endpoint" connector="imio-liege-lisrue" slug=object.slug endpoint="voies" as voies_url %}
<ul>
<li>{% trans 'Listing streets:' %}
<a href="{{voies_url}}">{{ site_base_uri }}{{voies_url}}</a>
</li>
<li>{% trans 'Listing streets containing string:' %}
<a href="{{voies_url}}?q=fer">{{ site_base_uri }}{{voies_url}}?q=fer </a>
</li>
</ul>
{% else%}
{% endif %}
{% endfor %}
{% endblock %}
{% block security %}