Merge branch 'master' into feature/dialog-editor

# Conflicts:
#	src/components/dialogs/MapListDialog.tsx
#	src/modules/Poly.ts
#	src/styles/dialogs.less

src/styles/map.less

@@ -40,13 +40,31 @@
   }
 }
 
-.leaflet-vertex-icon, .leaflet-middle-icon {
+.vertex-icon-mixin(@left, @right) {
+  &::after {
+    content: ' ';
+    position:absolute;
+    top:4px;
+    left: @left;
+    right: @right;
+    width:8px;
+    height:8px;
+    background: white;
+    border-radius: 8px;
+    transform:scale(1);
+    transition:transform 150ms;
+  }
+}
+
+.leaflet-vertex-icon {
   outline: none !important;
   border-radius: 10px;
   opacity: 1;
   border: none;
   width: 16px !important;
-  height: 16px !important;margin-left:-8px !important;margin-top:-8px !important;
+  height: 16px !important;
+  margin-left:-8px !important;
+  margin-top:-8px !important;
   background: transparent;
   position: absolute;
   cursor: grab;
@@ -72,19 +90,7 @@
     }
   }
 
-  &::after {
-    content: ' ';
-    position:absolute;
-    top:4px;
-    left:4px;
-    width:8px;
-    height:8px;
-    background: white;
-    box-shadow: @red_secondary 0 0 0 3px;
-    border-radius: 8px;
-    transform:scale(1);
-    transition:transform 150ms;
-  }
+  .vertex-icon-mixin(4px, auto);
 
   &:hover {
     opacity: 1;
@@ -99,6 +105,54 @@
   height: 48px;
 }
 
+.leaflet-km-marker, .leaflet-km-marker-2 {
+  position: absolute;
+  z-index: 0 !important;
+
+  .leaflet-km-dist {
+    background: @red_secondary;
+    color: white;
+    border-radius: 4px;
+    font-size: 12px;
+    text-align: center;
+    min-width: 20px;
+    height: 14px;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    position: relative;
+    top: 50%;
+    left: 50%;
+    font-weight: bold;
+    padding: 0 2px;
+  }
+}
+
+.end-marker {
+  .leaflet-km-dist {
+    left: auto;
+    right: -3px;
+    top: -3px;
+    position: absolute;
+    z-index: -10;
+    padding: 2px 16px 2px 4px;
+  }
+
+  &.right {
+    .leaflet-km-dist {
+      padding: 2px 4px 2px 16px;
+      left: -3px;
+      right: auto;
+    }
+  }
+}
+
+.leaflet-km-marker-2 {
+  .leaflet-km-dist {
+    background: green;
+  }
+}
+
 .touch-hinter-poly {
   stroke: rgba(255, 50, 0, 0.1);
   cursor: grab;

src/styles/save.less

@@ -33,6 +33,9 @@
   opacity: 0;
   touch-action: none;
   pointer-events: none;
+  text-transform: uppercase;
+  font-size: 1.2em;
+  color: fade(white, 70%);
 
   svg {
     fill: white;