diff --git a/blechreiz/database.sqlite b/blechreiz/database.sqlite
index b45dbe7..078a080 100644
Binary files a/blechreiz/database.sqlite and b/blechreiz/database.sqlite differ
diff --git a/eventplanner/models.py b/eventplanner/models.py
index d8db628..10e8c67 100644
--- a/eventplanner/models.py
+++ b/eventplanner/models.py
@@ -20,7 +20,7 @@ class Event ( models.Model ):
title = models.CharField( max_length=40, verbose_name = _("titel") )
type = models.CharField( max_length=6, choices=EVENT_TYPES, default='Reh', verbose_name= _("type") )
location = models.TextField( blank=False, verbose_name=_("location") )
- map_location = PlainLocationField( based_fields = [location], zoom=7 )
+ map_location = PlainLocationField( based_field = location, zoom=7 )
desc = models.TextField( blank=True, verbose_name=_("description"))
date = models.DateField( verbose_name= _("date") )
diff --git a/location_field/forms.py b/location_field/forms.py
index 4e4f8fe..15cc3fc 100644
--- a/location_field/forms.py
+++ b/location_field/forms.py
@@ -3,12 +3,10 @@ from location_field.widgets import LocationWidget
class PlainLocationField(fields.CharField):
- def __init__(self, based_fields=None, zoom=None, default=None,
- *args, **kwargs):
+ def __init__(self, based_field=None, zoom=None, default=None, *args, **kwargs):
+
kwargs['initial'] = default
-
- self.widget = LocationWidget(based_fields=based_fields, zoom=zoom,
- **kwargs)
+ self.widget = LocationWidget(based_field=based_field, zoom=zoom, **kwargs)
dwargs = {
'required': True,
diff --git a/location_field/media/form.js b/location_field/media/form.js
index 1d03c8e..7dff5f6 100644
--- a/location_field/media/form.js
+++ b/location_field/media/form.js
@@ -1,76 +1,66 @@
($ || django.jQuery)(function($){
- function location_field_load(map, location_based, zoom)
+ function location_field_load( map, base_field, initZoom )
{
- var parent = map.parent().parent();
-
- var location_map;
-
- var location_coordinate = parent.find('input[type=text]');
-
- function load() {
- var point = new google.maps.LatLng(49.340174,10.890595);
-
- var options = {
- mapTypeId: google.maps.MapTypeId.HYBRID
- };
+ var parent = map.parent().parent();
+ var coordinate_field = parent.find('input[type=text]');
+
+ var map;
+ var current_position;
+
+ //coordinate_field.hide();
+ coordinate_field.attr("readonly","readonly")
+
+ function load()
+ {
+ var options = { mapTypeId: google.maps.MapTypeId.HYBRID };
+ map = new google.maps.Map(map[0], options);
- location_map = new google.maps.Map(map[0], options);
-
- var initial_position;
-
- if (location_coordinate.val())
+ if ( coordinate_field.val() ) // Already values in the coordinate field
{
- var l = location_coordinate.val().split(/,/);
-
+ var l = coordinate_field.val().split(/,/);
if (l.length > 1)
{
- initial_position = new google.maps.LatLng(l[0], l[1]);
- location_map.setZoom( parseInt(l[2]) );
+ current_position = new google.maps.LatLng(l[0], l[1]);
+ map.setZoom( parseInt( l[2] ) );
}
}
- else
+
+ if ( ! current_position )
{
- location_map.setZoom(zoom);
+ var locationRohr = new google.maps.LatLng( 49.340174,10.890595 );
+ current_position = locationRohr;
+ map.setZoom( initZoom );
}
-
- function savePosition( p )
- {
- point = p;
- location_coordinate.val(point.lat().toFixed(6) + "," + point.lng().toFixed(6) + "," + location_map.getZoom() );
- }
-
- var marker = new google.maps.Marker({
- map: location_map,
- position: initial_position,
- draggable: true
- });
+ function savePosition( p ) {
+ current_position = p;
+ coordinate_field.val( current_position.lat().toFixed(6) + "," + current_position.lng().toFixed(6) + "," + map.getZoom() );
+ }
+
+ var marker = new google.maps.Marker({
+ map: map,
+ position: current_position,
+ draggable: true
+ });
google.maps.event.addListener(marker, 'dragend', function(mouseEvent) {
savePosition(mouseEvent.latLng);
});
- google.maps.event.addListener(location_map, 'click', function(mouseEvent){
+ google.maps.event.addListener(map, 'click', function(mouseEvent){
marker.setPosition(mouseEvent.latLng);
- savePosition(mouseEvent.latLng);
+ savePosition( mouseEvent.latLng );
});
- google.maps.event.addListener(location_map, 'zoom_changed', function(mouseEvent){
- savePosition(point);
+ google.maps.event.addListener(map, 'zoom_changed', function(mouseEvent){
+ savePosition( current_position );
});
- location_based.bindWithDelay("keypress", function() {
-
- var lstr = [];
- location_based.each(function(){
- var b = $(this);
- lstr.push(b.val())
- });
+ base_field.bindWithDelay( "keypress", function() {
- geocode(lstr.join(','), function(l){
- location_coordinate.val( l.lat()+','+l.lng() );
+ geocode( base_field.val() , function(l){
+ coordinate_field.val( l.lat()+','+l.lng() );
});
-
onLocationCoordinateChange();
}, 2000 );
@@ -79,19 +69,16 @@
{
var latlng = jQuery(this).val().split(/,/);
if (latlng.length < 2) return;
- var latlng = new google.maps.LatLng(latlng[0], latlng[1]);
+ var latlng = new google.maps.LatLng( latlng[0], latlng[1] );
placeMarker( latlng );
- location_map.setZoom( latlng[2] );
- //geocode_reverse(latlng, function(l){
- // location_coordinate.val(l.lat()+','+l.lng());
- //});
+ map.setZoom( latlng[2] );
}
function placeMarker(location) {
marker.setPosition(location);
- location_map.setCenter(location);
+ map.setCenter(location);
savePosition(location);
- location_map.panTo(location);
+ map.panTo(location);
}
function geocode(address, cb) {
@@ -119,21 +106,22 @@
}
}*/
-
- placeMarker(initial_position);
+ placeMarker( current_position );
}
-
+
load();
}
-
+
$('input[data-location-widget]').each(function(){
var $el = $(this);
var $map = $($el.attr('data-map')),
- $based_fields = $($el.attr('data-based-fields')),
+ $based_field = $(($el.attr('data-based-field'))),
zoom = parseInt($el.attr('data-zoom'));
- location_field_load($map, $based_fields, zoom);
+ location_field_load( $map, $based_field, zoom );
});
+
+
});
diff --git a/location_field/models.py b/location_field/models.py
index 4349da9..de9e2cd 100755
--- a/location_field/models.py
+++ b/location_field/models.py
@@ -4,8 +4,8 @@ from location_field import forms
class BaseLocationField(object):
- def __init__(self, based_fields=[], zoom=2, default=None, *args, **kwargs):
- self._based_fields = based_fields
+ def __init__(self, based_field=None, zoom=2, default=None, *args, **kwargs):
+ self._based_field = based_field
self._zoom = zoom
self._default = default
self.default = default
@@ -13,7 +13,7 @@ class BaseLocationField(object):
def formfield(self, **kwargs):
return super(BaseLocationField, self).formfield(
form_class=self.formfield_class,
- based_fields=self._based_fields,
+ based_field=self._based_field,
zoom=self._zoom,
default=self._default,
**kwargs)
@@ -22,10 +22,10 @@ class BaseLocationField(object):
class PlainLocationField(BaseLocationField, CharField):
formfield_class = forms.PlainLocationField
- def __init__(self, based_fields=None, zoom=None,
+ def __init__(self, based_field=None, zoom=None,
max_length=63, *args, **kwargs):
- super(PlainLocationField, self).__init__(based_fields=based_fields,
+ super(PlainLocationField, self).__init__(based_field=based_field,
zoom=zoom, *args, **kwargs)
CharField.__init__(self, max_length=max_length, *args, **kwargs)
diff --git a/location_field/views.py b/location_field/views.py
deleted file mode 100755
index 60f00ef..0000000
--- a/location_field/views.py
+++ /dev/null
@@ -1 +0,0 @@
-# Create your views here.
diff --git a/location_field/widgets.py b/location_field/widgets.py
index 7774fc7..a255e99 100644
--- a/location_field/widgets.py
+++ b/location_field/widgets.py
@@ -1,11 +1,12 @@
from django.forms import widgets
from django.utils.safestring import mark_safe
-
class LocationWidget(widgets.TextInput):
- def __init__(self, attrs=None, based_fields=None, zoom=None, **kwargs):
- self.based_fields = based_fields
+ def __init__(self, attrs=None, based_field=None, zoom=None, width=610, height = 480, **kwargs):
+ self.based_field = based_field
self.zoom = zoom
+ self.width = width
+ self.height = height
super(LocationWidget, self).__init__(attrs)
def render(self, name, value, attrs=None):
@@ -20,29 +21,23 @@ class LocationWidget(widgets.TextInput):
else:
value = ''
- if '-' not in name:
- prefix = ''
- else:
- prefix = name[:name.rindex('-') + 1]
-
- based_fields = ','.join(
- map(lambda f: '#id_' + prefix + f.name, self.based_fields))
-
+ based_field = "#id_" + self.based_field.name
+
attrs = attrs or {}
attrs['data-location-widget'] = name
- attrs['data-based-fields'] = based_fields
+ attrs['data-based-field'] = based_field
attrs['data-zoom'] = self.zoom
attrs['data-map'] = '#map_' + name
text_input = super(LocationWidget, self).render(name, value, attrs)
map_div = u'''
-
-'''
- return mark_safe(text_input + map_div % {'name': name})
+
+ '''
+
+ return mark_safe(text_input + map_div % {'name': name, 'width': self.width, 'height': self.height })
class Media:
# Use schemaless URL so it works with both, http and https websites
diff --git a/website/templates/website/concert_route.html b/website/templates/website/concert_route.html
index 8b80240..fbaefa6 100644
--- a/website/templates/website/concert_route.html
+++ b/website/templates/website/concert_route.html
@@ -84,7 +84,7 @@
controlText.innerHTML = 'Konzertort anzeigen';
controlUI.appendChild(controlText);
- var target = new google.maps.LatLng( {{routeInfo.destination}} );
+ var target = new google.maps.LatLng( {{ nextConcert.map_location }} );
google.maps.event.addDomListener(controlUI, 'click', function() {
map.setMapTypeId( google.maps.MapTypeId.HYBRID );