diff --git a/css/all-ol-style.less b/css/all-ol-style.less
index 41a007c06853fb79e6e445543311fc09e2d0c87c..6e843b71f8cc1737de04d909bcaba32685a4d9db 100644
--- a/css/all-ol-style.less
+++ b/css/all-ol-style.less
@@ -1,3 +1,3 @@
-@import (inline) "../node_modules/openlayers/dist/ol.css";
+@import (inline) "ol.css";
@import "legend";
@import "ol-popup";
diff --git a/css/glrtoc/glrtoc-opsmap.less b/css/glrtoc/glrtoc-opsmap.less
deleted file mode 100644
index 6e0df6500e34a488e616043f022aeea75e89c88e..0000000000000000000000000000000000000000
--- a/css/glrtoc/glrtoc-opsmap.less
+++ /dev/null
@@ -1,132 +0,0 @@
-@import "../all-ol-style";
-@import "../media-control";
-
-
-body, html {
- height: 100%;
- width: 100%;
- margin: 0;
- padding: 0;
-}
-
-#main-container {
- height: 100%;
-}
-
-.flex-container {
- display: flex;
-
- //> div {
- // flex-grow: 1;
- //}
-}
-
-#map{
- flex-grow: 1;
-}
-
-
-#sidebar {
- height: 100%;
- width: 350px;
- flex-grow: initial;
- position: relative;
-}
-
-#logo-container {
- > div {
- flex-grow: 1;
- }
-
- div {
- margin: 7px;
- height: 150px;
- }
-
- div:first-child {
- background: url('img/glrtoc-logo.png') no-repeat center;
- background-size: contain;
- }
-
- div:nth-child(2) {
- background: url('img/tops-logo.png') no-repeat center;
- background-size: contain;
- }
-}
-
-#map {
- position: relative;
-}
-
-#tabs {
- height: 100%;
- padding: 0;
- border: none;
- width: 100%;
-
-
- > div {
- padding: 0;
- height: 98%;
-
- p {
- text-align: justify;
- padding: 7px 12px;
- margin: 10px 0;
- }
-
- }
-
- .ui-tab {
- padding: 3px 7px !important;
- }
-}
-
-#operations-tab {
- h3 {
- margin-top: 0;
- padding-top: 5px;
- padding-bottom: 5px;
- }
-
- > div{
- padding: 0;
- }
-}
-
-#hide-sidebar, #show-sidebar {
- z-index: 5;
- position: absolute;
- color: white;
- cursor: pointer;
-}
-
-//hide sidebar span
-#hide-sidebar {
- right: 4px;
- top: 9px;
-}
-
-#show-sidebar {
- display: none;
- left: -12px;
- top: 74px;
- background: linear-gradient(#74BBD8, #3FA3CA);
- width: 40px;
- text-align: right;
- padding: 10px 4px;
- border-radius: 5px;
- border: solid #4297D7 1px;
-}
-
-#operations > div {
- padding: 0;
-}
-
-#animation-control {
- text-align: center;
- padding: 10px;
-}
-
-
-
diff --git a/css/glrtoc/img/glrtoc-logo.png b/css/glrtoc/img/glrtoc-logo.png
deleted file mode 100644
index e703e4220e4f9bfc334eb49e95d19b8e9720aefe..0000000000000000000000000000000000000000
Binary files a/css/glrtoc/img/glrtoc-logo.png and /dev/null differ
diff --git a/css/glrtoc/img/tops-logo.png b/css/glrtoc/img/tops-logo.png
deleted file mode 100644
index 436dbf5a4ff00a9dcea8dd51add6f68b5943c4f7..0000000000000000000000000000000000000000
Binary files a/css/glrtoc/img/tops-logo.png and /dev/null differ
diff --git a/css/itsMap.less b/css/itsMap.less
deleted file mode 100644
index 7cbd153a7077b453bf003a168e0e6907670bed6d..0000000000000000000000000000000000000000
--- a/css/itsMap.less
+++ /dev/null
@@ -1,116 +0,0 @@
-@import "./all-ol-style";
-
-
-@headerHeight: 80px;
-
-body, html {
- height: 100%;
- width: 100%;
- margin: 0;
- padding: 0;
-}
-
-#header {
- height: @headerHeight;
- background-color: #808080;
-
- span {
- display: inline-block;
- margin: 9px;
- font-size: 28px;
- line-height: 30px;
- }
-
- a {
- float: right;
- }
-
- img {
- margin: 3px 10px;
- max-height: @headerHeight - 10px;
- width: auto;
- }
-}
-
-#container {
- display: flex;
- height: ~"calc(100% - " @headerHeight ~")";
- width: 100%;
-}
-
-#left {
- height: 100%;
- width: 320px;
- overflow-y: auto;
-}
-
-#map {
- flex: 1
-}
-
-.legend-container {
- border: none;
-}
-
-@media screen and (max-height: 650px) {
-
-}
-
-@media screen and (max-height: 640px), (max-width: 650px) {
-
- #header a {
- display: none;
- }
-
- #header{
- display: none;
- }
-
- #container {
- //display: block;
- height: 100%;
- }
-
- #left {
- width: 246px;
- height: auto;
- position: absolute;
- top: 5px;
- right: 5px;
- z-index: 10;
- background-color: white;
- -webkit-border-radius:5px;
- -moz-border-radius:5px;
- border-radius: 5px;
- max-height: 250px;
- overflow-y: scroll;
- }
-
- #map{
- height: 100%;
- }
-
- .legend-container ul{
- padding-left: 5px;
- }
-
-}
-
-@media screen and (max-height: 500px), (max-width: 346px) {
- #left{
- width: 204px;
- max-height: 204px;
- }
-
- .ol-popup{
- width: 240px;
- min-width: 240px;
-
- iframe{
- width: 240px;
- }
- }
-}
-
-
-
diff --git a/css/npmrds-heatmap.less b/css/npmrds-heatmap.less
deleted file mode 100644
index 16ffa8b039e04cf59bfad30c56ebf0b4f931c989..0000000000000000000000000000000000000000
--- a/css/npmrds-heatmap.less
+++ /dev/null
@@ -1,174 +0,0 @@
-@heatMapControlHeight: 135px;
-@heatMapSliderHeight: 30px;
-@import "./all-ol-style";
-
-
-html, body {
- height: 100%;
- width: 100%;
- margin: 0;
- /*position: relative;*/
-}
-
-#container {
- display: flex;
- height: 100%;
- width: 100%;
-}
-
-#map {
- flex: 1;
-}
-
-#left {
- flex: initial;
- width: 300px;
- min-width: 100px;
-
- > div {
- margin: 10px;
- }
-}
-
-#ul-hwy-dirs {
- list-style: none;
- padding-left: 5px;
- max-height: 300px;
- overflow-y: auto;
- background-color: lightgrey;
-
- li {
- padding: 2px;
- }
-}
-
-h4 {
- margin: 10px 5px;
-}
-
-#right {
- width: 60%;
- height: 100%;
-
- input[type=button] {
- margin: 3px 0;
- }
-}
-
-#heat-map-control {
- display: flex;
- flex-wrap: wrap;
- height: @heatMapControlHeight;
-
- > div {
- margin: 0 5px;
- }
-
- ul {
- list-style: none;
- padding-left: 0;
- margin-top: 14px;
- }
-}
-
-#heat-slider-container {
- height: @heatMapSliderHeight;
-}
-
-#heat-map-slider {
- border: none;
- width: 95%;
- padding: 0;
- margin: 0 0 0 18px;
-}
-
-#heatmap-canvas {
- position: absolute;
- top: 0;
- left: 22px;
- cursor: crosshair;
-}
-
-#heat-slider-container, #canvas-container {
- width: 100%;
- position: relative;
-}
-
-#canvas-container {
- height: ~"calc(100% - " @heatMapControlHeight + @heatMapSliderHeight ~")";
- overflow-y: auto;
-}
-
-#heat-map-vertical-bar {
- position: absolute;
- /*z-index: 4;*/
- border-right: solid blue 2px;
- left: 22px;
- top: 0;
- width: 0;
- height: 0;
- background-color: rgba(100, 100, 100, 0.3);
-}
-
-#date-ul {
- list-style: none;
- margin: 0;
- padding: 0;
- position: absolute;
- left: 0;
- top: 0;
- z-index: -5;
-
- li {
- border-bottom: solid #000000 1px;
- height: 575px;
- }
-
- li:nth-child(odd) {
- background-color: lightblue;
- }
-
- li div {
- color: blue;
- height: 150px;
- transform: rotate(-90deg) translate(-259px, 0px);
- transform-origin: left top 0;
- float: left;
- }
-}
-
-#canvas-tooltip-span {
- display: none;
- z-index: 100;
- position: fixed;
- background-color: lightgrey;
- border: solid black 1px;
- border-radius: 5px;
- padding: 5px;
- /*height: 50px;*/
- width: 160px;
- overflow: hidden;
- text-align: center;
-}
-
-#progress-indicator-div {
- z-index: 200;
- background-color: lightblue;
- border: solid darkslategray 1px;
- border-radius: 5px;
- width: 200px;
- padding: 10px;
- margin: 20px;
- display: none;
-}
-
-#sel-hwy {
- padding-left: 14px;
- padding-top: 9px;
- font-weight: bold;
- display: inline-block;
-}
-
-/*.ui-datepicker{*/
-/*z-index: 100 !important;*/
-/*}*/
\ No newline at end of file
diff --git a/css/ol.css b/css/ol.css
new file mode 100644
index 0000000000000000000000000000000000000000..ea50e7ebe3f9adab875f19b050005bc07e70e081
--- /dev/null
+++ b/css/ol.css
@@ -0,0 +1 @@
+.ol-control,.ol-scale-line{position:absolute;padding:2px}.ol-box{box-sizing:border-box;border-radius:2px;border:2px solid #00f}.ol-mouse-position{top:8px;right:8px;position:absolute}.ol-scale-line{background:rgba(0,60,136,.3);border-radius:4px;bottom:8px;left:8px}.ol-scale-line-inner{border:1px solid #eee;border-top:none;color:#eee;font-size:10px;text-align:center;margin:1px;will-change:contents,width}.ol-overlay-container{will-change:left,right,top,bottom}.ol-unsupported{display:none}.ol-viewport .ol-unselectable{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-tap-highlight-color:transparent}.ol-control{background-color:rgba(255,255,255,.4);border-radius:4px}.ol-control:hover{background-color:rgba(255,255,255,.6)}.ol-zoom{top:.5em;left:.5em}.ol-rotate{top:.5em;right:.5em;transition:opacity .25s linear,visibility 0s linear}.ol-rotate.ol-hidden{opacity:0;visibility:hidden;transition:opacity .25s linear,visibility 0s linear .25s}.ol-zoom-extent{top:4.643em;left:.5em}.ol-full-screen{right:.5em;top:.5em}@media print{.ol-control{display:none}}.ol-control button{display:block;margin:1px;padding:0;color:#fff;font-size:1.14em;font-weight:700;text-decoration:none;text-align:center;height:1.375em;width:1.375em;line-height:.4em;background-color:rgba(0,60,136,.5);border:none;border-radius:2px}.ol-control button::-moz-focus-inner{border:none;padding:0}.ol-zoom-extent button{line-height:1.4em}.ol-compass{display:block;font-weight:400;font-size:1.2em;will-change:transform}.ol-touch .ol-control button{font-size:1.5em}.ol-touch .ol-zoom-extent{top:5.5em}.ol-control button:focus,.ol-control button:hover{text-decoration:none;background-color:rgba(0,60,136,.7)}.ol-zoom .ol-zoom-in{border-radius:2px 2px 0 0}.ol-zoom .ol-zoom-out{border-radius:0 0 2px 2px}.ol-attribution{text-align:right;bottom:.5em;right:.5em;max-width:calc(100% - 1.3em)}.ol-attribution ul{margin:0;padding:0 .5em;font-size:.7rem;line-height:1.375em;color:#000;text-shadow:0 0 2px #fff}.ol-attribution li{display:inline;list-style:none;line-height:inherit}.ol-attribution li:not(:last-child):after{content:" "}.ol-attribution img{max-height:2em;max-width:inherit;vertical-align:middle}.ol-attribution button,.ol-attribution ul{display:inline-block}.ol-attribution.ol-collapsed ul{display:none}.ol-attribution.ol-logo-only ul{display:block}.ol-attribution:not(.ol-collapsed){background:rgba(255,255,255,.8)}.ol-attribution.ol-uncollapsible{bottom:0;right:0;border-radius:4px 0 0;height:1.1em;line-height:1em}.ol-attribution.ol-logo-only{background:0 0;bottom:.4em;height:1.1em;line-height:1em}.ol-attribution.ol-uncollapsible img{margin-top:-.2em;max-height:1.6em}.ol-attribution.ol-logo-only button,.ol-attribution.ol-uncollapsible button{display:none}.ol-zoomslider{top:4.5em;left:.5em;height:200px}.ol-zoomslider button{position:relative;height:10px}.ol-touch .ol-zoomslider{top:5.5em}.ol-overviewmap{left:.5em;bottom:.5em}.ol-overviewmap.ol-uncollapsible{bottom:0;left:0;border-radius:0 4px 0 0}.ol-overviewmap .ol-overviewmap-map,.ol-overviewmap button{display:inline-block}.ol-overviewmap .ol-overviewmap-map{border:1px solid #7b98bc;height:150px;margin:2px;width:150px}.ol-overviewmap:not(.ol-collapsed) button{bottom:1px;left:2px;position:absolute}.ol-overviewmap.ol-collapsed .ol-overviewmap-map,.ol-overviewmap.ol-uncollapsible button{display:none}.ol-overviewmap:not(.ol-collapsed){background:rgba(255,255,255,.8)}.ol-overviewmap-box{border:2px dotted rgba(0,60,136,.7)}
\ No newline at end of file
diff --git a/css/peergroup.less b/css/peergroup.less
deleted file mode 100644
index e0fb5e7106e18ac9dd306a3168a4534acfc38315..0000000000000000000000000000000000000000
--- a/css/peergroup.less
+++ /dev/null
@@ -1,173 +0,0 @@
-@import './all-ol-style';
-
-@sidebarWidth: 280px;
-
-html, body {
- margin: 0;
- padding: 0;
- height: 100%;
- width: 100%;
-}
-
-#app-container {
- display: flex;
- height: 100%;
-
- > div {
- height: 100%;
- overflow-y: auto;
- }
-}
-
-#left-sidebar {
- width: @sidebarWidth;
-
- label {
- display: inline-block;
- margin-left: 4px;
- }
-
- h6 {
- margin-top: 5px;
- margin-bottom: 2px;
- }
-}
-
-#accordion {
- font-size: 0.9em !important;
-
- h3 {
- padding-top: 1px;
- padding-bottom: 1px;
- margin-bottom: 2px;
- }
-}
-
-#right-sidebar {
- width: 400px;
-}
-
-#map {
- flex: 1;
-}
-
-#dialog{
- display: none;
-}
-//
-.ui-accordion-content {
- padding: 5px 10px !important;
-}
-
-select {
- margin: 4px;
- padding: 0;
-}
-
-input[type=text] {
- margin: 2px 7px;
- padding: 5px;
-}
-
-.divUnd {
- width: 100px;
-
-}
-
-.equality-compare {
- width: 45px;
-}
-
-.class-adtVal {
- width: 90px;
-}
-
-.class-laneVal, .class-speedVal {
- width: 50px;
-}
-
-.comma-list {
- width: 250px;
-
-}
-
-#summary {
- border-collapse: collapse;
-}
-
-#summary tr {
- height: 30px;
-}
-
-#summary th, td {
- border: 1px solid black;
- padding: 1px 4px;
- text-align: center;
- //color: #636363;
-}
-
-.invalid {
- border: solid red 1px !important;
-}
-
-.popup-table {
- border-collapse: collapse;
- margin-top: 5px;
-
-}
-
-.popup-table th, td {
- border: 1px solid black;
-}
-
-//
-//.ol-popup {
-// display: none;
-// position: absolute;
-// background-color: white;
-// -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2);
-// -webkit-filter: drop-shadow(0 1px 4px rgba(0, 0, 0, 0.2));
-// filter: drop-shadow(0 1px 4px rgba(0, 0, 0, 0.2));
-// padding: 15px;
-// border-radius: 10px;
-// border: 1px solid #cccccc;
-// bottom: 12px;
-// left: -50px;
-//}
-//
-//.ol-popup:after, .ol-popup:before {
-// top: 100%;
-// border: solid transparent;
-// content: " ";
-// height: 0;
-// width: 0;
-// position: absolute;
-// pointer-events: none;
-//}
-//
-//.ol-popup:after {
-// border-top-color: white;
-// border-width: 10px;
-// left: 48px;
-// margin-left: -10px;
-//}
-//
-//.ol-popup:before {
-// border-top-color: #cccccc;
-// border-width: 11px;
-// left: 48px;
-// margin-left: -11px;
-//}
-//
-//.ol-popup-closer {
-// text-decoration: none;
-// position: absolute;
-// top: 2px;
-// right: 8px;
-//}
-//
-//.ol-popup-closer:after {
-// content: "✖";
-//}
-//
-//
diff --git a/css/tip-colors.less b/css/tip-colors.less
deleted file mode 100644
index 669e4c57f0c18015eda76686173593d0d5b80086..0000000000000000000000000000000000000000
--- a/css/tip-colors.less
+++ /dev/null
@@ -1,30 +0,0 @@
-.cell-min {
- background-color: #00ff00 !important;
-}
-
-.cell-very-low {
- background-color: #55ff00 !important;
-}
-
-.cell-low {
- background-color: #aaff00 !important;
-}
-
-.cell-mid {
- background-color: #ffff00 !important;
-}
-
-.cell-high {
- background-color: #ffaa00 !important;
-}
-
-.cell-very-high {
- background-color: #ff5500 !important;
- font-weight: bold;
-}
-
-.cell-max {
- background-color: #ff0000 !important;
- font-weight: bold;
- text-decoration: underline;
-}
\ No newline at end of file
diff --git a/css/tip-results.less b/css/tip-results.less
deleted file mode 100644
index 8a04f94700692c9c3a6d0a6b5e24e2b95ec744f7..0000000000000000000000000000000000000000
--- a/css/tip-results.less
+++ /dev/null
@@ -1,136 +0,0 @@
-@import "tip-colors";
-@import "./all-ol-style";
-
-body, html, #container {
- height: 100%;
- width: 100%;
- margin: 0;
- padding: 0;
-}
-
-#container, #summary {
- display: flex;
-}
-
-#summary {
- height: 38%;
-
- > div {
- flex-grow: 1;
- height: 100%;
- overflow-y: auto;
- }
-}
-
-#crash-data {
- table {
- border-collapse: collapse;
- margin: 7px 4px 0 4px;
- }
-
- th, td {
- border: solid black 1px;
- text-align: center;
- padding: 0 5px;
- }
-}
-
-#right {
- flex: 1;
-}
-
-#map {
- height: 60%;
- position: relative;
-}
-
-#legend-container {
- position: absolute;
- width: 250px;
- max-height: 80%;
- min-height: 30px;
- overflow-y: auto;
- background-color: rgba(255, 255, 255, 0.8);
- z-index: 10;
- top: 5px;
- right: 5px;
- border-radius: 7px;
-
- > ul {
- > li:first-child {
- display: none;
- }
- }
-}
-
-#summary {
- h3, h4, ul {
- margin: 5px 10px;
- }
-}
-
-#results-container {
- width: 936px;
- padding-right: 20px;
- height: 100%;
- overflow: auto;
- position: relative;
- table {
- border-collapse: collapse;
- margin: 4px;
- width: 100%;
- //height: 100%;
- position: relative;
- table-layout: fixed;
-
- th, td {
- border: solid black 1px;
- padding: 3px;
- text-align: center;
- }
-
- > *{
- width: 100%;
- }
-
- th {
- cursor: pointer;
- }
-
- thead {
-
- display: block;
- width: 100%;
-
- tr {
- background-color: #4a4a4a;
- color: #FDFDFD;
- width: 100%;
- }
- }
-
- tbody {
- display: block;
- height: 400px;
- overflow-y: auto;
- width: 100%;
- }
- }
-}
-
-.selectable-row:hover {
- background-color: #00ffd0;
- cursor: pointer;
-}
-
-.selected-row {
- background-color: #0074ff !important;
-}
-
-.score-under-one {
- display: none;
-}
-
-#show-all-toggle, #show-all-toggle-label {
- cursor: pointer;
-}
diff --git a/css/tip.less b/css/tip.less
deleted file mode 100644
index 09ac1b59db406b49d1151b8fb966fe131bbba2a3..0000000000000000000000000000000000000000
--- a/css/tip.less
+++ /dev/null
@@ -1,159 +0,0 @@
-@import "./tip-colors";
-@import "./all-ol-style";
-
-html, body {
- width: 100%;
- height: 100%;
- margin: 0;
-}
-
-#container {
- display: flex;
- height: 100%;
- width: 100%;
-}
-
-#left {
- overflow-y: scroll;
- background-color: lightblue;
- height: 100%;
- width: 320px;
-}
-
-// suppress first li in legend
-.legend-container {
- > li:first-child {
- display: none;
- }
-}
-
-//tip legend style
-#tip-segments-layer-li {
- display: inherit;
-
- > div {
- height: 80px;
-
- hr {
- height: 4px;
- }
-
- ul:first-of-type {
- float: right;
- padding-left: 0;
-
- li {
- height: 10px;
- }
- }
-
- ul:last-of-type {
- float: right;
- margin-top: 5px;
-
- li {
- margin: 3px 0;
- text-align: right;
- border-right: solid black 1px;
- border-radius: 0;
- }
- }
- }
-}
-
-//common border styling of legend and preset container
-#preset-wrapper, .legend-container {
- border: solid black 1px;
- border-radius: 5px;
-}
-
-#preset-wrapper {
- margin: 3px;
- padding: 3px;
- border: solid black 1px;
- border-radius: 5px;
-
- h4 {
- display: inline-block;
- margin-top: 0;
- margin-bottom: 0;
- }
-
- select {
- width: 141px;
- }
-
- input[type=button] {
- width: 88px;
- margin: 0;
- }
-}
-
-.slider-container {
-
- > div {
- padding: 2px;
- border-bottom: solid darkblue 1px;
- //min-height: 46px;
- }
-
- label {
- display: inline-block;
- }
-
- .slider-label {
- width: 97px;
- }
-
- .hidden-select {
- display: none;
- }
-
- .percent-label {
- padding: 2px 3px;
- margin-left: 2px;
- background-color: lightgray;
- font-weight: bold;
- color: orangered;
- }
-
- input[type=range] {
- width: 153px;
- padding: 1px;
-
- }
-
- input[type=range][disabled] {
- background-color: #59afee;
- cursor: not-allowed;
- }
-
- select {
- margin-bottom: 2px;
- width: 46px;
- }
-
- .low-high {
- font-size: 12px;
- }
-}
-
-// offset around show help button
-#tip-help {
- margin-left: 10px;
- margin-top: 4px;
-}
-
-#map {
- background-color: slategray;
- height: 100%;
- flex: 1;
- position: relative;
-}
-
-#loading-gif {
- left: 10px;
- top: 80px;
- z-index: 10;
- position: absolute;
-}
diff --git a/package.json b/package.json
index 416b50f6ff8caf455ae4e35a2e2b555720978449..075523678bef20c17f182a8b6b84e74320796a50 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,8 @@
"lib",
"doc",
"src",
- "ext"
+ "ext",
+ "css"
],
"scripts": {
"test": "node node_modules\\karma\\bin\\karma start karma.conf.js",
diff --git a/projects/ssa/Corridor.js b/projects/ssa/Corridor.js
index 84b082b05d2d46080806158772b0a01fc6ca98b4..e277863e124e6bb35ad6aada584a53c4a41acf6c 100644
--- a/projects/ssa/Corridor.js
+++ b/projects/ssa/Corridor.js
@@ -3,7 +3,7 @@
*/
import LayerBaseVectorGeoJson from '../../src/layers/LayerBaseVectorGeoJson';
-import ol from '../../src/custom-ol';
+import ol from '../../src/ol/ol';
import $ from '../../src/jquery';
function escapeHtml(string) {