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

convert point geometries to circles in javascript

Browse source
This commit is contained in:
Laura Klünder 2017-07-14 12:30:55 +02:00
parent 7a06f8de4e
commit 613f421f2e
2 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -306,6 +306,7 @@ editor = {
}
editor._geometries_layer = L.geoJSON(geometries, {
style: editor._get_geometry_style,
pointToLayer: editor._point_to_layer,
onEachFeature: editor._register_geojson_feature
});
editor._geometries_layer.addTo(editor.map);
@ -336,6 +337,9 @@ editor = {
style.weight = 5;
return style;
},
_point_to_layer: function (feature, latlng) {
return L.circle(latlng, {radius: 0.5});
},
_get_geometry_style: function (feature) {
// style callback for GeoJSON loader
var style = editor._get_mapitem_type_style(feature.properties.type);
@ -383,7 +387,8 @@ editor = {
fillOpacity: 0,
className: 'c3nav-highlight'
};
}
},
pointToLayer: editor._point_to_layer,
}).getLayers()[0].addTo(editor._highlight_layer);
highlight_layer.list_elem = list_elem;
editor._highlight_geometries[feature.properties.id] = highlight_layer;
@ -481,6 +486,9 @@ editor = {
var mapitem_type = form.attr('data-new');
if (editor._editing_layer !== null) {
editor._editing_layer.enableEdit();
if (editor._editing_layer.editor._resizeLatLng !== undefined) {
editor._editing_layer.editor._resizeLatLng.__vertex._icon.style.display = 'none';
}
} else if (form.is('[data-new]')) {
// create new geometry
var options = editor._get_mapitem_type_style(mapitem_type);
@ -506,6 +514,9 @@ editor = {
}
}).getLayers()[0].addTo(editor.map);
editor._editing_layer.enableEdit();
if (editor._editing_layer.editor._resizeLatLng !== undefined) {
editor._editing_layer.editor._resizeLatLng.__vertex._icon.style.display = 'none';
}
}
}
}
@ -539,8 +550,19 @@ editor = {
// called when creating is completed (by clicking on the last point). fills in the form and switches to editing.
if (editor._creating) {
editor._creating = false;
editor._editing_layer = e.layer;
// return L.circle(latlng, {radius: 0.5});
var layer = e.layer;
if (e.layer._latlng !== undefined) {
layer = L.circle(e.layer._latlng, e.layer.options);
layer.setRadius(0.5);
e.layer.remove();
}
editor._editing_layer = layer;
editor._editing_layer.addTo(editor._geometries_layer);
if (e.layer._latlng !== undefined) {
layer.enableEdit();
layer.editor._resizeLatLng.__vertex._icon.style.display = 'none';
}
editor._editing_layer.on('click', editor._click_editing_layer);
editor._update_editing();
$('#sidebar').find('.content').find('form.creation-lock').removeClass('creation-lock');

10
src/c3nav/mapdata/models/geometry/space.py
View file

@ -151,16 +151,6 @@ class POI(SpecificLocation, SpaceGeometryMixin, models.Model):
verbose_name_plural = _('Points of Interest')
default_related_name = 'pois'
@property
def buffered_geometry(self):
return self.geometry.buffer(0.5)
def to_geojson(self, *args, **kwargs):
result = super().to_geojson(*args, **kwargs)
result['original_geometry'] = result['geometry']
result['geometry'] = format_geojson(mapping(self.buffered_geometry))
return result
class Hole(SpaceGeometryMixin, models.Model):
"""