2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

change sources list format and add editor base + sources overlays

Browse source
This commit is contained in:
Laura Klünder 2016-08-19 19:45:11 +02:00
parent 0d3187558e
commit b79f84f0b6
10 changed files with 127 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/c3nav/control/static/control/control.css Normal file
View file

@ -0,0 +1,7 @@
#mapeditor {
position:absolute;
top:54px;
bottom:0;
left:0;
right:0;
}

58
src/c3nav/control/templates/control/base.html
View file

@ -6,52 +6,52 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<title>Dashboard Template for Bootstrap</title> <title>c3nav Administration</title>
{% compress css %} {% compress css %}
<link href="{% static 'bootstrap/css/bootstrap.css' %}" rel="stylesheet"> <link href="{% static 'bootstrap/css/bootstrap.css' %}" rel="stylesheet">
<link href="{% static 'leaflet/leaflet.css' %}" rel="stylesheet">
<link href="{% static 'control/control.css' %}" rel="stylesheet">
{% endcompress %} {% endcompress %}
</head> </head>
<body> <body>
<nav class="navbar navbar-default"> <nav class="navbar navbar-default">
<div class="container"> <div class="container">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span> <span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="navbar-brand" href="#">c3nav Administration</a> <a class="navbar-brand" href="#">c3nav Administration</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li><a href="{% url 'control.dashboard' %}">Dashboard</a></li>
<li><a href="{% url 'control.editor' %}">Editor</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li><a href="{% url 'admin:index' %}">Django Admin</a></li>
<li><a href="{% url 'admin:logout' %}">Logout</a></li>
</ul>
</div>
</div> </div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-right">
<li><a href="#">Django Admin</a></li>
<li><a href="#">Logout</a></li>
</ul>
</div>
</div>
</nav> </nav>
<div class="container"> <div class="container">
<div class="row"> {% block content %}
<div class="col-sm-4 col-md-3"> {% endblock %}
<ul class="nav nav-pills nav-stacked">
<li class="active"><a href="#">AAA</a></li>
<li><a href="#">BBB</a></li>
<li><a href="#">CCC</a></li>
</ul>
</div>
<div class="col-sm-8 col-md-9">
<h2>Dashboard</h2>
</div>
</div>
</div> </div>
{% compress js %} {% compress js %}
<script type="text/javascript" src="{% static 'jquery/jquery.js' %}"></script> <script type="text/javascript" src="{% static 'jquery/jquery.js' %}"></script>
<script type="text/javascript" src="{% static 'bootstrap/js/bootstrap.js' %}"></script> <script type="text/javascript" src="{% static 'bootstrap/js/bootstrap.js' %}"></script>
<script type="text/javascript" src="{% static 'leaflet/leaflet.js' %}"></script>
<script type="text/javascript" src="{% static 'leaflet/leaflet.editable.js' %}"></script>
{% endcompress %} {% endcompress %}
{% block addbottom %}
{% endblock %}
</body> </body>
</html> </html>

4
src/c3nav/control/templates/control/dashboard.html Normal file
View file

@ -0,0 +1,4 @@
{% extends 'control/base.html' %}
{% block content %}
<h1>Dashboard</h1>
{% endblock %}

25
src/c3nav/control/templates/control/editor.html Normal file
View file

@ -0,0 +1,25 @@
{% extends 'control/base.html' %}
{% block content %}
<h1>Editor</h1>
<div id="mapeditor"></div>
{% endblock %}
{% block addbottom %}
<script type="text/javascript">
var map = L.map('mapeditor', {
center: [120, 200],
zoom: 2,
maxBounds: [[0, 0], [{{ map.height }}, {{ map.width }}]],
maxZoom: 10,
minZoom: 1,
crs: L.CRS.Simple,
});
layers = {
{% for filename, source in map.sources_by_filename.items %}
"{{ source.name }}": L.imageOverlay('{% url 'map.source' filename=filename %}', {{ source.jsbounds }}),{% endfor %}
}
L.control.layers([], layers).addTo(map);
</script>
{% endblock %}

3
src/c3nav/control/urls.py
View file

@ -3,5 +3,6 @@ from django.conf.urls import url
from . import views from . import views
urlpatterns = [ urlpatterns = [
url(r'^$', views.index, name='index'), url(r'^$', views.dashboard, name='control.dashboard'),
url(r'^editor/(?P<level>[^/]+)?$', views.editor, name='control.editor'),
] ]

