add OneWay. no support in buildgraph yet

This commit is contained in:
Laura Klünder 2016-12-18 01:28:08 +01:00
parent 03b07d8a76
commit eb5dc1130a
4 changed files with 48 additions and 5 deletions

View file

@ -276,15 +276,16 @@ editor = {
'outside': '#EEFFEE',
'lineobstacle': '#999999',
'obstacle': '#999999',
'door': '#FF00FF',
'hole': '#66CC66',
'door': '#66FF00',
'hole': '#66CC99',
'elevatorlevel': '#9EF8FB',
'levelconnector': '#FFFF00',
'shadow': '#000000',
'stair': '#FF0000',
'arealocation': '#0099FF',
'escalator': '#FF9900',
'escalatorslope': '#DD7700'
'escalatorslope': '#DD7700',
'oneway': '#FF00FF'
},
_line_draw_geometry_style: function(style) {
style.stroke = true;

View file

@ -0,0 +1,32 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.4 on 2016-12-18 00:17
from __future__ import unicode_literals
import c3nav.mapdata.fields
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('mapdata', '0023_escalatorslope'),
]
operations = [
migrations.CreateModel(
name='OneWay',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.SlugField(unique=True, verbose_name='Name')),
('geometry', c3nav.mapdata.fields.GeometryField()),
('level', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='oneways', to='mapdata.Level', verbose_name='level')),
('package', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='oneways', to='mapdata.Package', verbose_name='map package')),
],
options={
'default_related_name': 'oneways',
'verbose_name_plural': 'Oneways',
'verbose_name': 'Oneway',
},
),
]

View file

@ -223,6 +223,16 @@ class Stair(DirectedLineGeometryMapItemWithLevel):
default_related_name = 'stairs'
class OneWay(DirectedLineGeometryMapItemWithLevel):
"""
A one way obstacle
"""
class Meta:
verbose_name = _('Oneway')
verbose_name_plural = _('Oneways')
default_related_name = 'oneways'
class Obstacle(GeometryMapItemWithLevel):
"""
An obstacle

View file

@ -1,8 +1,8 @@
from c3nav.mapdata.models import AreaLocation, Level, LocationGroup, Package, Source
from c3nav.mapdata.models.collections import Elevator
from c3nav.mapdata.models.geometry import (Building, Door, ElevatorLevel, Escalator, EscalatorSlope, Hole,
LevelConnector, LineObstacle, Obstacle, Outside, Room, Stair)
LevelConnector, LineObstacle, Obstacle, OneWay, Outside, Room, Stair)
ordered_models = (Package, Level, LevelConnector, Source, Building, Room, Outside, Door, Obstacle, Hole)
ordered_models += (Elevator, ElevatorLevel, LineObstacle, Stair, Escalator, EscalatorSlope)
ordered_models += (Elevator, ElevatorLevel, LineObstacle, Stair, Escalator, EscalatorSlope, OneWay)
ordered_models += (LocationGroup, AreaLocation)