Merge branch 'develop' into vegbilder

modules/ui/field.js

@@ -204,7 +204,11 @@ export function uiField(context, presetField, entityIDs, options) {
                         referenceKey = referenceKey.replace(/:$/, '');
                     }
 
-                    reference = uiTagReference(d.reference || { key: referenceKey }, context);
+                    var referenceOptions = d.reference || {
+                        key: referenceKey,
+                        value: _tags[referenceKey]
+                    };
+                    reference = uiTagReference(referenceOptions, context);
                     if (_state === 'hover') {
                         reference.showing(false);
                     }

modules/ui/fields/combo.js

@@ -483,7 +483,7 @@ export function uiFieldCombo(field, context) {
             .attr('type', 'text')
             .attr('id', field.domId)
             .call(utilNoAuto)
-            .call(initCombo, selection)
+            .call(initCombo, _container)
             .merge(_input);
 
         if (_isSemi) {

modules/ui/init.js

@@ -1,3 +1,4 @@
+import { marked } from 'marked';
 import {
     select as d3_select
 } from 'd3-selection';
@@ -689,5 +690,10 @@ export function uiInit(context) {
             _saveLoading = d3_select(null);
         });
 
+    marked.use({
+        mangle: false,
+        headerIds: false,
+    });
+
     return ui;
 }

modules/ui/photoviewer.js

@@ -24,6 +24,7 @@ export function uiPhotoviewer(context) {
                 if (services.streetside) { services.streetside.hideViewer(context); }
                 if (services.mapillary) { services.mapillary.hideViewer(context); }
                 if (services.kartaview) { services.kartaview.hideViewer(context); }
+                if (services.mapilio) { services.mapilio.hideViewer(context); }
                 if (services.vegbilder) { services.vegbilder.hideViewer(context); }
             })
             .append('div')