Merge 7028848 into d7f7b8f

makinacorpus · May 14, 2020 · b5e8fe1 · b5e8fe1
2 parents d7f7b8f + 7028848
commit b5e8fe1
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/leaflet/__init__.py b/leaflet/__init__.py
@@ -50,6 +50,7 @@
     'MIN_ZOOM': None,
     'MAX_ZOOM': None,
     'DEFAULT_CENTER': None,
+    'DEFAULT_PRECISION': 6,
     'FORCE_IMAGE_PATH': False,
     'SRID': None,
     'TILES_EXTENT': [],
@@ -123,6 +124,11 @@
     raise ImproperlyConfigured("LEAFLET_CONFIG['DEFAULT_ZOOM'] must be an int between 1 and 24.")
 
 
+DEFAULT_PRECISION = app_settings['DEFAULT_PRECISION']
+if DEFAULT_PRECISION is not None and not (isinstance(DEFAULT_PRECISION, six.integer_types) and (4 <= DEFAULT_PRECISION <= 12)):
+    raise ImproperlyConfigured("LEAFLET_CONFIG['DEFAULT_PRECISION'] must be an int between 4 and 12.")
+
+
 PLUGINS = app_settings['PLUGINS']
 if not (isinstance(PLUGINS, dict) and all([isinstance(el, dict) for el in PLUGINS.values()])):
     error_msg = """LEAFLET_CONFIG['PLUGINS'] must be dict of dicts in the format:

diff --git a/leaflet/static/leaflet/leaflet.css b/leaflet/static/leaflet/leaflet.css
@@ -634,7 +634,11 @@
 	border-right-color: #fff;
 	}
 
-/* Resize the "display_raw" textbox */
-.django-leaflet-raw-textarea {
-	width: 100%;
+/* Circle editing markers */
+.leaflet-editing-icon {
+    margin-left: -5px!important;
+    margin-top: -5px!important;
+    width: 10px!important;
+    height: 10px!important;
+    border-radius: 10px!important;
 }
diff --git a/leaflet/static/leaflet/leaflet.forms.js b/leaflet/static/leaflet/leaflet.forms.js
@@ -35,7 +35,7 @@ L.FieldStore = L.Class.extend({
             geom.feature = {geometry: {type: this.options.geom_type}};
         }
 
-        var geojson = geom.toGeoJSON();
+        var geojson = geom.toGeoJSON(this.options.precision);
         var is_geometrycollection = (geojson.geometry && geojson.geometry.type == 'GeometryCollection');
         if (is_multi && is_generic && !is_geometrycollection) {
             var flat = {type: 'GeometryCollection', geometries: []};
@@ -62,7 +62,7 @@ L.FieldStore = L.Class.extend({
                 latlngs.push(latlng);
             }
             geom = L[collection_type](latlngs);
-            geojson = geom.toGeoJSON().geometry;
+            geojson = geom.toGeoJSON(this.options.precision).geometry;
         }
         // In order to make multipoint work, it seems we need to treat it similarly to the GeometryCollections
         else if (this.options.geom_type == 'MULTIPOINT') {
@@ -82,6 +82,8 @@ L.FieldStore = L.Class.extend({
         if (/^\s*$/.test(value)) {
             return null;
         }
+        // Helps to get rid of the float value conversion error
+        document.querySelector('#id_geom').value = JSON.stringify(JSON.parse(value));
         return L.GeoJSON.geometryToLayer(JSON.parse(value));
     },
 });
@@ -109,6 +111,7 @@ L.GeometryField = L.Class.extend({
             'multipolygon': 'polygon',
         })[geom_type] || 'featureGroup';
 
+
         L.setOptions(this, options);
 
         this._drawControl = null;

diff --git a/leaflet/templates/leaflet/widget.html b/leaflet/templates/leaflet/widget.html
@@ -17,6 +17,7 @@
 
     function {{ id_map_callback }}(map, options) {
         {{ module }}.store_class = {{ field_store_class }};
+        {{ module }}.precision = options.djoptions.precision;
         (new {{ geometry_field_class}}({{ module }})).addTo(map);
         {% block callback %}{% endblock callback %}
     };

diff --git a/leaflet/templatetags/leaflet_tags.py b/leaflet/templatetags/leaflet_tags.py
@@ -99,6 +99,7 @@ def leaflet_map(name, callback=None, fitextent=True, creatediv=True,
         fitextent=fitextent,
         center=instance_app_settings['DEFAULT_CENTER'],
         zoom=instance_app_settings['DEFAULT_ZOOM'],
+        precision=instance_app_settings['DEFAULT_PRECISION'],
         minzoom=instance_app_settings['MIN_ZOOM'],
         maxzoom=instance_app_settings['MAX_ZOOM'],
         layers=[(force_text(label), url, attrs) for (label, url, attrs) in instance_app_settings.get('TILES')],