polishing

README.md

@@ -18,3 +18,18 @@ pip install cldfgeojson
 
 The functionality in [`cldfgeojson.create`](src/cldfgeojson/create.py) helps adding speaker area
 information when creating CLDF datasets (e.g. with [`cldfbench`](https://github.com/cldf/cldfbench)).
+
+
+
+## `leaflet.draw`
+
+This package contains the [`leaflet.draw`](https://github.com/Leaflet/Leaflet.draw) plugin in the form of `data://` URLs in 
+[a mako template](src/cldfgeojson/commands/templates/leaflet.draw.mako). `leaflet.draw` is
+distributed under a MIT license:
+
+> Copyright 2012-2017 Jon West, Jacob Toye, and Leaflet
+> 
+> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+> 
+> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+

src/cldfgeojson/commands/overlay.py

@@ -62,7 +62,7 @@ def run(args):
 
     html = tmpl.render(
         img=data_url(img, 'image/jpeg') if isinstance(img, pathlib.Path) else img,
-        bounds = bounds['bbox'],
+        bounds=bounds['bbox'],
         geojson=json.dumps(dict({n.stem: load(n) for n in args.geojson})),
         with_draw=args.with_draw,
     )

src/cldfgeojson/commands/templates/index.html.mako

@@ -57,18 +57,20 @@
     </div>
 </div>
 <script>
-    const draw = ${'true' if with_draw else 'false'};
-    const map = L.map('map').setView([37.8, -96], 4);
-    var drawnItems = L.featureGroup().addTo(map);
-    const geojson = ${geojson};
-    const layers = {};
+    var draw = ${'true' if with_draw else 'false'},
+        map = L.map('map').setView([37.8, -96], 4),
+        drawnItems = L.featureGroup(),
+        geojson = ${geojson},
+        layers = {},
+        latLngBounds = L.latLngBounds([[${bounds[1]}, ${bounds[0]}], [${bounds[3]}, ${bounds[2]}]]);
 
-    const latLngBounds = L.latLngBounds([[${bounds[1]}, ${bounds[0]}], [${bounds[3]}, ${bounds[2]}]]);
-
-    var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
-        osmAttrib = '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors',
-        osm = L.tileLayer(osmUrl, {maxZoom: 20, attribution: osmAttrib});
-    osm.addTo(map);
+    drawnItems.addTo(map)
+    L.tileLayer(
+        'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+        {
+            maxZoom: 20,
+            attribution: '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors'
+        }).addTo(map);
     if (draw) {
         map.addControl(new L.Control.Draw({
             edit: {featureGroup: drawnItems, poly: {allowIntersection: false}},
@@ -83,8 +85,7 @@
     input.addEventListener("input", (event) => {imageOverlay.setOpacity(event.target.value / 100)});
     if (draw) {
         map.on(L.Draw.Event.CREATED, function (event) {
-            var layer = event.layer;
-            drawnItems.addLayer(layer);
+            drawnItems.addLayer(event.layer);
         });
         document.getElementById('delete').onclick = function (e) {
             drawnItems.clearLayers();
@@ -94,9 +95,8 @@
         }
     }
     for (const name in geojson) {
-        var layer = L.geoJSON(geojson[name]);
-        layers[name] = layer;
-        layer.addTo(map)
+        layers[name] = L.geoJSON(geojson[name]);
+        layers[name].addTo(map)
     }
     L.control.layers({}, layers).addTo(map);
     L.rectangle(latLngBounds).addTo(map);