Merge branch 'master' of https://github.com/origo-map/origo into not-…

…hidden
Flodkvist · Apr 12, 2023 · 1d1b62d · 1d1b62d
2 parents 0c0db63 + 579d14e
commit 1d1b62d
Show file tree

Hide file tree

Showing 50 changed files with 111,168 additions and 92,657 deletions.
diff --git a/build/css/style.css b/build/css/style.css
@@ -239,6 +239,8 @@
       flex-basis: 75%; }
     .o-ui .flex .basis-100 {
       flex-basis: 100%; }
+    .o-ui .flex .small-gap {
+      gap: 0.2rem; }
   .o-ui .grid {
     display: flex;
     flex-wrap: wrap;
@@ -629,6 +631,9 @@
       transform: rotate(180deg); }
   .o-ui .collapse-scroll.expanded {
     height: calc(100% - 2rem); }
+  .o-ui .move-item {
+    background-color: #008ff5;
+    opacity: 0.2; }
   .o-ui .icon-smallest:not(.button):not(button) {
     height: 0.75rem;
     width: 0.75rem; }
@@ -1290,6 +1295,8 @@
     line-height: 1rem; }
     .o-ui .text-height-smallest.text-fade::after {
       height: 1rem; }
+  .o-ui .break-word {
+    word-wrap: break-word; }
   .o-ui .z-index-bottom {
     z-index: 0; }
   .o-ui .z-index-low {
@@ -1451,6 +1458,12 @@
     right: 30px;
     margin-top: -30px;
     width: max-content; }
