0001-map-field-work-in-progress.patch

Frédéric Péters, 10 octobre 2014 20:01

Voir les différences: en ligne côte à côte

Subject: [PATCH] map field (work in progress)

 wcs/fields.py                      | 17 +++++++++++++++++
 wcs/qommon/form.py                 | 27 +++++++++++++++++++++++++++
 wcs/qommon/http_response.py        |  4 ++++
 wcs/qommon/static/css/qommon.css   |  4 ++++
 wcs/qommon/static/js/qommon.map.js | 27 +++++++++++++++++++++++++++
 wcs/root.py                        |  4 ++++
 6 files changed, 83 insertions(+)
 create mode 100644 wcs/qommon/static/js/qommon.map.js

     # along with this program; if not, see <http://www.gnu.org/licenses/>.
     import time
     import random
     import re
     import xml.etree.ElementTree as ET
-...
     register_field_class(TableRowsField)
     class MapField(WidgetField):
         key = 'map'
         description = N_('Map')
         widget_class = MapWidget
         def get_view_value(self, value):
             widget = self.widget_class('x%s' % random.random(), value, readonly=True)
             return widget.render_content()
         def get_rst_view_value(self, value, indent=''):
             return indent + value
     register_field_class(MapField)
     class RankedItemsField(WidgetField):
         key = 'ranked-items'
         description = N_('Ranked Items')

                 self.value = hashlib.sha1(pwd1).hexdigest()
             else:
                 self.value = None
     class MapWidget(CompositeWidget):
         def __init__(self, name, value=None, **kwargs):
             CompositeWidget.__init__(self, name, value, **kwargs)
             self.add(HiddenWidget, 'latlng')
             self.readonly = kwargs.pop('readonly', False)
         def render_content(self):
             get_response().add_javascript(['qommon.map.js'])
             r = TemplateIO(html=True)
             for widget in self.get_widgets():
                 r += widget.render()
             attrs = {
                 'class': 'qommon-map',
                 'id': 'map-%s' % self.name,
+            }
             if self.value:
                 attrs['data-init-lat'], attrs['data-init-lng'] = self.value.split(';')
             if self.readonly:
                 attrs['data-readonly'] = 'true'
             r += htmltext('<div %s></div>' % ' '.join(['%s="%s"' % x for x in attrs.items()]))
             return r.getvalue()
         def _parse(self, request):
             CompositeWidget._parse(self, request)
             self.value = self.get('latlng')

                 self.javascript_scripts = []
             for script_name in script_names:
                 if not script_name in self.javascript_scripts:
                     if script_name == 'qommon.map.js':
                         self.add_javascript(['jquery.js'])
                         self.add_javascript(['../../leaflet/leaflet.js'])
                         self.add_css_include('../../leaflet/leaflet.css')
                     self.javascript_scripts.append(str(script_name))
                     if script_name == 'afterjob.js':
                         self.add_javascript_code('var QOMMON_ROOT_URL = "%s";\n' % \

wcs/qommon/static/css/qommon.css
389	389	outline: 0;
390	390	border: 1px solid #aaa;
391	391	}
	392
	393	div.qommon-map {
	394	height: 280px;
	395	}

     $(function() {
       $('.qommon-map').each(function() {
          var map = L.map($(this).attr('id')).setView([50.84, 4.36], 13);
          var hidden = $(this).prev();
          map.marker = null;
          if ($(this).data('init-lat')) {
            map.marker = L.marker([$(this).data('init-lat'), $(this).data('init-lng')]);
            map.marker.addTo(map);
+         }
          L.tileLayer(
             'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+            {
                     attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>',
                     maxZoom: 18
             }).addTo(map);
          if (! $(this).data('readonly')) {
            map.on('click', function(e) {
              if (map.marker === null) {
                map.marker = L.marker([0, 0]);
                map.marker.addTo(map);
+             }
              map.marker.setLatLng(e.latlng);
              hidden.val(e.latlng.lat + ';' + e.latlng.lng);
            });
+         }
       });
     });

                 dirname = os.path.join(get_publisher().data_dir, 'qommon')
                 return StaticDirectory(dirname, follow_symlinks = True)
             # maps to locations provided by libjs-openlayers
             if component == 'leaflet':
                 return StaticDirectory('/usr/share/javascript/leaflet')
             # is this a category ?
             try:
                 category = Category.get_by_urlname(component)
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-map-field-work-in-progress.patch