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

update map feature colors

Browse source
This commit is contained in:
Laura Klünder 2016-10-09 18:53:15 +02:00
parent fcff397a12
commit 3bf9c19245
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/c3nav/editor/static/editor/js/editor.js
View file

@ -36,6 +36,8 @@ editor = {
for (var i = 0; i < feature_types.length; i++) { for (var i = 0; i < feature_types.length; i++) {
feature_type = feature_types[i]; feature_type = feature_types[i];
editor.feature_types[feature_type.name] = feature_type; editor.feature_types[feature_type.name] = feature_type;
feature_type.weight = 1;
feature_type.fillOpacity = 0.6;
editor.feature_types_order.push(feature_type.name); editor.feature_types_order.push(feature_type.name);
editcontrols.append( editcontrols.append(
$('<fieldset class="feature_list">').attr('name', feature_type.name).append( $('<fieldset class="feature_list">').attr('name', feature_type.name).append(
@ -237,9 +239,10 @@ editor = {
L.geoJSON(editor.features[$(this).attr('name')].geometry, { L.geoJSON(editor.features[$(this).attr('name')].geometry, {
style: function() { style: function() {
return { return {
color: '#FFFFEE', color: '#FFFFDD',
opacity: 0.5, weight: 3,
fillOpacity: 0.5, opacity: 0.7,
fillOpacity: 0,
className: 'c3nav-highlight' className: 'c3nav-highlight'
}; };
} }
@ -259,9 +262,10 @@ editor = {
L.geoJSON(e.layer.toGeoJSON(), { L.geoJSON(e.layer.toGeoJSON(), {
style: function() { style: function() {
return { return {
color: '#FFFFEE', color: '#FFFFDD',
opacity: 0.5, weight: 3,
fillOpacity: 0.5, opacity: 0.7,
fillOpacity: 0,
className: 'c3nav-highlight' className: 'c3nav-highlight'
}; };
} }

4
src/c3nav/mapdata/models/feature.py
View file

@ -31,8 +31,8 @@ class FeatureType(namedtuple('FeatureType', ('name', 'title', 'title_plural', 'g
FEATURE_TYPES = OrderedDict() FEATURE_TYPES = OrderedDict()
FeatureType('building', _('Building'), _('Buildings'), 'polygon', '#333333') FeatureType('building', _('Building'), _('Buildings'), 'polygon', '#333333')
FeatureType('room', _('Room'), _('Rooms'), 'polygon', '#CCCCCC') FeatureType('room', _('Room'), _('Rooms'), 'polygon', '#FFFFFF')
FeatureType('outside', _('Outside Area'), _('Outside Areas'), 'polygon', '#EEEEEE') FeatureType('outside', _('Outside Area'), _('Outside Areas'), 'polygon', '#FFFFFF')
FeatureType('obstacle', _('Obstacle'), _('Obstacles'), 'polygon', '#999999') FeatureType('obstacle', _('Obstacle'), _('Obstacles'), 'polygon', '#999999')