upgrade to latest ol-helpers lib

6aika · Jun 1, 2018 · 76ad944 · 76ad944
1 parent b3344a6
commit 76ad944
Show file tree

Hide file tree

Showing 7 changed files with 1,309 additions and 375 deletions.
diff --git a/bower.json b/bower.json
@@ -2,7 +2,7 @@
   "name": "ckanext-geoview",
   "version": "0.0.2",
   "dependencies": {
-    "ol-helpers": "pduchesne/ol-helpers#ol4",
+    "ol-helpers": "pduchesne/ol-helpers",
     "leaflet": "~0.7.7",
     "proj4leaflet": "~0.7.2",
     "proj4": "^2.3.17"

diff --git a/ckanext/geoview/public/css/ol_preview.css b/ckanext/geoview/public/css/ol_preview.css
@@ -34,7 +34,7 @@
  }
 
 
-
+ /*
  #data-preview .ol-viewport .layer-switcher {
      position: absolute;
      top: 40px;
@@ -69,6 +69,15 @@
      margin: 0;
  }
 
+  #data-preview .ol-viewport .layer-switcher .layer-list {
+     top: 0px;
+     right: 0px;
+     position: initial;
+     border-radius: 0;
+     padding: 0;
+ }
+ */
+
  #data-preview .ol-viewport .popupContainer {
      background-color: rgba(0,0,0,0.7);
      color: white;
@@ -89,14 +98,6 @@
      border-bottom: 1px solid #e5e4e7;
  }
 
- #data-preview .ol-viewport .layer-switcher .layer-list {
-     top: 0px;
-     right: 0px;
-     position: initial;
-     border-radius: 0;
-     padding: 0;
- }
-
  #data-preview .ol-viewport .ol-mouse-position {
      background-color: rgba(255,255,255,0.75);
      border-radius: 2px;

diff --git a/ckanext/geoview/public/js/ol_preview.js b/ckanext/geoview/public/js/ol_preview.js
diff --git a/ckanext/geoview/public/js/vendor/ol-helpers/.bower.json b/ckanext/geoview/public/js/vendor/ol-helpers/.bower.json
@@ -17,13 +17,13 @@
     "fetch": "^2.0.3"
   },
   "homepage": "https://github.com/pduchesne/ol-helpers",
-  "_release": "254a895027",
+  "_release": "405c5d9c96",
   "_resolution": {
     "type": "branch",
-    "branch": "ol4",
-    "commit": "254a895027291dcb9b79db746d0a71d31955a220"
+    "branch": "master",
+    "commit": "405c5d9c9683fb619f17c43053dec9cddd23986c"
   },
   "_source": "git://github.com/pduchesne/ol-helpers.git",
-  "_target": "ol4",
+  "_target": "*",
   "_originalSource": "pduchesne/ol-helpers"
 }
diff --git a/ckanext/geoview/public/js/vendor/ol-helpers/ol-helpers.css b/ckanext/geoview/public/js/vendor/ol-helpers/ol-helpers.css
@@ -2,19 +2,78 @@
 .ol-viewport > canvas {
   position: absolute;
 }
+.ol-viewport .ol-feature-popup {
+  background-color: rgba(0, 0, 0, 0.8);
+  border-radius: 2px;
+  color: white;
+  margin-top: 5px;
+  margin-left: 5px;
+}
+.ol-viewport .ol-feature-popup .popupContent > div {
+  padding: 3px;
+}
+.ol-viewport .ol-feature-popup .popupContent > table {
+  margin: 3px;
+}
+.ol-viewport .ol-feature-popup .popupContent > table .propKey {
+  text-align: right;
+  padding-right: 5px;
+}
+.ol-viewport .ol-feature-popup .popupContent > table .propValue {
+  text-align: left;
+}
+.ol-viewport .ol-feature-popup .name {
+  font-weight: bold;
+  border-bottom: 1px solid #e5e4e7;
+}
+.ol-viewport .ol-feature-details {
+  position: absolute;
+  background-color: rgba(0, 0, 0, 0.75);
+  border-radius: 2px;
+  color: white;
+  margin: 5px;
+  right: 0px;
+  max-width: 30%;
+  max-height: 100%;
+  overflow: auto;
+}
+.ol-viewport .ol-feature-details div.featureDetails > div {
+  padding: 6px;
+  text-align: left;
+}
+.ol-viewport .ol-feature-details div.featureDetails > .content > table {
+  margin: 3px;
+}
+.ol-viewport .ol-feature-details div.featureDetails > .content > table .propKey {
+  text-align: right;
+  padding-right: 5px;
+  color: #C5C5C5;
+}
+.ol-viewport .ol-feature-details div.featureDetails > .content > table .propValue {
+  text-align: left;
+}
+.ol-viewport .ol-feature-details div.featureDetails > .name {
+  position: sticky;
+  top: 0px;
+  background-color: rgba(0, 0, 0, 0.75);
+  font-weight: bold;
+  border-bottom: 1px solid #e5e4e7;
+  height: 25px;
+  min-width: 150px;
+}
 .ol-viewport .layer-switcher .stacked-layers {
   position: absolute;
-  right: 10px;
-  top: 40px;
+  left: 10px;
+  top: 5px;
   z-index: 100;
 }
 .ol-viewport .layer-switcher .header {
   display: none;
   position: absolute;
-  right: 12px;
-  top: 40px;
+  left: 12px;
+  top: 5px;
   z-index: 90;
-  padding: 5px 45px 5px 5px;
+  padding: 5px 5px 5px 43px;
   background-color: black;
 }
 .ol-viewport .layer-switcher .header .baseLayerSelector select {
@@ -30,8 +89,8 @@
   overflow: overlay;
   max-height: calc(100% - 50px);
   min-width: 150px;
-  right: 10px;
-  top: 40px;
+  left: 10px;
+  top: 5px;
   z-index: 80;
 }
 .ol-viewport .layer-switcher .layer-list .panel {