Merge branch 'site-osm-baustelle' of https://github.com/hholzgra/maposmatic into site-osm-baustelle

documentation/user-guide.adoc

@@ -201,6 +201,16 @@ it does not show the actual selected map area though. It is
 just using pre-rendered examples to give you a rough idea
 what each layout looks like.
 
+For all but the "Full-page layout without index" layout the actual
+index generator can be selected. The default selection "Streets and
+selected amenities" generates a classic street index, but there are
+also a few "special interest" alternatives available.
+
+Right now these are:
+
+* Healt related facitilies - a work-in-progress index of health facilities and districts
+* OSM notes index - an experimental indexshowing current OSM notes for the selected area 
+* Tree genus / species index - showing what kinds of different trees are growing in an area, most useful for small areays like allotment colonies
 
 Select a map style
 ~~~~~~~~~~~~~~~~~~

scripts/render.py

@@ -460,6 +460,9 @@ class JobRenderer(threading.Thread):
 
             config.indexer = self.job.indexer
 
+            config.logo = self.job.logo
+            config.extra_logo = self.job.extra_logo
+
             config.stylesheet = renderer.get_stylesheet_by_name(
                 self.job.stylesheet)
             config.overlays = []

www/maposmatic/apis.py

@@ -239,6 +239,8 @@ def _jobs_post(request):
                   'bbox_left',
                   'bbox_right',
                   'bbox_top',
+                  'extra_logo',
+                  'indexer',
                   'min_lat',
                   'max_lat',
                   'min_lon',
@@ -246,6 +248,7 @@ def _jobs_post(request):
                   'import_urls',
                   'language',
                   'layout',
+                  'logo',
                   'orientation',
                   'overlays',
                   'paper_height',
@@ -301,6 +304,15 @@ def _jobs_post(request):
         else:
             job.overlay = ",".join(input['overlays'])
 
+    if 'indexer' in input:
+        job.indexer = input['indexer']
+
+    if 'logo' in input:
+        job.logo = input['logo']
+
+    if 'extra_logo' in input:
+        job.extra_logo = input['extra_logo']
+
     job.paper_width_mm  = 210
     job.paper_height_mm = 297
 

www/maposmatic/migrations/0028_add_indexer.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.12 on 2022-10-23 14:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('maposmatic', '0027_maprenderingjob_indexer'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='maprenderingjob',
+            name='indexer',
+            field=models.CharField(default='Street', max_length=256, null=True),
+        ),
+    ]

www/maposmatic/migrations/0029_add_logos.py

@@ -0,0 +1,28 @@
+# Generated by Django 2.2.12 on 2022-10-23 15:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('maposmatic', '0028_add_indexer'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='maprenderingjob',
+            name='extra_logo',
+            field=models.CharField(blank=True, default='', max_length=256, null=True),
+        ),
+        migrations.AddField(
+            model_name='maprenderingjob',
+            name='logo',
+            field=models.CharField(blank=True, default='bundled:osm-logo.svg', max_length=256, null=True),
+        ),
+        migrations.AlterField(
+            model_name='maprenderingjob',
+            name='indexer',
+            field=models.CharField(blank=True, default='Street', max_length=256, null=True),
+        ),
+    ]

www/maposmatic/models.py

@@ -85,7 +85,9 @@ class MapRenderingJob(models.Model):
     stylesheet = models.CharField(max_length=256)
     overlay = models.CharField(max_length=256, null=True, blank=True)
     layout = models.CharField(max_length=256)
-    indexer = models.CharField(max_length=256, null=True)
+    indexer = models.CharField(max_length=256, null=True, blank=True, default='Street')
+    logo = models.CharField(max_length=256, null=True, blank=True, default='bundled:osm-logo.svg')
+    extra_logo = models.CharField(max_length=256, null=True, blank=True, default='')
     paper_width_mm = models.IntegerField()
     paper_height_mm = models.IntegerField()
     bitmap_dpi = models.IntegerField(default=72)

www/maposmatic/templates/maposmatic/base.html

@@ -83,6 +83,9 @@
 
     <script src="/media/node_modules/leaflet-gpx/gpx.js"></script>
 
+    <link rel="stylesheet" href="/media/node_modules/leaflet-loading/src/Control.Loading.css" />
+    <script src="/media/node_modules/leaflet-loading/src/Control.Loading.js"></script>
+
     <script src="/media/node_modules/fastsearch/dist/fastsearch.js"></script>
 
     <link rel="stylesheet" href="/media/node_modules/fastselect/dist/fastselect.css" />
@@ -156,17 +159,23 @@
 
       function create_map(elt) {
         var osmLayer    = L.tileLayer.provider('OpenStreetMap.Mapnik');
-        var germanLayer = L.tileLayer.provider('OpenStreetMap.DE');
+	var treeLayer   = L.tileLayer('https://mymapnik.rudzick.it/MeinMapnikWMS/tiles/osm_hq/webmercator_hq/{z}/{x}/{y}.png',
+					{
+					    minZoom: 20,
+					    maxZoom: 24,
+					    // TODO: attribution (shows on all zoom levels ...)
+					});
 
-        var map = L.map(elt.attr('id')).addLayer(osmLayer);
+	var map = L.map(elt.attr('id'));
+	map.addLayer(osmLayer);
+	map.addLayer(treeLayer);
 
-        /*
-        var baseLayers = {
-                           'OSM':    osmLayer, 
-                           'German': germanLayer
-                         };
-        L.control.layers(baseLayers).addTo(map);
-        */
+	var loadingControl = L.Control.loading({
+//	    separate: true,
+//	    position: 'bottomleft',
+	    delayIndicator: 100,
+        });
+        map.addControl(loadingControl);
 
         /*
         {% if OUTER_BOUNDS_JSON and OUTER_BOUNDS_JSON|length > 0%}

www/maposmatic/views.py

@@ -344,6 +344,9 @@ def recreate(request):
             newjob.stylesheet = job.stylesheet
             newjob.overlay = job.overlay
 
+            newjob.logo = job.logo
+            newjob.extra_logo = job.extra_logo
+
             newjob.queue = "default"
             if job.layout.startswith('multi'):
                 newjob.queue = 'multipage'

www/static/package.json

@@ -27,6 +27,7 @@
     "leaflet-easybutton": "^2.4.0",
     "leaflet-gpx": "^1.0.0",
     "leaflet-heatmap": "^1.0.0",
+    "leaflet-loading": "^0.1.24",
     "leaflet-providers": "^1.6.0",
     "leaflet-search": "^2.9.8",
     "leaflet.locatecontrol": "^0.66.2",