+  .o-ui .popup-menu.button-popup {
+    position: absolute;
+    text-align: left;
+    width: max-content;
+    bottom: 5px;
+    left: 0; }
 
 .app {
   background-color: rgba(0, 0, 0, 0.1);
@@ -1618,6 +1631,12 @@ body {
     margin: 1px;
     padding: 0 2px;
     text-align: center; }
+  .o-map .ol-scale-bar-inner {
+    display: flex; }
+  .o-map .ol-scale-singlebar-even {
+    background-color: #000000; }
+  .o-map .ol-scale-singlebar-odd {
+    background-color: #FFFFFF; }
   .o-map .ol-has-tooltip [role=tooltip] {
     border: 0;
     clip: rect(1px 1px 1px 1px);
@@ -2515,6 +2534,47 @@ body {
     width: 100%; }
   .o-map[class*=o-media-l-m-s-xs] #o-sidebar {
     display: none; }
+  .o-map .o-draw-toolbar {
+    bottom: 0;
+    left: 50%;
+    margin-bottom: .5rem !important;
+    max-width: 80%;
+    position: relative;
+    -ms-transform: translate(-50%, 0);
+    -webkit-transform: translate(-50%, 0);
+    transform: translate(-50%, 0);
+    z-index: 10; }
+  .o-map .o-draw-stylewindow {
+    font-family: Arial,sans-serif;
+    width: 250px;
+    position: absolute;
+    right: 1rem;
+    -ms-transform: translate(0, -50%);
+    -webkit-transform: translate(0, -50%);
+    transform: translate(0, -50%);
+    top: 50%;
+    height: calc(100% - 9rem); }
+  .o-map .o-draw-stylewindow input[type="radio"] {
+    display: none; }
+  .o-map .o-draw-stylewindow input[type="radio"] + label span {
+    display: inline-block;
+    width: 24px;
+    height: 24px;
+    vertical-align: middle;
+    cursor: pointer;
+    -moz-border-radius: 50%;
+    border-radius: 50%;
+    box-shadow: 0 0 0 2px white, 0 0 0 4px white; }
+  .o-map .o-draw-stylewindow input[type="radio"]:checked + label span {
+    box-shadow: 0 0 0 2px white, 0 0 0 4px #ababab; }
+  .o-map .o-draw-stylewindow input[type="radio"] ~ label span:hover {
+    box-shadow: 0 0 0 2px white, 0 0 0 4px #cdcdcd; }
+  .o-map .o-draw-stylewindow input[type="radio"] ~ label {
+    display: inline-block;
+    vertical-align: middle;
+    padding: 5px; }
+  .o-map .o-draw-stylewindow ul li {
+    float: left; }
   .o-map #o-editor-button .o-icon-fa-pencil {
     height: 1em;
     padding: 0.25em;
@@ -2617,7 +2677,7 @@ body {
     margin: 0; }
   .o-map input.o-position-find {
     padding: 0;
-    width: 95px; }
+    width: auto; }
   .o-map .o-progress {
     background: #008ff5;
     bottom: 0;
@@ -2758,7 +2818,9 @@ body {
     left: 0px;
     list-style: none;
     margin: 0;
-    min-width: 100%;
+    min-width: 180px;
+    max-width: 100%;
+    overflow-wrap: break-word;
     padding: 0;
     position: absolute;
     top: auto;
@@ -2825,8 +2887,7 @@ body {
     background-color: #eeeeee; }
   .o-map[class*=o-media-l-m] .awesomplete > ul {
     max-width: calc(100% + 2rem);
-    min-width: calc(100% + 2rem);
-    top: 2.25rem; }
+    min-width: calc(100% + 2rem); }
   .o-map .o-search-wrapper {
     max-width: calc(100% - 8rem);
     width: 310px; }
@@ -3145,19 +3206,21 @@ body {
   .o-map[class*=o-media-l-m-s] .sidebarcontainer {
     left: 5em;
     transform: none; }
-  .o-map .validate > .errorMsg {
+  .o-map .groupfootercontainer {
+    margin-left: 36px; }
+  .o-map .validate .errorMsg {
     color: #ff9500; }
-  .o-map .validate > input:optional {
+  .o-map .validate input:optional {
     border-color: #ebebeb; }
-  .o-map .validate > input:required:invalid {
+  .o-map .validate input:required:invalid {
     border-color: #ff9500; }
-  .o-map .validate > input:invalid {
+  .o-map .validate input:invalid {
     border-color: #ff9500; }
-  .o-map .validate > textarea:required:invalid {
+  .o-map .validate textarea:required:invalid {
     border-color: #ff9500; }
-  .o-map .validate > select:required:invalid {
+  .o-map .validate select:required:invalid {
     border-color: #ff9500; }
-  .o-map .validate > select:required:invalid {
+  .o-map .validate select:required:invalid {
     border-color: #ff9500; }
   .o-map input.awesome:required:invalid {
     border-color: #ff9500; }

diff --git a/build/css/svg/material-icons.svg b/build/css/svg/material-icons.svg
diff --git a/build/data/origo-cities-3857.geojson b/build/data/origo-cities-3857.geojson
@@ -5,7 +5,6 @@
 "features": [
 { "type": "Feature", "properties": { "id": 1, "name": "Karlstad" }, "geometry": { "type": "Point", "coordinates": [ 1503136, 8262205 ] } },
 { "type": "Feature", "properties": { "id": 2, "name": "Hallstahammar" }, "geometry": { "type": "Point", "coordinates": [ 1807133, 8313751 ] } },
-{ "type": "Feature", "properties": { "id": 3, "name": "Västerås" }, "geometry": { "type": "Point", "coordinates": [ 1841462, 8314392 ] } },
 { "type": "Feature", "properties": { "id": 4, "name": "Eskilstuna" }, "geometry": { "type": "Point", "coordinates": [ 1836807, 8260572 ] } },
 { "type": "Feature", "properties": { "id": 5, "name": "Strängnäs" }, "geometry": { "type": "Point", "coordinates": [ 1894581, 8261118 ] } },
 { "type": "Feature", "properties": { "id": 6, "name": "Enköping" }, "geometry": { "type": "Point", "coordinates": [ 1901643, 8320134 ] } },
@@ -22,6 +21,8 @@
 { "type": "Feature", "properties": { "id": 17, "name": "Norberg" }, "geometry": { "type": "Point", "coordinates": [ 1773055, 8414134 ] } },
 { "type": "Feature", "properties": { "id": 18, "name": "Avesta" }, "geometry": { "type": "Point", "coordinates": [ 1801204, 8431717 ] } },
 { "type": "Feature", "properties": { "id": 19, "name": "Fagersta" }, "geometry": { "type": "Point", "coordinates": [ 1758647, 8400343 ] } },
-{ "type": "Feature", "properties": { "id": 20, "name": "Kristianstad" }, "geometry": { "type": "Point", "coordinates": [ 1575633, 7565358 ] } }
+{ "type": "Feature", "properties": { "id": 20, "name": "Kristianstad" }, "geometry": { "type": "Point", "coordinates": [ 1575633, 7565358 ] } },
+{ "type": "Feature", "properties": { "id": 21, "name": "Mora" }, "geometry": { "type": "Point", "coordinates": [ 1618908, 8627715 ] } },
+{ "type": "Feature", "properties": { "id": 22, "name": "Orsa" }, "geometry": { "type": "Point", "coordinates": [ 1627705, 8653421 ] } }
 ]
-}
+}
diff --git a/build/data/origo-mask-3857.geojson b/build/data/origo-mask-3857.geojson
diff --git a/build/js/0.origo.js b/build/js/0.origo.js
diff --git a/build/js/1.origo.js b/build/js/1.origo.js