22
src/c3nav/control/views.py
View file

@ -1,7 +1,21 @@
from django.shortcuts import render from django.contrib.admin.views.decorators import staff_member_required
from django.http import Http404
from django.shortcuts import redirect, render
from ..mapdata import mapmanager
def index(request): @staff_member_required
return render(request, 'control/base.html') def dashboard(request):
return render(request, 'control/dashboard.html')
# Create your views here.
@staff_member_required
def editor(request, level=None):
if not level:
return redirect('control.editor', level=mapmanager.levels[0])
if level not in mapmanager.levels:
raise Http404('Level does not exist')
return render(request, 'control/editor.html', {
'map': mapmanager
})

26
src/c3nav/mapdata/classes.py
View file

@ -12,6 +12,7 @@ class MapManager:
self.main_pkg = None self.main_pkg = None
self.pkgs = OrderedDict() self.pkgs = OrderedDict()
self.levels = [] self.levels = []
self.sources_by_filename = OrderedDict()
def add_map_dir(self, path): def add_map_dir(self, path):
pkg = MapDataPackage(path) pkg = MapDataPackage(path)
@ -24,17 +25,17 @@ class MapManager:
'but '+self.main_pkg.name+' was there first.') 'but '+self.main_pkg.name+' was there first.')
self.main_pkg = pkg self.main_pkg = pkg
self.levels = pkg.levels self.levels = pkg.levels
self.size = pkg.size self.width = pkg.width
self.height = pkg.height
else: else:
if pkg.extends not in self.pkgs: if pkg.extends not in self.pkgs:
raise MapInitError('map package'+pkg.name+' extends '+pkg.exends+', which was not imported ' raise MapInitError('map package'+pkg.name+' extends '+pkg.exends+', which was not imported '
'beforehand.') 'beforehand.')
self.pkgs[pkg.name] = pkg for source in pkg.sources:
self.sources_by_filename[source.filename] = source
@property self.pkgs[pkg.name] = pkg
def all_sources(self):
return sum((pkg.sources for pkg in self.pkgs), [])
class MapDataPackage: class MapDataPackage:
@ -55,16 +56,21 @@ class MapDataPackage:
self.extends = data.get('extends') self.extends = data.get('extends')
self.size = data.get('size') self.width = data.get('width')
self.height = data.get('height')
self.sources = tuple(MapSource(self, name, source) self.sources = tuple(MapSource(self, source) for source in data.get('sources', []))
for name, source in data.get('sources', {}).items())
self.levels = data.get('levels') self.levels = data.get('levels')
class MapSource: class MapSource:
def __init__(self, pkg, name, data): def __init__(self, pkg, data):
self.name = name self.name = data['name']
self.filename = self.name+'.'+data['src'].split('.')[-1]
self.src = os.path.join(pkg.path, data['src']) self.src = os.path.join(pkg.path, data['src'])
self.bounds = data['bounds'] self.bounds = data['bounds']
@property
def jsbounds(self):
return json.dumps(self.bounds)

7
src/c3nav/mapdata/urls.py Normal file
View file

@ -0,0 +1,7 @@
from django.conf.urls import url
from . import views
urlpatterns = [
url(r'^sources/(?P<filename>[^/]+)$', views.source, name='map.source'),
]

18
src/c3nav/mapdata/views.py
View file

@ -1,3 +1,19 @@
import mimetypes
from django.contrib.admin.views.decorators import staff_member_required
from django.http import Http404, HttpResponse
from django.shortcuts import render from django.shortcuts import render
# Create your views here. from ..mapdata import mapmanager
@staff_member_required
def source(request, filename):
source = mapmanager.sources_by_filename.get(filename)
if source is None:
raise Http404('Source does not exist')
response = HttpResponse(content_type=mimetypes.guess_type(source.src)[0])
with open(source.src, 'rb') as f:
response.write(f.read())
return response

2
src/c3nav/urls.py
View file

@ -2,8 +2,10 @@ from django.conf.urls import include, url
from django.contrib import admin from django.contrib import admin
from .control import urls as control_urls from .control import urls as control_urls
from .mapdata import urls as map_urls
urlpatterns = [ urlpatterns = [
url(r'^control/', include(control_urls)), url(r'^control/', include(control_urls)),
url(r'^map/', include(map_urls)),
url(r'^admin/', admin.site.urls), url(r'^admin/', admin.site.urls),
] ]