From 1612893b17ee770507ce1025ae72bef9aef90296 Mon Sep 17 00:00:00 2001
From: Joerg Reichert <de.abg.reichert.joerg@googlemail.com>
Date: Mon, 10 Jun 2019 15:04:02 +0200
Subject: [PATCH] Add missing css height for leaflet

---
 app/assets/stylesheets/application.css.scss |  1 +
 app/views/geo/index.html.slim               |  6 +++---
 app/views/layouts/application.html.slim     | 11 -----------
 docker-compose.yml                          |  7 ++++++-
 docker-entrypoint-es-plugins.sh             |  5 -----
 5 files changed, 10 insertions(+), 20 deletions(-)
 delete mode 100755 docker-entrypoint-es-plugins.sh

diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index e2b144a..d028aab 100644
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -17,6 +17,7 @@
 
 @import 'foundation_and_overrides';
 @import 'objects/search-result';
+@import 'objects/geo';
 
 .left {float:left}
 .right {float:right}
diff --git a/app/views/geo/index.html.slim b/app/views/geo/index.html.slim
index 1d374a3..70b8115 100644
--- a/app/views/geo/index.html.slim
+++ b/app/views/geo/index.html.slim
@@ -15,11 +15,11 @@ html
         h3#title = 'Karte'
         div#map/
         javascript:
-          var map = L.map('map').setView([51.4437366804, 11.865234375], 9);
+          var map = L.map('map').setView([51.3399028, 12.3742236], 12);
           L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
             {
               attribution: 'Map data &#64; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors</a>',
-              maxZoom: 12,
-              minZoom: 8
+              maxZoom: 16,
+              minZoom: 12
             }
           ).addTo(map);
\ No newline at end of file
diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim
index cd71dcd..49d7146 100644
--- a/app/views/layouts/application.html.slim
+++ b/app/views/layouts/application.html.slim
@@ -6,17 +6,6 @@ html
     = javascript_include_tag 'vendor/modernizr'
     = csrf_meta_tags
     = auto_discovery_link_tag(:rss, params.merge(format: :rss))
-    javascript:
-      var _paq = _paq || [];
-      _paq.push(['trackPageView']);
-      _paq.push(['enableLinkTracking']);
-      (function() {
-        var u="//analytics.leipzig.codefor.de/";
-        _paq.push(['setTrackerUrl', u+'piwik.php']);
-        _paq.push(['setSiteId', '1']);
-        var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-        g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
-      })();
 
   body
     .row
diff --git a/docker-compose.yml b/docker-compose.yml
index e595ad3..7c64229 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,8 +10,13 @@ web:
     ELASTICSEARCH_URL: 'http://elasticsearch:9200'
 elasticsearch:
   image: elasticsearch:5.4.3
+  command:
+    - sh
+    - -c
+    - "./bin/elasticsearch-plugin install http://xbib.org/repository/org/xbib/elasticsearch/plugin/elasticsearch-analysis-decompound/5.4.3.0/elasticsearch-analysis-decompound-5.4.3.0-plugin.zip;
+      ./bin/elasticsearch-plugin install https://github.com/royrusso/elasticsearch-HQ/zipball/master;
+       /docker-entrypoint.sh elasticsearch"
   ports:
     - "9200:9200"
   volumes:
     - .:/apps
-  entrypoint: /apps/docker-entrypoint-es-plugins.sh
diff --git a/docker-entrypoint-es-plugins.sh b/docker-entrypoint-es-plugins.sh
deleted file mode 100755
index cacefe3..0000000
--- a/docker-entrypoint-es-plugins.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-./bin/elasticsearch-plugin install http://xbib.org/repository/org/xbib/elasticsearch/plugin/elasticsearch-analysis-decompound/5.4.3.0/elasticsearch-analysis-decompound-5.4.3.0-plugin.zip
-
-exec /docker-entrypoint.sh elasticsearch